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/11/03 18:46:36 UTC
[tomcat] 01/04: Align JPMS module names with current jakarta
expectations
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
commit 1a338aa178b2d03b2296c15f446d9f7f21e240e3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Nov 2 19:17:45 2020 +0000
Align JPMS module names with current jakarta expectations
---
res/bnd/el-api.jar.tmp.bnd | 4 ++--
res/bnd/jaspic-api.jar.tmp.bnd | 4 ++--
res/bnd/websocket-api.jar.tmp.bnd | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 383a2c1..ec61955 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -34,9 +34,9 @@ Provide-Capability: \
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
- jakarta.el.api;\
+ jakarta.el;\
access=32;\
version=${el.spec.version}
-jpms-module-info-options: \
- jakarta.el.api;\
+ jakarta.el;\
substitute=el-api
\ No newline at end of file
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index 29845a1..7cf0565 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
- jakarta.security.enterprise;\
+ jakarta.security.auth.message;\
access=32;\
version=${jaspic.spec.version}
-jpms-module-info-options: \
- jakarta.security.enterprise;\
+ jakarta.security.auth.message;\
substitute=jaspic-api
\ 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 42bb888..93c9fe3 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
- jakarta.websocket.api;\
+ jakarta.websocket;\
access=32;\
version=${websocket.spec.version}
-jpms-module-info-options: \
- jakarta.websocket.api;\
+ jakarta.websocket;\
substitute=websocket-api
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org