Index: apache-tomcat-9.0.97-src/build.xml
===================================================================
--- apache-tomcat-9.0.97-src.orig/build.xml
+++ apache-tomcat-9.0.97-src/build.xml
@@ -228,11 +228,21 @@
   <!--<defaultexcludes echo="true" />-->
 
   <!-- Classpaths -->
+  <path id="bnd.classpath">
+    <fileset file="${bnd.jar}" />
+    <fileset dir="${bnd.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset file="${osgiannotation.jar}" />
+    <fileset file="${osgicmpn.jar}" />
+    <fileset file="${slf4j-api.jar}" />
+  </path>
+
   <path id="compile.classpath">
-    <pathelement location="${bnd.jar}"/>
     <pathelement location="${jdt.jar}"/>
     <pathelement location="${jaxrpc-lib.jar}"/>
     <pathelement location="${wsdl4j-lib.jar}"/>
+    <path refid="bnd.classpath"/>
   </path>
 
   <path id="tomcat.classpath">
@@ -4034,10 +4044,6 @@ Read the Building page on the Apache Tom
 
   <target name="setup-bnd" depends="download-bnd" unless="${skip.build.java.version}">
     <!-- Add bnd tasks to project -->
-    <path id="bnd.classpath">
-      <fileset file="${bnd.jar}" />
-    </path>
-
     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
   </target>