You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/11 13:55:10 UTC

[tomcat] branch 9.0.x updated: Complete partial update of BND dependency to 6.4.0

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 0e0f8424c3 Complete partial update of BND dependency to 6.4.0
0e0f8424c3 is described below

commit 0e0f8424c31e13f119d1d01ee883e2d6e6e5ca61
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 11 13:46:20 2023 +0000

    Complete partial update of BND dependency to 6.4.0
---
 build.properties.default                  | 4 ++--
 res/ide-support/eclipse/eclipse.classpath | 2 +-
 res/ide-support/idea/tomcat.iml           | 2 +-
 res/ide-support/netbeans/project.xml      | 2 +-
 webapps/docs/changelog.xml                | 7 +++++++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7c9714c521..8fee63c896 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -298,9 +298,9 @@ spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
 
 # ----- bnd, version 6.3.0 or later  -----
 # ----- provides OSGI metadata for JARs       -----
-bnd.version=6.3.1
+bnd.version=6.4.0
 
-# checksums for biz.aQute.bnd-6.3.1.jar
+# checksums for biz.aQute.bnd-6.4.0.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
 bnd.checksum.value=a812b31a81f05767ea11896a81cd8eab|8a359edbb02aad9138b7824a0d7bbe22f02cf990
diff --git a/res/ide-support/eclipse/eclipse.classpath b/res/ide-support/eclipse/eclipse.classpath
index 8f20fa8b78..3f28fb2028 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,7 +29,7 @@
     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/hamcrest-2.2/hamcrest-2.2.jar"/>
     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/cglib-3.3.0/cglib-nodep-3.3.0.jar"/>
     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/objenesis-3.2/objenesis-3.2.jar"/>
-    <classpathentry kind="var" path="TOMCAT_LIBS_BASE/bnd-6.3.1/biz.aQute.bnd-6.3.1.jar"/>
+    <classpathentry kind="var" path="TOMCAT_LIBS_BASE/bnd-6.4.0/biz.aQute.bnd-6.4.0.jar"/>
     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/unboundid-6.0.3/unboundid-ldapsdk-6.0.3.jar"/>
     <classpathentry kind="output" path=".settings/output"/>
 </classpath>
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 2bb7991897..1732bf4334 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$TOMCAT_BUILD_LIBS$/bnd-6.3.1/biz.aQute.bnd-6.3.1.jar!/" />
+          <root url="jar://$TOMCAT_BUILD_LIBS$/bnd-6.4.0/biz.aQute.bnd-6.4.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/res/ide-support/netbeans/project.xml b/res/ide-support/netbeans/project.xml
index 21cc436305..8f31636305 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
             -->
             <compilation-unit>
                 <package-root>java</package-root>
-                <classpath mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-6.3.1/biz.aQute.bnd-6.3.1.jar:${ant.includes}/</classpath>
+                <classpath mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-6.4.0/biz.aQute.bnd-6.4.0.jar:${ant.includes}/</classpath>
                 <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0e5469638a..6cd0a45704 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,13 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 9.0.72 (remm)" rtext="in development">
+  <subsection name="Other">
+    <changelog>
+      <update>
+        Update BND to 6.4.0. (markt)
+      </update>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 9.0.71 (remm)" rtext="release in progress">
   <subsection name="Catalina">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org