Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
deleted file mode 100644
index 3a2fe6a..0000000
--- a/juneau-doc/juneau-doc.jar
+++ /dev/null
Binary files differ
diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index 8cb28d9..df50b43 100644
--- a/juneau-doc/pom.xml
+++ b/juneau-doc/pom.xml
@@ -92,7 +92,7 @@
<artifactId>tools</artifactId>
<version>1.8.0</version>
<scope>system</scope>
- <systemPath>${basedir}/tools.jar</systemPath>
+ <systemPath>${toolsjar}</systemPath>
</dependency>
</dependencies>
diff --git a/juneau-doc/tools.jar b/juneau-doc/tools.jar
deleted file mode 100644
index 8d1469b..0000000
--- a/juneau-doc/tools.jar
+++ /dev/null
Binary files differ
diff --git a/launches/juneau-build-javadoc.sh b/launches/juneau-build-javadoc.sh
index f021427..3bda994 100755
--- a/launches/juneau-build-javadoc.sh
+++ b/launches/juneau-build-javadoc.sh
@@ -14,13 +14,14 @@
. launches/juneau-env.sh
cd juneau-doc
-java -DjuneauVersion=$JUNEAU_VERSION -cp juneau-doc.jar org.apache.juneau.doc.internal.DocGenerator
+mvn install
+java -DjuneauVersion=$JUNEAU_VERSION -cp target/juneau-doc-${JUNEAU_VERSION}-SNAPSHOT.jar org.apache.juneau.doc.internal.DocGenerator
cd ..
mvn javadoc:aggregate
cd juneau-doc
-java -cp juneau-doc.jar org.apache.juneau.doc.internal.DocLinkTester
+java -cp target/juneau-doc-${JUNEAU_VERSION}-SNAPSHOT.jar org.apache.juneau.doc.internal.DocLinkTester
cd ..
rm -rf ../juneau-website/content/site/apidocs-$JUNEAU_VERSION
diff --git a/pom.xml b/pom.xml
index fe7e0c9..1ed2476 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@
<!--org.apache.juneau.doc.internal.DocTag</taglet-->
<!-- taglet>org.apache.juneau.doc.internal.PropertyTag</taglet-->
</taglets>
- <tagletpath>${basedir}/juneau-doc/juneau-doc.jar</tagletpath>
+ <tagletpath>${basedir}/juneau-doc/target/juneau-doc-${project.version}.jar</tagletpath>
</configuration>
<executions>
<execution>
