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 dd84c85537 Fix BZ 66834 - Correct Java EE contract names to Jakarta EE
names
dd84c85537 is described below
commit dd84c8553700284db75711ff42e59e3729b34acc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 3 20:22:18 2023 +0100
Fix BZ 66834 - Correct Java EE contract names to Jakarta EE names
https://bz.apache.org/bugzilla/show_bug.cgi?id=66834
---
res/bnd/annotations-api.jar.tmp.bnd | 2 +-
res/bnd/jaspic-api.jar.tmp.bnd | 2 +-
res/bnd/jsp-api.jar.tmp.bnd | 2 +-
res/bnd/servlet-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-el.jar.tmp.bnd | 2 +-
res/bnd/websocket-api.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 5 +++++
7 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index 5bbcea4468..0b0ff9292d 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -22,7 +22,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
- osgi.contract=JavaAnnotation;\
+ osgi.contract=JakartaAnnotations;\
version:Version=${annotation.spec.version};\
uses:='${packages;NAMED;jakarta.annotation.*}'
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index c417cd32b0..088f53632d 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -22,7 +22,7 @@ Export-Package: \
Provide-Capability: \
osgi.contract;\
- osgi.contract=JavaJASPIC;\
+ osgi.contract=JakartaAuthentication;\
version:Version=${jaspic.spec.version};\
uses:='${packages;NAMED;jakarta.security.auth.message.*}'
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 9a34133ef5..8d7e5fc52a 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -22,7 +22,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/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index aac22a7e4c..09e542cf39 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -23,7 +23,7 @@ Export-Package: \
Provide-Capability: \
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-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 27320082e0..86fd7a6593 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -31,7 +31,7 @@ Export-Package: \
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/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index 2e7747f701..9f2b0606a5 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -22,7 +22,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 f67c67a10b..f069f91ee1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -174,6 +174,11 @@
environment variable as intended on Windows when the path to the Java
executable contains spaces. (markt)
</fix>
+ <fix>
+ <bug>66834</bug>: Correct the OSGi contract references in the manifest
+ files to refer to the Jakarta EE contract names rather than the Java EE
+ contract names. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
