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 2f00383 Remove OSGi annotations dependency as it is no longer required
2f00383 is described below
commit 2f003838bd45b48a8c98afed037587b573fdf64a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 17 10:06:04 2022 +0000
Remove OSGi annotations dependency as it is no longer required
This used to be required because the bnd annotations used some enums
from OSGi annotations. These have now been replaced with strings to
avoid bnd users - like Tomcat - requiring a dependency on OSGi
annotations to create Javadoc.
# Conflicts:
# build.properties.default
---
build.properties.default | 10 ----------
build.xml | 11 -----------
webapps/docs/changelog.xml | 4 ++++
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 35ddd11..c443b83 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -308,16 +308,6 @@ 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
-# ----- OSGi annotations bundle, version 1.0.0 or later -----
-# ----- required to avoid Javadoc error when using bnd annotations -----
-osgi-annotations.version=1.1.1
-osgi-annotations.checksum.enabled=true
-osgi-annotations.checksum.algorithm=MD5|SHA-1
-osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
-osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
-osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-
# ----- JSign, version 4.0 or later -----
jsign.version=4.0
diff --git a/build.xml b/build.xml
index 8ed475b..8eaffa3 100644
--- a/build.xml
+++ b/build.xml
@@ -213,7 +213,6 @@
<!-- Classpaths -->
<path id="compile.classpath">
<pathelement location="${bnd.jar}"/>
- <pathelement location="${osgi-annotations.jar}"/>
<pathelement location="${jdt.jar}"/>
<pathelement location="${jaxrpc-lib.jar}"/>
<pathelement location="${wsdl4j-lib.jar}"/>
@@ -2272,7 +2271,6 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
- <path location="${osgi-annotations.jar}"/>
</classpath>
<link href="../annotationapi"/>
<link href="../servletapi"/>
@@ -3651,15 +3649,6 @@ 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 OSGi annotations -->
- <antcall target="downloadfile">
- <param name="sourcefile" value="${osgi-annotations.loc}"/>
- <param name="destfile" value="${osgi-annotations.jar}"/>
- <param name="destdir" value="${osgi-annotations.home}"/>
- <param name="checksum.enabled"
value="${osgi-annotations.checksum.enabled}"/>
- <param name="checksum.algorithm"
value="${osgi-annotations.checksum.algorithm}"/>
- <param name="checksum.value" value="${osgi-annotations.checksum.value}"/>
- </antcall>
</target>
<target name="setup-bnd" depends="download-bnd">
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 511e378..f7cfbf4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,10 @@
<update>
Update to bnd 6.2.0. (markt)
</update>
+ <update>
+ Remove OSGi annotations dependency as it is no longer required with bnd
+ 6.2.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
