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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
     new 8ab750f  Update BND to 6.1.0
8ab750f is described below

commit 8ab750f4acf60fb3039c911d27ce57e9ac41f4f9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jan 2 17:15:24 2022 +0000

    Update BND to 6.1.0
---
 build.properties.default                  | 8 ++++----
 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                | 3 +++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ea7a048..411efcb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -292,14 +292,14 @@ spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
 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 5.3.0 or later  -----
+# ----- bnd, version 6.0.0 or later  -----
 # ----- provides OSGI metadata for JARs       -----
-bnd.version=5.3.0
+bnd.version=6.1.0
 
-# checksums for biz.aQute.bnd-5.3.0.jar
+# checksums for biz.aQute.bnd-6.1.0.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=7cba73481ee6e72b182ba5c13801aafe|10ec0974db02f810e9345b218f4de4abe898ab04
+bnd.checksum.value=3f4bcd3e67f31a563d49370364b62915|d54eba8fb11eb43bb40eac7e3cb92e906b9fa567
 
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/res/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index e2d80b6..074a01d 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-5.3.0/biz.aQute.bnd-5.3.0.jar"/>
+    <classpathentry kind="var" 
path="TOMCAT_LIBS_BASE/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar"/>
     <classpathentry kind="var" 
path="TOMCAT_LIBS_BASE/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar"/>
     <classpathentry kind="var" 
path="TOMCAT_LIBS_BASE/unboundid-6.0.3/unboundid-ldapsdk-6.0.3.jar"/>
     <classpathentry kind="output" path=".settings/output"/>
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index a84c1de..5be2060 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-5.3.0/biz.aQute.bnd-5.3.0.jar!/" />
+          <root 
url="jar://$TOMCAT_BUILD_LIBS$/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 19d4262..1d3c25b 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.22/ecj-4.22.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.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.22/ecj-4.22.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.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 ef706fc..ed31742 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,9 @@
       <update>
         Update CheckStyle to 9.2.1. (markt)
       </update>
+      <update>
+        Update BND to 6.1.0. (markt)
+      </update>
     </changelog>
   </subsection>
 </section>

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

Reply via email to