Re: [tomcat] branch 9.0.x updated: Fix BZ 64548 - generate JPMS metadata
I'll make the change today. Thanks all, - Ray On Mon, Jul 13, 2020, 07:37 Martin Grigorov, wrote: > > > On Mon, Jul 13, 2020 at 1:02 PM Mark Thomas wrote: > >> There are some Java EE / Jakarta EE issues here. >> >> Tomcat 10 is Jakarta EE. >> Tomcat 9 is Java EE. >> >> There should not be any references to Jakarta in Tomcat 9. This needs to >> be fixed before the next Tomcat 9 release. >> >> I don't think there are definitive JPMS names for the Java EE 8 modules >> as Java EE 8 pre-dates Java 9 where JPMS was introduced. I'm not sure of >> the best way to handle this. Options that come to mind are: >> a) no JPMS info at all >> b) align it with the JAR file names (i.e. replicate what would happen by >>default) >> c) Use the Jakarta EE 9 names but with javax.* rather than jakarta.* >> > > c) sounds the best to me > Many people use Tomcat 9 (as the current stable version) with newer JDKs. > > >> >> Mark >> >> >> On 11/07/2020 03:42, rotty3...@apache.org wrote: >> > 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 39e7478 Fix BZ 64548 - generate JPMS metadata >> > 39e7478 is described below >> > >> > commit 39e74780c4292d51b544620e59124c2dfb1b9ab8 >> > Author: Raymond Augé >> > AuthorDate: Fri Jun 19 22:25:54 2020 -0400 >> > >> > Fix BZ 64548 - generate JPMS metadata >> > >> > Signed-off-by: Raymond Augé >> > --- >> > res/bnd/annotations-api.jar.tmp.bnd| 10 +- >> > res/bnd/build-defaults.bnd | 4 +++- >> > res/bnd/catalina-ha.jar.tmp.bnd| 10 +- >> > res/bnd/catalina-ssi.jar.tmp.bnd | 8 >> > res/bnd/catalina-storeconfig.jar.tmp.bnd | 10 +- >> > res/bnd/catalina-tribes.jar.tmp.bnd| 10 +- >> > res/bnd/catalina.jar.tmp.bnd | 20 +++- >> > res/bnd/el-api.jar.tmp.bnd | 8 >> > res/bnd/jasper-el.jar.tmp.bnd | 10 +- >> > res/bnd/jasper.jar.tmp.bnd | 11 ++- >> > res/bnd/jaspic-api.jar.tmp.bnd | 10 +- >> > res/bnd/jsp-api.jar.tmp.bnd| 8 >> > res/bnd/servlet-api.jar.tmp.bnd| 8 >> > res/bnd/tomcat-api.jar.tmp.bnd | 8 >> > res/bnd/tomcat-coyote.jar.tmp.bnd | 10 +- >> > res/bnd/tomcat-dbcp.jar.tmp.bnd| 9 - >> > res/bnd/tomcat-embed-core.jar.tmp.bnd | 19 ++- >> > res/bnd/tomcat-embed-el.jar.tmp.bnd| 9 - >> > res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 9 - >> > res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 11 +-- >> > res/bnd/tomcat-jni.jar.tmp.bnd | 10 +- >> > res/bnd/tomcat-juli.jar.tmp.bnd| 10 +- >> > res/bnd/tomcat-util-scan.jar.tmp.bnd | 10 +- >> > res/bnd/tomcat-util.jar.tmp.bnd| 10 +- >> > res/bnd/tomcat-websocket.jar.tmp.bnd | 10 +- >> > res/bnd/websocket-api.jar.tmp.bnd | 10 +- >> > webapps/docs/changelog.xml | 3 +++ >> > 27 files changed, 243 insertions(+), 22 deletions(-) >> > >> > diff --git a/res/bnd/annotations-api.jar.tmp.bnd >> b/res/bnd/annotations-api.jar.tmp.bnd >> > index 19db9f4..09151bf 100644 >> > --- a/res/bnd/annotations-api.jar.tmp.bnd >> > +++ b/res/bnd/annotations-api.jar.tmp.bnd >> > @@ -32,4 +32,12 @@ Provide-Capability: \ >> > Implementation-Version=1.3.${annotation.revision};\ >> > Specification-Title='Common Annotations';\ >> > Specification-Vendor='Oracle Corporation';\ >> > -Specification-Version=1.3 >> > \ No newline at end of file >> > +Specification-Version=1.3 >> > + >> > +-jpms-module-info: \ >> > +jakarta.annotation;\ >> > +access=32;\ >> > +version=${annotation.spec.version} >> > +-jpms-module-info-options: \ >> > + jakarta.annotation;\ >> > + substitute=annotations-api >> >> Should not reference Jakarta >> >> > diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd >> > index dc94c42..972745c 100644 >> > --- a/res/bnd/catalina.jar.tmp.bnd >> > +++ b/res/bnd/catalina.jar.tmp.bnd >> > @@ -48,4 +48,22 @@ Export-Package: \ >> > org.apache.catalina >> > >> > -includepackage: \ >> > -org.apache.naming.factory.webservices >> > \ No newline at end of file >> > +org.apache.naming.factory.webservices >> > + >> > +-jpms-module-info: \ >> > +${module.name};\ >> > +access=32;\ >> > +version=${Bundle-Version};\ >> > +modules='\ >> > +jakarta.ejb-api,\ >> > +jakarta.mail,\ >> > +jakarta.persistence-api,\ >> > +jakarta.xml.rpc-api,\ >> > +java.xml.ws' >>
Re: [tomcat] branch 9.0.x updated: Fix BZ 64548 - generate JPMS metadata
On Mon, Jul 13, 2020 at 1:02 PM Mark Thomas wrote: > There are some Java EE / Jakarta EE issues here. > > Tomcat 10 is Jakarta EE. > Tomcat 9 is Java EE. > > There should not be any references to Jakarta in Tomcat 9. This needs to > be fixed before the next Tomcat 9 release. > > I don't think there are definitive JPMS names for the Java EE 8 modules > as Java EE 8 pre-dates Java 9 where JPMS was introduced. I'm not sure of > the best way to handle this. Options that come to mind are: > a) no JPMS info at all > b) align it with the JAR file names (i.e. replicate what would happen by >default) > c) Use the Jakarta EE 9 names but with javax.* rather than jakarta.* > c) sounds the best to me Many people use Tomcat 9 (as the current stable version) with newer JDKs. > > Mark > > > On 11/07/2020 03:42, rotty3...@apache.org wrote: > > 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 39e7478 Fix BZ 64548 - generate JPMS metadata > > 39e7478 is described below > > > > commit 39e74780c4292d51b544620e59124c2dfb1b9ab8 > > Author: Raymond Augé > > AuthorDate: Fri Jun 19 22:25:54 2020 -0400 > > > > Fix BZ 64548 - generate JPMS metadata > > > > Signed-off-by: Raymond Augé > > --- > > res/bnd/annotations-api.jar.tmp.bnd| 10 +- > > res/bnd/build-defaults.bnd | 4 +++- > > res/bnd/catalina-ha.jar.tmp.bnd| 10 +- > > res/bnd/catalina-ssi.jar.tmp.bnd | 8 > > res/bnd/catalina-storeconfig.jar.tmp.bnd | 10 +- > > res/bnd/catalina-tribes.jar.tmp.bnd| 10 +- > > res/bnd/catalina.jar.tmp.bnd | 20 +++- > > res/bnd/el-api.jar.tmp.bnd | 8 > > res/bnd/jasper-el.jar.tmp.bnd | 10 +- > > res/bnd/jasper.jar.tmp.bnd | 11 ++- > > res/bnd/jaspic-api.jar.tmp.bnd | 10 +- > > res/bnd/jsp-api.jar.tmp.bnd| 8 > > res/bnd/servlet-api.jar.tmp.bnd| 8 > > res/bnd/tomcat-api.jar.tmp.bnd | 8 > > res/bnd/tomcat-coyote.jar.tmp.bnd | 10 +- > > res/bnd/tomcat-dbcp.jar.tmp.bnd| 9 - > > res/bnd/tomcat-embed-core.jar.tmp.bnd | 19 ++- > > res/bnd/tomcat-embed-el.jar.tmp.bnd| 9 - > > res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 9 - > > res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 11 +-- > > res/bnd/tomcat-jni.jar.tmp.bnd | 10 +- > > res/bnd/tomcat-juli.jar.tmp.bnd| 10 +- > > res/bnd/tomcat-util-scan.jar.tmp.bnd | 10 +- > > res/bnd/tomcat-util.jar.tmp.bnd| 10 +- > > res/bnd/tomcat-websocket.jar.tmp.bnd | 10 +- > > res/bnd/websocket-api.jar.tmp.bnd | 10 +- > > webapps/docs/changelog.xml | 3 +++ > > 27 files changed, 243 insertions(+), 22 deletions(-) > > > > diff --git a/res/bnd/annotations-api.jar.tmp.bnd > b/res/bnd/annotations-api.jar.tmp.bnd > > index 19db9f4..09151bf 100644 > > --- a/res/bnd/annotations-api.jar.tmp.bnd > > +++ b/res/bnd/annotations-api.jar.tmp.bnd > > @@ -32,4 +32,12 @@ Provide-Capability: \ > > Implementation-Version=1.3.${annotation.revision};\ > > Specification-Title='Common Annotations';\ > > Specification-Vendor='Oracle Corporation';\ > > -Specification-Version=1.3 > > \ No newline at end of file > > +Specification-Version=1.3 > > + > > +-jpms-module-info: \ > > +jakarta.annotation;\ > > +access=32;\ > > +version=${annotation.spec.version} > > +-jpms-module-info-options: \ > > + jakarta.annotation;\ > > + substitute=annotations-api > > Should not reference Jakarta > > > diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd > > index dc94c42..972745c 100644 > > --- a/res/bnd/catalina.jar.tmp.bnd > > +++ b/res/bnd/catalina.jar.tmp.bnd > > @@ -48,4 +48,22 @@ Export-Package: \ > > org.apache.catalina > > > > -includepackage: \ > > -org.apache.naming.factory.webservices > > \ No newline at end of file > > +org.apache.naming.factory.webservices > > + > > +-jpms-module-info: \ > > +${module.name};\ > > +access=32;\ > > +version=${Bundle-Version};\ > > +modules='\ > > +jakarta.ejb-api,\ > > +jakarta.mail,\ > > +jakarta.persistence-api,\ > > +jakarta.xml.rpc-api,\ > > +java.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;
Re: [tomcat] branch 9.0.x updated: Fix BZ 64548 - generate JPMS metadata
There are some Java EE / Jakarta EE issues here. Tomcat 10 is Jakarta EE. Tomcat 9 is Java EE. There should not be any references to Jakarta in Tomcat 9. This needs to be fixed before the next Tomcat 9 release. I don't think there are definitive JPMS names for the Java EE 8 modules as Java EE 8 pre-dates Java 9 where JPMS was introduced. I'm not sure of the best way to handle this. Options that come to mind are: a) no JPMS info at all b) align it with the JAR file names (i.e. replicate what would happen by default) c) Use the Jakarta EE 9 names but with javax.* rather than jakarta.* Mark On 11/07/2020 03:42, rotty3...@apache.org wrote: > 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 39e7478 Fix BZ 64548 - generate JPMS metadata > 39e7478 is described below > > commit 39e74780c4292d51b544620e59124c2dfb1b9ab8 > Author: Raymond Augé > AuthorDate: Fri Jun 19 22:25:54 2020 -0400 > > Fix BZ 64548 - generate JPMS metadata > > Signed-off-by: Raymond Augé > --- > res/bnd/annotations-api.jar.tmp.bnd| 10 +- > res/bnd/build-defaults.bnd | 4 +++- > res/bnd/catalina-ha.jar.tmp.bnd| 10 +- > res/bnd/catalina-ssi.jar.tmp.bnd | 8 > res/bnd/catalina-storeconfig.jar.tmp.bnd | 10 +- > res/bnd/catalina-tribes.jar.tmp.bnd| 10 +- > res/bnd/catalina.jar.tmp.bnd | 20 +++- > res/bnd/el-api.jar.tmp.bnd | 8 > res/bnd/jasper-el.jar.tmp.bnd | 10 +- > res/bnd/jasper.jar.tmp.bnd | 11 ++- > res/bnd/jaspic-api.jar.tmp.bnd | 10 +- > res/bnd/jsp-api.jar.tmp.bnd| 8 > res/bnd/servlet-api.jar.tmp.bnd| 8 > res/bnd/tomcat-api.jar.tmp.bnd | 8 > res/bnd/tomcat-coyote.jar.tmp.bnd | 10 +- > res/bnd/tomcat-dbcp.jar.tmp.bnd| 9 - > res/bnd/tomcat-embed-core.jar.tmp.bnd | 19 ++- > res/bnd/tomcat-embed-el.jar.tmp.bnd| 9 - > res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 9 - > res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 11 +-- > res/bnd/tomcat-jni.jar.tmp.bnd | 10 +- > res/bnd/tomcat-juli.jar.tmp.bnd| 10 +- > res/bnd/tomcat-util-scan.jar.tmp.bnd | 10 +- > res/bnd/tomcat-util.jar.tmp.bnd| 10 +- > res/bnd/tomcat-websocket.jar.tmp.bnd | 10 +- > res/bnd/websocket-api.jar.tmp.bnd | 10 +- > webapps/docs/changelog.xml | 3 +++ > 27 files changed, 243 insertions(+), 22 deletions(-) > > diff --git a/res/bnd/annotations-api.jar.tmp.bnd > b/res/bnd/annotations-api.jar.tmp.bnd > index 19db9f4..09151bf 100644 > --- a/res/bnd/annotations-api.jar.tmp.bnd > +++ b/res/bnd/annotations-api.jar.tmp.bnd > @@ -32,4 +32,12 @@ Provide-Capability: \ > Implementation-Version=1.3.${annotation.revision};\ > Specification-Title='Common Annotations';\ > Specification-Vendor='Oracle Corporation';\ > -Specification-Version=1.3 > \ No newline at end of file > +Specification-Version=1.3 > + > +-jpms-module-info: \ > +jakarta.annotation;\ > +access=32;\ > +version=${annotation.spec.version} > +-jpms-module-info-options: \ > + jakarta.annotation;\ > + substitute=annotations-api Should not reference Jakarta > diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd > index dc94c42..972745c 100644 > --- a/res/bnd/catalina.jar.tmp.bnd > +++ b/res/bnd/catalina.jar.tmp.bnd > @@ -48,4 +48,22 @@ Export-Package: \ > org.apache.catalina > > -includepackage: \ > -org.apache.naming.factory.webservices > \ No newline at end of file > +org.apache.naming.factory.webservices > + > +-jpms-module-info: \ > +${module.name};\ > +access=32;\ > +version=${Bundle-Version};\ > +modules='\ > +jakarta.ejb-api,\ > +jakarta.mail,\ > +jakarta.persistence-api,\ > +jakarta.xml.rpc-api,\ > +java.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 > diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd > index 1c6481d..4c5333e 100644 > --- a/res/bnd/el-api.jar.tmp.bnd > +++ b/res/bnd/el-api.jar.tmp.bnd > @@ -32,3 +32,11 @@ Provide-Capability: \ > Implementation-Title=javax.el;\ > Implementation-Version=3.0.${el.
[tomcat] branch 9.0.x updated: Fix BZ 64548 - generate JPMS metadata
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 39e7478 Fix BZ 64548 - generate JPMS metadata 39e7478 is described below commit 39e74780c4292d51b544620e59124c2dfb1b9ab8 Author: Raymond Augé AuthorDate: Fri Jun 19 22:25:54 2020 -0400 Fix BZ 64548 - generate JPMS metadata Signed-off-by: Raymond Augé --- res/bnd/annotations-api.jar.tmp.bnd| 10 +- res/bnd/build-defaults.bnd | 4 +++- res/bnd/catalina-ha.jar.tmp.bnd| 10 +- res/bnd/catalina-ssi.jar.tmp.bnd | 8 res/bnd/catalina-storeconfig.jar.tmp.bnd | 10 +- res/bnd/catalina-tribes.jar.tmp.bnd| 10 +- res/bnd/catalina.jar.tmp.bnd | 20 +++- res/bnd/el-api.jar.tmp.bnd | 8 res/bnd/jasper-el.jar.tmp.bnd | 10 +- res/bnd/jasper.jar.tmp.bnd | 11 ++- res/bnd/jaspic-api.jar.tmp.bnd | 10 +- res/bnd/jsp-api.jar.tmp.bnd| 8 res/bnd/servlet-api.jar.tmp.bnd| 8 res/bnd/tomcat-api.jar.tmp.bnd | 8 res/bnd/tomcat-coyote.jar.tmp.bnd | 10 +- res/bnd/tomcat-dbcp.jar.tmp.bnd| 9 - res/bnd/tomcat-embed-core.jar.tmp.bnd | 19 ++- res/bnd/tomcat-embed-el.jar.tmp.bnd| 9 - res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 9 - res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 11 +-- res/bnd/tomcat-jni.jar.tmp.bnd | 10 +- res/bnd/tomcat-juli.jar.tmp.bnd| 10 +- res/bnd/tomcat-util-scan.jar.tmp.bnd | 10 +- res/bnd/tomcat-util.jar.tmp.bnd| 10 +- res/bnd/tomcat-websocket.jar.tmp.bnd | 10 +- res/bnd/websocket-api.jar.tmp.bnd | 10 +- webapps/docs/changelog.xml | 3 +++ 27 files changed, 243 insertions(+), 22 deletions(-) diff --git a/res/bnd/annotations-api.jar.tmp.bnd b/res/bnd/annotations-api.jar.tmp.bnd index 19db9f4..09151bf 100644 --- a/res/bnd/annotations-api.jar.tmp.bnd +++ b/res/bnd/annotations-api.jar.tmp.bnd @@ -32,4 +32,12 @@ Provide-Capability: \ Implementation-Version=1.3.${annotation.revision};\ Specification-Title='Common Annotations';\ Specification-Vendor='Oracle Corporation';\ -Specification-Version=1.3 \ No newline at end of file +Specification-Version=1.3 + +-jpms-module-info: \ +jakarta.annotation;\ +access=32;\ +version=${annotation.spec.version} +-jpms-module-info-options: \ + jakarta.annotation;\ + substitute=annotations-api diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd index cdefb9c..2eec204 100644 --- a/res/bnd/build-defaults.bnd +++ b/res/bnd/build-defaults.bnd @@ -28,4 +28,6 @@ X-Compile-Target-JDK: ${compile.target} -includeresource.notice: META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n" -includeresource.license: {META-INF/LICENSE=../META-INF/default.license} --noclassforname: true \ No newline at end of file +-noclassforname: true + +module.name: org.apache.${replace;${Bundle-Name};-;.} \ No newline at end of file diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd index 824f99e..4b6c2db 100644 --- a/res/bnd/catalina-ha.jar.tmp.bnd +++ b/res/bnd/catalina-ha.jar.tmp.bnd @@ -24,4 +24,12 @@ Export-Package: \ org.apache.catalina.ha.context,\ org.apache.catalina.ha.deploy,\ org.apache.catalina.ha.session,\ -org.apache.catalina.ha.tcp \ No newline at end of file +org.apache.catalina.ha.tcp + +-jpms-module-info: \ +${module.name};\ +access=32;\ +version=${Bundle-Version} +-jpms-module-info-options: \ + ${module.name};\ + substitute=catalina-ha \ No newline at end of file diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd index 87c0cbd..a8b0c3b 100644 --- a/res/bnd/catalina-ssi.jar.tmp.bnd +++ b/res/bnd/catalina-ssi.jar.tmp.bnd @@ -19,3 +19,11 @@ Bundle-Name: tomcat-ssi Bundle-SymbolicName: org.apache.tomcat-ssi Export-Package: \ org.apache.catalina.ssi + +-jpms-module-info: \ +${module.name};\ +access=32;\ +version=${Bundle-Version} +-jpms-module-info-options: \ +${module.name};\ +substitute=catalina-ssi \ No newline at end of file diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd b/res/bnd/catalina-storeconfig.jar.tmp.bnd index e21e689..d82fe37 100644 --- a/res/bnd/catalina-storeconfig.jar.tmp.bnd +++ b/res/bnd/catalina-storeconfig.jar.tmp.bnd @@ -17,4 +17,12 @@ Bundle-Name: tomcat-storeconfig Bundle-SymbolicName: org.apache.tomcat-storeconfig -Export-P