Index: apache-tomcat-9.0.115-src/build.properties.default
===================================================================
--- apache-tomcat-9.0.115-src.orig/build.properties.default
+++ apache-tomcat-9.0.115-src/build.properties.default
@@ -322,17 +322,6 @@ spotbugs.home=${base.path}/spotbugs-${sp
 spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
 spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
 
-# ----- bnd, version 6.3.0 or later  -----
-# ----- provides OSGI metadata for JARs       -----
-bnd.version=7.2.0
-bnd.checksum.enabled=true
-bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=dea22b7afa9de21e1adb27d2e835a94c|af26ddc466eb178963d4eb800d2824f488037aec
-
-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
-
 # ----- JSign, version 4.1 or later -----
 # Note: There are known issues with Tomcat and Jsign 7.0 and 7.1
 jsign.version=7.4
Index: apache-tomcat-9.0.115-src/build.xml
===================================================================
--- apache-tomcat-9.0.115-src.orig/build.xml
+++ apache-tomcat-9.0.115-src/build.xml
@@ -78,7 +78,6 @@
   <property name="tomcat.home"           value="${basedir}"/>
   <property name="tomcat-nb.home"        value="${basedir}/nbproject" />
   <property name="tomcat.output"         value="${basedir}/output"/>
-  <property name="tomcat.bnd"            value="${basedir}/res/bnd"/>
   <property name="tomcat.build"          value="${tomcat.output}/build"/>
   <property name="tomcat.classes"        value="${tomcat.output}/classes"/>
   <property name="tomcat.deployer"       value="${tomcat.output}/deployer"/>
@@ -219,7 +218,6 @@
 
   <!-- Classpaths -->
   <path id="compile.classpath">
-    <pathelement location="${bnd.jar}"/>
     <pathelement location="${jdt.jar}"/>
     <pathelement location="${jaxrpc-lib.jar}"/>
     <pathelement location="${wsdl4j-lib.jar}"/>
@@ -256,7 +254,6 @@
     <filter token="HAMCREST_JAR" value="${hamcrest.jar}"/>
     <filter token="OBJENESIS_JAR" value="${objenesis.jar}"/>
     <filter token="BYTEBUDDY_JAR" value="${bytebuddy.jar}"/>
-    <filter token="BND_JAR" value="${bnd.jar}"/>
     <filter token="UNBOUNDID_JAR" value="${unboundid.jar}"/>
     <filter token="JUNIT_JAR" value="${junit.jar}"/>
     <filter token="OUTPUT_DIR" value="${tomcat.output}"/>
@@ -306,7 +303,6 @@
     <include name="**/javax.websocket.server.ServerEndpointConfig$Configurator"/>
     <include name="**/.gitignore"/>
     <include name="**/*-password"/>
-    <include name="**/*.bnd"/>
     <include name="**/*.classpath"/>
     <include name="**/*.conf"/>
     <include name="**/*.css"/>
@@ -1691,7 +1687,7 @@
     </txt2html>
   </target>
   <target name="embed-jars" description="Create embedded jars"
-    depends="build-manifests,setup-bnd,compile,package" >
+    depends="build-manifests,compile,package" >
 
     <mkdir dir="${tomcat.embed}" />
 
@@ -3642,8 +3638,7 @@ Configured for ${release.asfusername} to
   </target>
 
   <target name="download-compile"
-          description="Download components necessary to compile"
-          depends="setup-bnd">
+          description="Download components necessary to compile">
 
     <!-- Download Commons Daemon -->
     <antcall target="downloadgz-2">
@@ -4273,27 +4268,6 @@ Read the Building page on the Apache Tom
     <taskdef name="jsign" classname="net.jsign.JsignTask" classpathref="jsign.classpath" />
   </target>
 
-  <target name="download-bnd" >
-    <!-- Download bnd -->
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${bnd.loc}"/>
-      <param name="destfile" value="${bnd.jar}"/>
-      <param name="destdir" value="${bnd.home}"/>
-      <param name="checksum.enabled" value="${bnd.checksum.enabled}"/>
-      <param name="checksum.algorithm" value="${bnd.checksum.algorithm}"/>
-      <param name="checksum.value" value="${bnd.checksum.value}"/>
-    </antcall>
-  </target>
-
-  <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>
-
   <macrodef name="jarIt" description="utility macro for standard JAR packaging">
     <attribute name="jarfile"
                description="the name of the JAR file to create"/>
@@ -4345,11 +4319,6 @@ Read the Building page on the Apache Tom
           <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
           <zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
         </jar>
-        <antcall target="add-osgi" >
-          <param name="jarfile" value="@{jarfile}" />
-          <param name="addOSGi" value="@{addOSGi}" />
-          <param name="libs" value="@{libs}" />
-        </antcall>
         <antcall target="add-graal">
           <param name="jarfile" value="@{jarfile}" />
           <param name="addGraal" value="@{addGraal}" />
@@ -4360,26 +4329,6 @@ Read the Building page on the Apache Tom
     </sequential>
   </macrodef>
 
-  <target name="add-osgi" if="${addOSGi}" unless="${skip.build.java.version}" >
-    <echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
-    <local name="filename"/>
-    <basename property="filename" file="${jarfile}"/>
-    <bnd
-      basedir="${basedir}"
-      output="${jarfile}.tmp"
-    >
-      <classpath>
-        <pathelement location="${bnd.jar}"/>
-        <fileset dir="${tomcat.output}" includes="${libs}" excludes="build/lib/tomcat-i18n-*.jar" />
-      </classpath>
-      <bndfiles>
-        <pathelement location="${tomcat.bnd}/${filename}.tmp.bnd"/>
-      </bndfiles>
-    </bnd>
-    <delete file="${jarfile}" />
-    <move file="${jarfile}.tmp" tofile="${jarfile}" />
-  </target>
-
   <target name="add-graal" if="${addGraal}">
     <echo message="add-graal  ${addGraal} ${jarfile} ${graalFiles} ${graalPrefix}"></echo>
     <!-- Reproducible builds: consistent timestamps for graal files -->