Fix Javadoc build error and ensure 'ant clean javadoc' works

Author: markt-asf

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

build.xml

@@ -226,6 +226,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}"/>
@@ -943,7 +944,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}"
@@ -2178,7 +2179,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="jakarta.annotation.*"
       sourcepath="${tomcat.dist}/src/java"
@@ -2324,6 +2325,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"/>
@@ -3059,7 +3061,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">
@@ -3604,6 +3607,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">