This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1e3e338873 Fix BZ 66438 - correct names of Jakarta modules in JPMS
metadata
1e3e338873 is described below
commit 1e3e338873a2e5ee1126dd07bcda94dd07508d99
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 23 09:56:55 2023 +0000
Fix BZ 66438 - correct names of Jakarta modules in JPMS metadata
---
res/bnd/catalina.jar.tmp.bnd | 12 ++++++------
res/bnd/tomcat-embed-core.jar.tmp.bnd | 12 ++++++------
webapps/docs/changelog.xml | 4 ++++
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 181e69fe8b..8720b37d7f 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -54,15 +54,15 @@ Export-Package: \
access=32;\
version=${Bundle-Version};\
modules='\
- jakarta.ejb-api,\
+ jakarta.ejb,\
jakarta.mail,\
- jakarta.persistence-api,\
- jakarta.xml.rpc-api,\
+ jakarta.persistence,\
+ jakarta.xml.ws,\
java.xml.ws'
-jpms-module-info-options: \
${module.name};substitute=catalina,\
- jakarta.ejb-api;static=true,\
+ jakarta.ejb;static=true,\
jakarta.mail;static=true,\
- jakarta.persistence-api;static=true,\
- jakarta.xml.rpc-api;static=true,\
+ jakarta.persistence;static=true,\
+ jakarta.xml.ws;static=true,\
java.xml.ws;static=true
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 314f672019..7e83e60f56 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -129,15 +129,15 @@ Provide-Capability: \
access=32;\
version=${Bundle-Version};\
modules='\
- jakarta.ejb-api,\
+ jakarta.ejb,\
jakarta.mail,\
- jakarta.persistence-api,\
- jakarta.xml.rpc-api,\
+ jakarta.persistence,\
+ jakarta.xml.ws,\
java.xml.ws'
-jpms-module-info-options: \
${module.name};substitute=tomcat-embed-core,\
- jakarta.ejb-api;static=true,\
+ jakarta.ejb;static=true,\
jakarta.mail;static=true,\
- jakarta.persistence-api;static=true,\
- jakarta.xml.rpc-api;static=true,\
+ jakarta.persistence;static=true,\
+ jakarta.xml.ws;static=true,\
java.xml.ws;static=true
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 066872b6f7..a6b3175469 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
Allow a Valve to access cookies from a request that cannot be mapped to
a Context. (markt)
</fix>
+ <fix>
+ <bug>66438</bug>: Correct names of Jakarta modules in JPMS metadata.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
