This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new a546953 Fix BZ 64515 - no need to filter bnd files (bnd passes ant
properties in)
a546953 is described below
commit a546953a6bc62f28e9e4f6612b2c8dcfb110bc6d
Author: Raymond Augé <rotty3...@apache.org>
AuthorDate: Thu Jun 11 00:21:46 2020 -0400
Fix BZ 64515 - no need to filter bnd files (bnd passes ant properties in)
Signed-off-by: Raymond Augé <rotty3...@apache.org>
---
build.xml | 30 +++---------------------------
res/bnd/annotations-api.jar.tmp.bnd | 2 +-
res/bnd/catalina-ha.jar.tmp.bnd | 2 +-
res/bnd/catalina-ssi.jar.tmp.bnd | 2 +-
res/bnd/catalina-storeconfig.jar.tmp.bnd | 2 +-
res/bnd/catalina-tribes.jar.tmp.bnd | 2 +-
res/bnd/catalina.jar.tmp.bnd | 2 +-
res/bnd/el-api.jar.tmp.bnd | 2 +-
res/bnd/jasper-el.jar.tmp.bnd | 2 +-
res/bnd/jasper.jar.tmp.bnd | 2 +-
res/bnd/jaspic-api.jar.tmp.bnd | 2 +-
res/bnd/jsp-api.jar.tmp.bnd | 2 +-
res/bnd/servlet-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-coyote.jar.tmp.bnd | 2 +-
res/bnd/tomcat-dbcp.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-el.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
res/bnd/tomcat-jni.jar.tmp.bnd | 2 +-
res/bnd/tomcat-juli.jar.tmp.bnd | 2 +-
res/bnd/tomcat-util-scan.jar.tmp.bnd | 2 +-
res/bnd/tomcat-util.jar.tmp.bnd | 2 +-
res/bnd/tomcat-websocket.jar.tmp.bnd | 2 +-
res/bnd/websocket-api.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 4 ++++
27 files changed, 32 insertions(+), 52 deletions(-)
diff --git a/build.xml b/build.xml
index 09099d9..931524c 100644
--- a/build.xml
+++ b/build.xml
@@ -73,7 +73,7 @@
<property name="tomcat.home" value="${basedir}"/>
<property name="tomcat-nb.home" value="${basedir}/nbproject" />
<property name="tomcat.output" value="${basedir}/output"/>
- <property name="tomcat.bnd" value="${tomcat.output}/bnd"/>
+ <property name="tomcat.bnd" value="${basedir}/res/bnd"/>
<property name="tomcat.build" value="${tomcat.output}/build"/>
<property name="tomcat.classes" value="${tomcat.output}/classes"/>
<property name="tomcat.deployer" value="${tomcat.output}/deployer"/>
@@ -558,18 +558,6 @@
</srcfiles>
</uptodate>
- <!-- Property that determines if OSGI bnd files need updating -->
- <uptodate property="bnd.uptodate"
- targetfile="${tomcat.bnd}/annotations-api.bnd" >
- <srcfiles file="${user.home}/build.properties" />
- <srcfiles file="${basedir}/build.properties" />
- <srcfiles file="${basedir}/build.properties.default" />
- <srcfiles file="${basedir}/build.xml" />
- <srcfiles dir="${tomcat.home}/res/bnd" >
- <include name="*.bnd" />
- </srcfiles>
- </uptodate>
-
</target>
<target name="validate" if="${execute.validate}"
@@ -769,19 +757,7 @@
</target>
- <target name="build-bnd" unless="bnd.uptodate"
- depends="setup-bnd,build-prepare">
-
- <mkdir dir="${tomcat.bnd}" />
- <copy todir="${tomcat.bnd}" overwrite="yes" filtering="yes"
- encoding="ISO-8859-1">
- <filterset refid="version.filters"/>
- <fileset dir="${tomcat.home}/res/bnd" />
- </copy>
-
- </target>
-
- <target name="package" depends="compile,build-manifests,build-bnd" >
+ <target name="package" depends="compile,build-manifests,setup-bnd" >
<!-- Common Annotations JAR File -->
<jarIt jarfile="${annotations-api.jar}"
filesDir="${tomcat.classes}"
@@ -1386,7 +1362,7 @@
</txt2html>
</target>
<target name="embed-jars" description="Create experimental embedded jars"
- depends="build-manifests,build-bnd,compile" >
+ depends="build-manifests,setup-bnd,compile" >
<mkdir dir="${tomcat.embed}" />
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index 67c7c5f..702a5ad 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.annotation,\
jakarta.annotation.security,\
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 3a39141..1e88476 100644
--- a/res/bnd/catalina-ha.jar.tmp.bnd
+++ b/res/bnd/catalina-ha.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-catalina-ha
Bundle-SymbolicName: org.apache.tomcat-catalina-ha
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.ha,\
org.apache.catalina.ha.authenticator,\
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
index cd40151..ba9fd41 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -14,6 +14,6 @@
# limitations under the License.
Bundle-Name: tomcat-ssi
Bundle-SymbolicName: org.apache.tomcat-ssi
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.ssi
diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd
b/res/bnd/catalina-storeconfig.jar.tmp.bnd
index bfd44db..0443331 100644
--- a/res/bnd/catalina-storeconfig.jar.tmp.bnd
+++ b/res/bnd/catalina-storeconfig.jar.tmp.bnd
@@ -14,5 +14,5 @@
# limitations under the License.
Bundle-Name: tomcat-storeconfig
Bundle-SymbolicName: org.apache.tomcat-storeconfig
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: org.apache.catalina.storeconfig
\ No newline at end of file
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd
b/res/bnd/catalina-tribes.jar.tmp.bnd
index 23ac6dd..a4b8754 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-tribes
Bundle-SymbolicName: org.apache.tomcat-tribes
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.tribes,\
org.apache.catalina.tribes.group,\
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 185b968..ce296f2 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-catalina
Bundle-SymbolicName: org.apache.tomcat-catalina
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.authenticator,\
org.apache.catalina.authenticator.jaspic,\
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 89bcb75..6eb434e 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -14,5 +14,5 @@
# limitations under the License.
Bundle-Name: tomcat-el-api
Bundle-SymbolicName: org.apache.tomcat-el-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: jakarta.el
\ No newline at end of file
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 89857e3..896ef52 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-jasper-el
Bundle-SymbolicName: org.apache.tomcat-jasper-el
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.el,\
org.apache.el.lang,\
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index 8bc15ff..5a5b5e6 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-jasper
Bundle-SymbolicName: org.apache.tomcat-jasper
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.jasper,\
org.apache.jasper.compiler,\
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index f63b018..d376bf6 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-jaspic-api
Bundle-SymbolicName: org.apache.tomcat-jaspic-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.security.auth.message,\
jakarta.security.auth.message.callback,\
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 37ce24d..82646da 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-jsp-api
Bundle-SymbolicName: org.apache.tomcat-jsp-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.servlet.jsp,\
jakarta.servlet.jsp.el,\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 49be916..e34289d 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-servlet-api
Bundle-SymbolicName: org.apache.tomcat-servlet-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.servlet,\
jakarta.servlet.annotation,\
diff --git a/res/bnd/tomcat-api.jar.tmp.bnd b/res/bnd/tomcat-api.jar.tmp.bnd
index 4a51513..69a2369 100644
--- a/res/bnd/tomcat-api.jar.tmp.bnd
+++ b/res/bnd/tomcat-api.jar.tmp.bnd
@@ -14,5 +14,5 @@
# limitations under the License.
Bundle-Name: tomcat-api
Bundle-SymbolicName: org.apache.tomcat-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: org.apache.tomcat
diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd
b/res/bnd/tomcat-coyote.jar.tmp.bnd
index 5bfa5d8..24eab7c 100644
--- a/res/bnd/tomcat-coyote.jar.tmp.bnd
+++ b/res/bnd/tomcat-coyote.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-coyote
Bundle-SymbolicName: org.apache.tomcat-coyote
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.coyote,\
org.apache.coyote.ajp,\
diff --git a/res/bnd/tomcat-dbcp.jar.tmp.bnd b/res/bnd/tomcat-dbcp.jar.tmp.bnd
index 25b6723..13f73eb 100644
--- a/res/bnd/tomcat-dbcp.jar.tmp.bnd
+++ b/res/bnd/tomcat-dbcp.jar.tmp.bnd
@@ -15,7 +15,7 @@
Automatic-Module-Name: org.apache.tomcat.dbcp
Bundle-Name: tomcat-dbcp
Bundle-SymbolicName: org.apache.tomcat-dbcp
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.dbcp.dbcp2.cpdsadapter,\
org.apache.tomcat.dbcp.dbcp2.datasources,\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index cfbcad3..e37347d 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -15,7 +15,7 @@
Automatic-Module-Name: org.apache.tomcat.embed.core
Bundle-Name: tomcat-embed-core
Bundle-SymbolicName: org.apache.tomcat-embed-core
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.security.auth.message,\
jakarta.security.auth.message.callback,\
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index b232adc..fa4c7ce 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -15,7 +15,7 @@
Automatic-Module-Name: org.apache.tomcat.embed.jasper.el
Bundle-Name: tomcat-embed-jasper-el
Bundle-SymbolicName: org.apache.tomcat-embed-jasper-el
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.el,\
org.apache.el,\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index ea1fcf0..f6f3699 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -15,7 +15,7 @@
Automatic-Module-Name: org.apache.tomcat.embed.jasper
Bundle-Name: tomcat-embed-jasper
Bundle-SymbolicName: org.apache.tomcat-embed-jasper
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.servlet.jsp,\
jakarta.servlet.jsp.el,\
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index c7a1f50..700f0f4 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -15,7 +15,7 @@
Automatic-Module-Name: org.apache.tomcat.embed.websocket
Bundle-Name: tomcat-embed-websocket
Bundle-SymbolicName: org.apache.tomcat-embed-websocket
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.websocket,\
jakarta.websocket.server,\
diff --git a/res/bnd/tomcat-jni.jar.tmp.bnd b/res/bnd/tomcat-jni.jar.tmp.bnd
index 22f1b73..44386e2 100644
--- a/res/bnd/tomcat-jni.jar.tmp.bnd
+++ b/res/bnd/tomcat-jni.jar.tmp.bnd
@@ -14,5 +14,5 @@
# limitations under the License.
Bundle-Name: tomcat-jni
Bundle-SymbolicName: org.apache.tomcat-jni
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: org.apache.tomcat.jni
\ No newline at end of file
diff --git a/res/bnd/tomcat-juli.jar.tmp.bnd b/res/bnd/tomcat-juli.jar.tmp.bnd
index 3190773..06646c4 100644
--- a/res/bnd/tomcat-juli.jar.tmp.bnd
+++ b/res/bnd/tomcat-juli.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-juli
Bundle-SymbolicName: org.apache.tomcat-juli
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.juli,\
org.apache.juli.logging
\ No newline at end of file
diff --git a/res/bnd/tomcat-util-scan.jar.tmp.bnd
b/res/bnd/tomcat-util-scan.jar.tmp.bnd
index 683cad6..74bb629 100644
--- a/res/bnd/tomcat-util-scan.jar.tmp.bnd
+++ b/res/bnd/tomcat-util-scan.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-util-scan
Bundle-SymbolicName: org.apache.tomcat-util-scan
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.util.descriptor,\
org.apache.tomcat.util.descriptor.tagplugin,\
diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
index 3e35089..050330e 100644
--- a/res/bnd/tomcat-util.jar.tmp.bnd
+++ b/res/bnd/tomcat-util.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-util
Bundle-SymbolicName: org.apache.tomcat-util
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.util,\
org.apache.tomcat.util.buf,\
diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd
b/res/bnd/tomcat-websocket.jar.tmp.bnd
index 87e7c7c..8882ea1 100644
--- a/res/bnd/tomcat-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-websocket.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-websocket
Bundle-SymbolicName: org.apache.tomcat-websocket
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index 966e1ac..4ff2610 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -14,7 +14,7 @@
# limitations under the License.
Bundle-Name: tomcat-websocket-api
Bundle-SymbolicName: org.apache.tomcat-websocket-api
-Bundle-Version: ${version_cleanup;@VERSION@}
+Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.websocket,\
jakarta.websocket.server
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1a09447..f86e799 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -99,6 +99,10 @@
Remove bndlib from dependencies as it is not required. Pull request
provided by Raymond Augé. (markt)
</fix>
+ <fix>
+ Bnd files don't need to be filtered (save some work). Pull request
+ provided by Raymond Augé. (rotty3000)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
