--- apache-tomcat-9.0.75-src/build.xml	2023-05-22 18:12:16.995658642 +0200
+++ apache-tomcat-9.0.75-src/build.xml	2023-05-22 19:41:42.051370923 +0200
@@ -215,10 +215,10 @@
 
   <!-- Classpaths -->
   <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">
@@ -3845,6 +3845,12 @@
     <!-- Add bnd tasks to project -->
     <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>
 
     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />