This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 33e874f Fix Javadoc build error and ensure 'ant clean javadoc' works
33e874f is described below
commit 33e874fa31e6c411421ad1304dfa65f30bd58958
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 18 22:27:15 2020 +0100
Fix Javadoc build error and ensure 'ant clean javadoc' works
---
build.properties.default | 13 +++++++++++++
build.xml | 18 +++++++++++++++---
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 2d65f9d..e1a18ad 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -298,3 +298,16 @@
bnd.checksum.value=0dc5ff0af222ef075b5b0dd488f6aeac|0e542cf0f928107c17ce65f3c68d
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
+
+# ----- OSGi annotations bundle, version 1.0.0 or later -----
+# ----- required to avoid Javadoc error when using bnd annotations -----
+osgi-annotations.version=1.0.0
+
+# checksums for biz.aQute.bnd-5.1.1.jar
+osgi-annotations.checksum.enabled=true
+osgi-annotations.checksum.algorithm=MD5|SHA-1
+osgi-annotations.checksum.value=153054f987534244f95a399539b11375|b6e802bceba0682353466abf8fadbbd662b2f7f8
+
+osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
+osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
+osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
diff --git a/build.xml b/build.xml
index 7c65d25..8c0e40c 100644
--- a/build.xml
+++ b/build.xml
@@ -222,6 +222,7 @@
<!-- Classpaths -->
<path id="compile.classpath">
<pathelement location="${bnd.jar}"/>
+ <pathelement location="${osgi-annotations.jar}"/>
<pathelement location="${jdt.jar}"/>
<pathelement location="${saaj-api.jar}"/>
<pathelement location="${jaxrpc-lib.jar}"/>
@@ -940,7 +941,7 @@
</copy>
</target>
- <target name="compile" depends="download-compile,validate,setup-bnd">
+ <target name="compile" depends="download-compile,validate">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
@@ -2171,7 +2172,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
</target>
- <target name="javadoc" depends="dist-source"
+ <target name="javadoc" depends="dist-source,download-compile"
description="Create the Tomcat javadoc" >
<javadoc packagenames="javax.annotation.*"
sourcepath="${tomcat.dist}/src/java"
@@ -2317,6 +2318,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
+ <path location="${osgi-annotations.jar}"/>
</classpath>
<link href="../annotationapi"/>
<link href="../servletapi"/>
@@ -3052,7 +3054,8 @@ skip.installer property in build.properties" />
</target>
<target name="download-compile"
- description="Download components necessary to compile" >
+ description="Download components necessary to compile"
+ depends="setup-bnd">
<!-- Download Commons Daemon -->
<antcall target="downloadgz-2">
@@ -3597,6 +3600,15 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
<param name="checksum.algorithm" value="${bnd.checksum.algorithm}"/>
<param name="checksum.value" value="${bnd.checksum.value}"/>
</antcall>
+ <!-- Download OSGi annotations -->
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${osgi-annotations.loc}"/>
+ <param name="destfile" value="${osgi-annotations.jar}"/>
+ <param name="destdir" value="${osgi-annotations.home}"/>
+ <param name="checksum.enabled"
value="${osgi-annotations.checksum.enabled}"/>
+ <param name="checksum.algorithm"
value="${osgi-annotations.checksum.algorithm}"/>
+ <param name="checksum.value" value="${osgi-annotations.checksum.value}"/>
+ </antcall>
</target>
<target name="setup-bnd" depends="download-bnd">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
