This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c77cf5075691f3897cefcafb3b39bfb1a94b1d88
Author: Raymond Augé <rotty3...@apache.org>
AuthorDate: Fri Jun 19 11:05:57 2020 -0400
Fix BZ 64540 - add specification specific metadata
Signed-off-by: Raymond Augé <rotty3...@apache.org>
---
res/bnd/annotations-api.jar.tmp.bnd | 18 +++++++++++---
res/bnd/el-api.jar.tmp.bnd | 16 ++++++++++++-
res/bnd/jaspic-api.jar.tmp.bnd | 19 +++++++++++----
res/bnd/jsp-api.jar.tmp.bnd | 19 +++++++++++----
res/bnd/servlet-api.jar.tmp.bnd | 24 +++++++++++++++----
res/bnd/tomcat-embed-core.jar.tmp.bnd | 38 +++++++++++++++++++++++-------
res/bnd/tomcat-embed-el.jar.tmp.bnd | 16 ++++++++++++-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 19 +++++++++++----
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 17 +++++++++++--
res/bnd/websocket-api.jar.tmp.bnd | 17 +++++++++++--
10 files changed, 168 insertions(+), 35 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index b2ed4d3..a2f00ce 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -18,6 +18,18 @@
Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
Export-Package: \
- jakarta.annotation,\
- jakarta.annotation.security,\
- jakarta.annotation.sql
\ No newline at end of file
+ jakarta.annotation.*;version=${annotation.spec.version}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaAnnotation;\
+ version:Version=${annotation.spec.version};\
+ uses:='${packages;NAMED;jakarta.annotation.*}'
+
+-namesection: jakarta/annotation*/;\
+ Specification-Title=Jakarta Annotations;\
+ Specification-Version=${annotation.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.annotation;\
+ Implementation-Version=${annotation.spec.version}.${annotation.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ 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 cfb2da3..087d98b 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -17,4 +17,18 @@
Bundle-Name: tomcat-el-api
Bundle-SymbolicName: org.apache.tomcat-el-api
-Export-Package: jakarta.el
\ No newline at end of file
+Export-Package: jakarta.el;version=${el.spec.version}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaEL;\
+ version:Version=${el.spec.version};\
+ uses:='${packages;NAMED;jakarta.el.*}'
+
+-namesection: jakarta/el*/;\
+ Specification-Title=Jakarta Expression Language;\
+ Specification-Version=${el.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.el;\
+ Implementation-Version=${el.spec.version}.${el.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index d82d334..986299d 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
Bundle-Name: tomcat-jaspic-api
Bundle-SymbolicName: org.apache.tomcat-jaspic-api
Export-Package: \
- jakarta.security.auth.message,\
- jakarta.security.auth.message.callback,\
- jakarta.security.auth.message.config,\
- jakarta.security.auth.message.module
\ No newline at end of file
+ jakarta.security.auth.message.*;version=${jaspic.spec.version}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJASPIC;\
+ version:Version=${jaspic.spec.version};\
+ uses:='${packages;NAMED;jakarta.security.auth.message.*}'
+
+-namesection: jakarta/security/auth/message*/;\
+ Specification-Title=Jakarta Authentication SPI for Containers;\
+ Specification-Version=${jaspic.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.security.auth.message;\
+ Implementation-Version=${jaspic.spec.version}.${jaspic.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 882107e..a9c95d7 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
Bundle-Name: tomcat-jsp-api
Bundle-SymbolicName: org.apache.tomcat-jsp-api
Export-Package: \
- jakarta.servlet.jsp,\
- jakarta.servlet.jsp.el,\
- jakarta.servlet.jsp.resources,\
- jakarta.servlet.jsp.tagext
\ No newline at end of file
+ jakarta.servlet.jsp.*;version=${jsp.spec.version}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJSP;\
+ version:Version=${jsp.spec.version};\
+ uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
+
+-namesection: jakarta/servlet/jsp*/;\
+ Specification-Title=Jakarta Server Pages;\
+ Specification-Version=${jsp.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.servlet.jsp;\
+ Implementation-Version=${jsp.spec.version}.${jsp.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 7e50fd7..254f06d 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -18,8 +18,22 @@
Bundle-Name: tomcat-servlet-api
Bundle-SymbolicName: org.apache.tomcat-servlet-api
Export-Package: \
- jakarta.servlet,\
- jakarta.servlet.annotation,\
- jakarta.servlet.descriptor,\
- jakarta.servlet.http,\
- jakarta.servlet.resources
\ No newline at end of file
+ !jakarta.servlet.jsp.*,\
+ jakarta.servlet.*;version=${servlet.spec.version}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaServlet;\
+ version:Version=${servlet.spec.version};\
+
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
+
+-includeresource.notice2:
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
+-includeresource.license2:
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+
+-namesection: jakarta/servlet*/;\
+ Specification-Title=Jakarta Servlet;\
+ Specification-Version=${servlet.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.servlet;\
+ Implementation-Version=${servlet.spec.version}.${servlet.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 6b8efaf..1ab5c52 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -19,15 +19,9 @@ Automatic-Module-Name: org.apache.tomcat.embed.core
Bundle-Name: tomcat-embed-core
Bundle-SymbolicName: org.apache.tomcat-embed-core
Export-Package: \
- jakarta.security.auth.message,\
- jakarta.security.auth.message.callback,\
- jakarta.security.auth.message.config,\
- jakarta.security.auth.message.module,\
- jakarta.servlet,\
- jakarta.servlet.annotation,\
- jakarta.servlet.descriptor,\
- jakarta.servlet.http,\
- jakarta.servlet.resources,\
+ !jakarta.servlet.jsp.*,\
+ jakarta.security.auth.message.*;version=${jaspic.spec.version},\
+ jakarta.servlet.*;version=${servlet.spec.version},\
org.apache.catalina,\
org.apache.catalina.authenticator,\
org.apache.catalina.authenticator.jaspic,\
@@ -106,3 +100,29 @@ Export-Package: \
-includeresource.notice2:
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
-includeresource.license2:
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJASPIC;\
+ version:Version=${jaspic.spec.version};\
+ uses:='${packages;NAMED;jakarta.security.auth.message.*}',\
+ osgi.contract;\
+ osgi.contract=JavaServlet;\
+ version:Version=${servlet.spec.version};\
+
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
+
+-namesection: \
+ jakarta/security/auth/message*/;\
+ Specification-Title=Jakarta Authentication SPI for Containers;\
+ Specification-Version=${jaspic.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.security.auth.message;\
+ Implementation-Version=${jaspic.spec.version}.${jaspic.revision};\
+ Implementation-Vendor=Apache Software Foundation,\
+ jakarta/servlet*/;\
+ Specification-Title=Jakarta Servlet;\
+ Specification-Version=${servlet.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.servlet;\
+ Implementation-Version=${servlet.spec.version}.${servlet.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 58fee31..cdd3a28 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -19,7 +19,7 @@ Automatic-Module-Name: org.apache.tomcat.embed.jasper.el
Bundle-Name: tomcat-embed-jasper-el
Bundle-SymbolicName: org.apache.tomcat-embed-jasper-el
Export-Package: \
- jakarta.el,\
+ jakarta.el;version=${el.spec.version},\
org.apache.el,\
org.apache.el.lang,\
org.apache.el.parser
@@ -29,3 +29,17 @@ Export-Package: \
org.apache.el.util
-includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaEL;\
+ version:Version=${el.spec.version};\
+ uses:='${packages;NAMED;jakarta.el.*}'
+
+-namesection: jakarta/el*/;\
+ Specification-Title=Jakarta Expression Language;\
+ Specification-Version=${el.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.annotation;\
+ Implementation-Version=${el.spec.version}.${el.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 0d6cadc..7cb00e0 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -19,10 +19,7 @@ Automatic-Module-Name: org.apache.tomcat.embed.jasper
Bundle-Name: tomcat-embed-jasper
Bundle-SymbolicName: org.apache.tomcat-embed-jasper
Export-Package: \
- jakarta.servlet.jsp,\
- jakarta.servlet.jsp.el,\
- jakarta.servlet.jsp.resources,\
- jakarta.servlet.jsp.tagext,\
+ jakarta.servlet.jsp.*;version=${jsp.spec.version},\
org.apache.jasper,\
org.apache.jasper.compiler,\
org.apache.jasper.compiler.tagplugin,\
@@ -38,3 +35,17 @@ Export-Package: \
org.apache.jasper.resources
-includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJSP;\
+ version:Version=${jsp.spec.version};\
+ uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
+
+-namesection: jakarta/servlet/jsp*/;\
+ Specification-Title=Jakarta Server Pages;\
+ Specification-Version=${jsp.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.servlet.jsp;\
+ Implementation-Version=${jsp.spec.version}.${jsp.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index efe68b7..a47db3a 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -19,8 +19,7 @@ Automatic-Module-Name: org.apache.tomcat.embed.websocket
Bundle-Name: tomcat-embed-websocket
Bundle-SymbolicName: org.apache.tomcat-embed-websocket
Export-Package: \
- jakarta.websocket,\
- jakarta.websocket.server,\
+ jakarta.websocket.*;version=${websocket.spec.version},\
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
@@ -28,3 +27,17 @@ Export-Package: \
org.apache.tomcat.websocket.pojo
-includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaWebSockets;\
+ version:Version=${websocket.spec.version};\
+ uses:='${packages;NAMED;jakarta.websocket.*}'
+
+-namesection: jakarta/websocket*/;\
+ Specification-Title=Jakarta WebSocket;\
+ Specification-Version=${websocket.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.websocket;\
+ Implementation-Version=${websocket.spec.version}.${websocket.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index 8e1fcb5..0c0574a 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -18,5 +18,18 @@
Bundle-Name: tomcat-websocket-api
Bundle-SymbolicName: org.apache.tomcat-websocket-api
Export-Package: \
- jakarta.websocket,\
- jakarta.websocket.server
\ No newline at end of file
+ jakarta.websocket.*;version=${websocket.spec.version}
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaWebSockets;\
+ version:Version=${websocket.spec.version};\
+ uses:='${packages;NAMED;jakarta.websocket.*}'
+
+-namesection: jakarta/websocket*/;\
+ Specification-Title=Jakarta WebSocket;\
+ Specification-Version=${websocket.spec.version};\
+ Specification-Vendor=Eclipse Foundation;\
+ Implementation-Title=jakarta.websocket;\
+ Implementation-Version=${websocket.spec.version}.${websocket.revision};\
+ Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
