markt-asf commented on a change in pull request #322:
URL: https://github.com/apache/tomcat/pull/322#discussion_r455000264
##########
File path: 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'
+ javax.ejb.api,\
+ javax.mail,\
+ javax.persistence.api,\
+ javax.xml.rpc.api,\
+ javax.xml.ws.api'
-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
+ javax.ejb.api;static=true,\
+ javax.mail;static=true,\
+ javax.persistence.api;static=true,\
+ javax.xml.rpc.api;static=true,\
+ javax.xml.ws.api;static=true
Review comment:
This looks to have a module name of `javax.xml.ws` in Java EE 8
##########
File path: 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,\
+ javax.ejb.api,\
+ javax.mail,\
Review comment:
I think you need another `.api` here. Java EE 8 doesn't define a module
name and Jakarta EE uses `jakarta.mail.api` so I think it is reasonable to use
`javax.mail.api` here. The bundle sumbolic name is `javax.mail-api`
##########
File path: 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'
+ javax.ejb.api,\
+ javax.mail,\
+ javax.persistence.api,\
+ javax.xml.rpc.api,\
+ javax.xml.ws.api'
-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
+ javax.ejb.api;static=true,\
+ javax.mail;static=true,\
+ javax.persistence.api;static=true,\
Review comment:
This looks to have a module name of `java.persistence` in Java EE 8
##########
File path: res/bnd/annotations-api.jar.tmp.bnd
##########
@@ -35,9 +35,9 @@ Provide-Capability: \
Specification-Version=1.3
-jpms-module-info: \
- jakarta.annotation;\
+ javax.annotation.api;\
access=32;\
version=${annotation.spec.version}
-jpms-module-info-options: \
- jakarta.annotation;\
+ javax.annotation.api;\
Review comment:
The Java EE 8 JAR uses `java.annotation` as the module name
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
