This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2803dd3029 Fix the OSGi remaining references to Java EE contract names
2803dd3029 is described below
commit 2803dd3029077b6182d3d806ac153a176f9b5cec
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 25 17:33:31 2024 +0000
Fix the OSGi remaining references to Java EE contract names
Should be using Jakarta EE names for these
---
res/bnd/el-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 ++--
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 10 ++++++++++
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index ca57dbacbf..23451d4792 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -21,7 +21,7 @@ Export-Package: jakarta.el;version=${el.spec.version}
Provide-Capability: \
osgi.contract;\
- osgi.contract=JavaEL;\
+ osgi.contract=JakartaExpressionLanguage;\
version:Version=${el.spec.version};\
uses:='${packages;NAMED;jakarta.el.*}'
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 558c2b43d6..bf5f844e2f 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -99,11 +99,11 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
- osgi.contract=JavaJASPIC;\
+ osgi.contract=JakartaAuthentication;\
version:Version=${jaspic.spec.version};\
uses:='${packages;NAMED;jakarta.security.auth.message.*}',\
osgi.contract;\
- osgi.contract=JavaServlet;\
+ osgi.contract=JakartaServlet;\
version:Version=${servlet.spec.version};\
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index a0bbe6d065..ca0953ec17 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -39,7 +39,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
- osgi.contract=JavaJSP;\
+ osgi.contract=JakartaServerPages;\
version:Version=${jsp.spec.version};\
uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index e4d8a8fd3e..e3b938de83 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -29,7 +29,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
- osgi.contract=JavaWebSockets;\
+ osgi.contract=JakartaWebSocket;\
version:Version=${websocket.spec.version};\
uses:='${packages;NAMED;jakarta.websocket.*}'
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8d17927e31..961a6a4b90 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,6 +148,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Correct the remaining OSGi contract references in the manifest files to
+ refer to the Jakarta EE contract names rather than the Java EE contract
+ names. Based on pull request <pr>685</pr> provided by Paul A.
Nicolucci.
+ (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.18 (schultz)" rtext="2024-01-09">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
