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 2020/06/11 11:52:43 UTC
[tomcat] branch 9.0.x updated: Fix BZ 64513 - bndlib is not needed,
normalize the name to bnd everywhere
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 ba42096 Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everywhere
ba42096 is described below
commit ba4209647fb2a741291dde5c7693deee551000de
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Tue Jun 9 11:44:41 2020 -0400
Fix BZ 64513 - bndlib is not needed, normalize the name to bnd everywhere
Signed-off-by: Raymond Augé <ro...@apache.org>
---
build.properties.default | 9 ---------
build.xml | 15 ++-------------
webapps/docs/changelog.xml | 4 ++++
3 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d1183fb..2d9be9c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -295,15 +295,6 @@ bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
bnd.checksum.value=477684fd83707666cc84a766b147ed0c|9069bc1afad9201e3dc2efe62c0d5193777d16ae
-# checksums for biz.aQute.bndlib-5.1.0.jar
-bndlib.checksum.enabled=true
-bndlib.checksum.algorithm=MD5|SHA-1
-bndlib.checksum.value=59dfe87f09e3f03be891327a91430182|30e119e5b3ae63dbb86532490855707b009e1b2e
-
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
-
-bndlib.home=${base.path}/bndlib-${bnd.version}
-bndlib.jar=${bndlib.home}/biz.aQute.bndlib-${bnd.version}.jar
-bndlib.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bndlib/${bnd.version}/biz.aQute.bndlib-${bnd.version}.jar
diff --git a/build.xml b/build.xml
index b008b2d..c7ea21b 100644
--- a/build.xml
+++ b/build.xml
@@ -3311,26 +3311,15 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
<param name="checksum.algorithm" value="${bnd.checksum.algorithm}"/>
<param name="checksum.value" value="${bnd.checksum.value}"/>
</antcall>
-
- <!-- Download bndlib -->
- <antcall target="downloadfile">
- <param name="sourcefile" value="${bndlib.loc}"/>
- <param name="destfile" value="${bndlib.jar}"/>
- <param name="destdir" value="${bndlib.home}"/>
- <param name="checksum.enabled" value="${bndlib.checksum.enabled}"/>
- <param name="checksum.algorithm" value="${bndlib.checksum.algorithm}"/>
- <param name="checksum.value" value="${bndlib.checksum.value}"/>
- </antcall>
</target>
<target name="setup-bnd" depends="download-bnd">
<!-- Add bnd tasks to project -->
- <path id="bndlib.classpath">
+ <path id="bnd.classpath">
<fileset file="${bnd.jar}" />
- <fileset file="${bndlib.jar}" />
</path>
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" />
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
</target>
<macrodef name="jarIt" description="utility macro for standard JAR packaging">
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fcd0a44..48975a0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -89,6 +89,10 @@
<code>LOGGING_CONFIG</code> environment variable to avoid using a POSIX
shell feature that is not available by default on Solaris 10. (markt)
</fix>
+ <fix>
+ Remove bndlib from dependencies as it is not required. Pull request
+ provided by Raymond Augé. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org