This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 01500b4 Fix 65362. Add JPMS entries to embedded JARs removed in
previous release
01500b4 is described below
commit 01500b47b57da3ebfa50e7e2965db3f328e49118
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 7 18:55:53 2021 +0100
Fix 65362. Add JPMS entries to embedded JARs removed in previous release
https://bz.apache.org/bugzilla/show_bug.cgi?id=65362
---
res/bnd/tomcat-embed-el.jar.tmp.bnd | 9 +++++++++
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 12 ++++++++++++
webapps/docs/changelog.xml | 6 ++++++
3 files changed, 27 insertions(+)
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index c302756..1567ec9 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -35,6 +35,15 @@ Provide-Capability: \
version:Version=${el.spec.version};\
uses:='${packages;NAMED;jakarta.el.*}'
+Require-Capability: \
+ osgi.extender;\
+
filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))",\
+ osgi.serviceloader;\
+ filter:="(osgi.serviceloader=jakarta.el.ExpressionFactory)";\
+ osgi.serviceloader="jakarta.el.ExpressionFactory",\
+ osgi.ee;\
+ filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+
-namesection: jakarta/el*/;\
Specification-Title=Jakarta Expression Language;\
Specification-Version=${el.spec.version};\
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 413b216..b175946 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -33,6 +33,18 @@ Provide-Capability: \
version:Version=${websocket.spec.version};\
uses:='${packages;NAMED;jakarta.websocket.*}'
+Require-Capability: \
+ osgi.extender;\
+
filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))",\
+ osgi.serviceloader;\
+ filter:="(osgi.serviceloader=jakarta.websocket.ContainerProvider)";\
+ osgi.serviceloader="jakarta.websocket.ContainerProvider",\
+ osgi.serviceloader;\
+
filter:="(osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator)";\
+
osgi.serviceloader="jakarta.websocket.server.ServerEndpointConfig$Configurator",\
+ osgi.ee;\
+ filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+
-namesection: jakarta/websocket*/;\
Specification-Title=Jakarta WebSocket;\
Specification-Version=${websocket.spec.version};\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ea3fdd3..dd7d5a3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -288,6 +288,12 @@
<add>
Improvements to Korean translations. (woonsan)
</add>
+ <fix>
+ <bug>65362</bug>: Correct a regression in the previous release. The
+ change to create OSGi <code>Require-Capability</code> sections in
+ manifests for Jakarta API JARs manually rather bnd annotations did not
+ add the necessary manual entries to the embedded JARs. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
