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/09 12:41:14 UTC
[tomcat] branch 9.0.x updated: Fix BZ 64498 - Incorrect OSGi
Manifests
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 4fb1ee2 Fix BZ 64498 - Incorrect OSGi Manifests
4fb1ee2 is described below
commit 4fb1ee2bd3429f4cdd2352157145f3f080da57f7
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Jun 4 10:42:38 2020 -0400
Fix BZ 64498 - Incorrect OSGi Manifests
https://bz.apache.org/bugzilla/show_bug.cgi?id=64498
---
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 | 8 ++++++++
26 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd b/res/bnd/annotations-api.jar.tmp.bnd
index 0a53313..c4fc5e6 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.annotation,\
javax.annotation.security,\
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 0f40f54..3a39141 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@
+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 c17840d..cd40151 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@
+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 f9b1785..bfd44db 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@
+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 2e95297..23ac6dd 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@
+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 1fa35d4..185b968 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@
+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 daa49f4..2b57d02 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: javax.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 e2461c6..89857e3 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@
+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 1677562..8bc15ff 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@
+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 1ef6cda..0b475f9 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.security.auth.message,\
javax.security.auth.message.callback,\
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 732f30f..de77c2b 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.servlet.jsp,\
javax.servlet.jsp.el,\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 76f65e7..6c51fca 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.servlet,\
javax.servlet.annotation,\
diff --git a/res/bnd/tomcat-api.jar.tmp.bnd b/res/bnd/tomcat-api.jar.tmp.bnd
index 836b394..4a51513 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@
+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 9d5169e..5bfa5d8 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@
+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 67ffd30..25b6723 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@
+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 09a4d8f..23ce852 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.security.auth.message,\
javax.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 8b83d18..f29548c 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.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 d01e52b..12b92d2 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.servlet.jsp,\
javax.servlet.jsp.el,\
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 3a45335..c8cc4fc 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.websocket,\
javax.websocket.server,\
diff --git a/res/bnd/tomcat-jni.jar.tmp.bnd b/res/bnd/tomcat-jni.jar.tmp.bnd
index 6047c7a..22f1b73 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@
+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 3c3e894..3190773 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@
+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 0fc1ee6..683cad6 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@
+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 688de18..3e35089 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@
+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 67dbf93..87e7c7c 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@
+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 c14ea03..2d52069 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@
+Bundle-Version: ${version_cleanup;@VERSION@}
Export-Package: \
javax.websocket,\
javax.websocket.server
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2780776..23ff3ac 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>64498</bug>: Fix incorrect version format in OSGi manifests. Patch
+ provided by Raymond Augé. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.36 (markt)" rtext="2020-06-07">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org