52bdf0a
diff -up ./build.xml.orig ./build.xml
52bdf0a
--- ./build.xml.orig	2020-07-13 12:59:09.555368724 -0400
52bdf0a
+++ ./build.xml	2020-07-13 13:06:51.246135917 -0400
52bdf0a
@@ -3307,6 +3307,11 @@ Read the Building page on the Apache Tom
52bdf0a
     
52bdf0a
     <path id="bnd.classpath">
c670fc3
       <fileset file="${bnd.jar}" />
52bdf0a
+      <fileset file="${bndlib.jar}" />
c670fc3
+      <fileset file="${bndlibg.jar}" />
32304e7
+      <fileset file="${bndannotation.jar}" />
32304e7
+      <fileset file="${slf4j-api.jar}" />
52bdf0a
+      <fileset file="${osgi-cmpn.jar}" />
c670fc3
     </path>
c670fc3
 
52bdf0a
     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
52bdf0a
diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd
52bdf0a
--- ./res/bnd/build-defaults.bnd.orig	2020-07-13 13:47:01.229077747 -0400
52bdf0a
+++ ./res/bnd/build-defaults.bnd	2020-07-13 13:47:12.923095618 -0400
52bdf0a
@@ -13,7 +13,7 @@
52bdf0a
 # See the License for the specific language governing permissions and
52bdf0a
 # limitations under the License.
52bdf0a
52bdf0a
-Bundle-Version: ${version_cleanup;${version}}
52bdf0a
+Bundle-Version: ${version}
52bdf0a
52bdf0a
 Specification-Title: Apache Tomcat
52bdf0a
 Specification-Version: ${version.major.minor}