This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 60bbe490ceec812022425070d2e52f389f606c40 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Nov 6 11:53:55 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/jsp-api.jar.tmp.bnd | 4 ++-- res/bnd/servlet-api.jar.tmp.bnd | 4 ++-- res/bnd/websocket-api.jar.tmp.bnd | 4 ++-- webapps/docs/changelog.xml | 3 +++ 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd index d81d961..c1c7500 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: \ - javax.el.api;\ + java.el;\ access=32;\ version=${el.spec.version} -jpms-module-info-options: \ - javax.el.api;\ + java.el;\ substitute=el-api diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd index e7c44db..ad74c64 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: \ - javax.security.enterprise.api;\ + java.security.auth.message;\ access=32;\ version=${jaspic.spec.version} -jpms-module-info-options: \ - javax.security.enterprise.api;\ + java.security.auth.message;\ substitute=jaspic-api diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd index e011d76..5d29488 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: \ - javax.servlet.jsp.api;\ + java.servlet.jsp;\ access=32;\ version=${jsp.spec.version} -jpms-module-info-options: \ - javax.servlet.jsp.api;\ + java.servlet.jsp;\ substitute=jsp-api diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd index 8fd76bd..ace3872 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: \ - javax.servlet.api;\ + java.servlet;\ access=32;\ version=${servlet.spec.version} -jpms-module-info-options: \ - javax.servlet.api;\ + java.servlet;\ substitute=servlet-api diff --git a/res/bnd/websocket-api.jar.tmp.bnd b/res/bnd/websocket-api.jar.tmp.bnd index ccf9942..2001349 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: \ - javax.websocket.api;\ + java.websocket;\ access=32;\ version=${websocket.spec.version} -jpms-module-info-options: \ - javax.websocket.api;\ + java.websocket;\ substitute=websocket-api diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 69a36d7..418679c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -177,6 +177,9 @@ <add> Improvements to Russian translations. Provided by Azat. (markt) </add> + <fix> + Align JPMS module names with current Jakarta EE expectations. (markt) + </fix> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org