You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2020/01/13 18:45:08 UTC
[juneau] branch master updated: Try removing tools.jar and
juneau-doc.jar
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 61eb269 Try removing tools.jar and juneau-doc.jar
new 331cd20 Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git
61eb269 is described below
commit 61eb26928ac8f5b8aba41620f8fd2bf4fa1ed0af
Author: JamesBognar <ja...@apache.org>
AuthorDate: Mon Jan 13 11:21:23 2020 -0500
Try removing tools.jar and juneau-doc.jar
---
juneau-doc/juneau-doc.jar | Bin 32225 -> 0 bytes
juneau-doc/pom.xml | 2 +-
juneau-doc/tools.jar | Bin 18291174 -> 0 bytes
launches/juneau-build-javadoc.sh | 5 +++--
pom.xml | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
deleted file mode 100644
index 3a2fe6a..0000000
Binary files a/juneau-doc/juneau-doc.jar and /dev/null differ
diff --git a/juneau-doc/pom.xml b/juneau-doc/pom.xml
index 45157d2..a59256c 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
Binary files a/juneau-doc/tools.jar and /dev/null 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 7cd1dbb..4e4228d 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>