This is an automated email from the ASF dual-hosted git repository.
rotty3000 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 5157388 fix module names to reflect Java EE origin
5157388 is described below
commit 515738866dc732e68121364dbaa84406f7a6d0c9
Author: Raymond Augé <rotty3...@apache.org>
AuthorDate: Tue Jul 14 17:31:43 2020 -0400
fix module names to reflect Java EE origin
Signed-off-by: Raymond Augé <rotty3...@apache.org>
---
res/bnd/annotations-api.jar.tmp.bnd | 4 ++--
res/bnd/catalina.jar.tmp.bnd | 20 ++++++++++----------
res/bnd/el-api.jar.tmp.bnd | 4 ++--
res/bnd/jaspic-api.jar.tmp.bnd | 4 ++--
res/bnd/jsp-api.jar.tmp.bnd | 4 ++--
res/bnd/servlet-api.jar.tmp.bnd | 4 ++--
res/bnd/tomcat-embed-core.jar.tmp.bnd | 20 ++++++++++----------
res/bnd/websocket-api.jar.tmp.bnd | 4 ++--
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index e932d93..f21889d 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
Specification-Version=1.3
-jpms-module-info: \
- jakarta.annotation;\
+ java.annotation;\
access=32;\
version=${annotation.spec.version}
-jpms-module-info-options: \
- jakarta.annotation;\
+ java.annotation;\
substitute=annotations-api
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 972745c..c3fcab1 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -55,15 +55,15 @@ Export-Package: \
access=32;\
version=${Bundle-Version};\
modules='\
- jakarta.ejb-api,\
- jakarta.mail,\
- jakarta.persistence-api,\
- jakarta.xml.rpc-api,\
- java.xml.ws'
+ java.persistence,\
+ javax.ejb.api,\
+ javax.mail.api,\
+ javax.xml.rpc.api,\
+ javax.xml.ws'
-jpms-module-info-options: \
${module.name};substitute=catalina,\
- jakarta.ejb-api;static=true,\
- jakarta.mail;static=true,\
- jakarta.persistence-api;static=true,\
- jakarta.xml.rpc-api;static=true,\
- java.xml.ws;static=true
\ No newline at end of file
+ java.persistence;static=true,\
+ javax.ejb.api;static=true,\
+ javax.mail.api;static=true,\
+ javax.xml.rpc.api;static=true,\
+ javax.xml.ws;static=true
\ No newline at end of file
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 4c5333e..d81d961 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;\
+ javax.el.api;\
access=32;\
version=${el.spec.version}
-jpms-module-info-options: \
- jakarta.el.api;\
+ javax.el.api;\
substitute=el-api
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index 392a357..e7c44db 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;\
+ javax.security.enterprise.api;\
access=32;\
version=${jaspic.spec.version}
-jpms-module-info-options: \
- jakarta.security.enterprise;\
+ javax.security.enterprise.api;\
substitute=jaspic-api
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 4c3630e..e011d76 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
Implementation-Vendor='Apache Software Foundation'
-jpms-module-info: \
- jakarta.servlet.jsp;\
+ javax.servlet.jsp.api;\
access=32;\
version=${jsp.spec.version}
-jpms-module-info-options: \
- jakarta.servlet.jsp;\
+ javax.servlet.jsp.api;\
substitute=jsp-api
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 463b145..8fd76bd 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -39,9 +39,9 @@ Provide-Capability: \
Implementation-Vendor='Apache Software Foundation'
-jpms-module-info: \
- jakarta.servlet;\
+ javax.servlet.api;\
access=32;\
version=${servlet.spec.version}
-jpms-module-info-options: \
- jakarta.servlet;\
+ javax.servlet.api;\
substitute=servlet-api
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 056d9fa..a834809 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -131,15 +131,15 @@ Provide-Capability: \
access=32;\
version=${Bundle-Version};\
modules='\
- jakarta.ejb-api,\
- jakarta.mail,\
- jakarta.persistence-api,\
- jakarta.xml.rpc-api,\
- java.xml.ws'
+ java.persistence,\
+ javax.ejb.api,\
+ javax.mail.api,\
+ javax.xml.rpc.api,\
+ javax.xml.ws'
-jpms-module-info-options: \
${module.name};substitute=tomcat-embed-core,\
- jakarta.ejb-api;static=true,\
- jakarta.mail;static=true,\
- jakarta.persistence-api;static=true,\
- jakarta.xml.rpc-api;static=true,\
- java.xml.ws;static=true
+ java.persistence;static=true,\
+ javax.ejb.api;static=true,\
+ javax.mail.api;static=true,\
+ javax.xml.rpc.api;static=true,\
+ javax.xml.ws;static=true
diff --git a/res/bnd/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index f79fe23..ccf9942 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;\
+ javax.websocket.api;\
access=32;\
version=${websocket.spec.version}
-jpms-module-info-options: \
- jakarta.websocket.api;\
+ javax.websocket.api;\
substitute=websocket-api
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
