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 12b0ce4e1c75fc1cb8a4f2bafbc9b5f467bdb390
Author: Raymond Augé <rotty3...@apache.org>
AuthorDate: Fri Jun 19 11:52:40 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 | 20 +++++++++++++---
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 19 +++++++++++----
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 19 ++++++++++++---
res/bnd/websocket-api.jar.tmp.bnd | 17 +++++++++++--
10 files changed, 171 insertions(+), 38 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index 9b2f84e..19db9f4 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: \
- javax.annotation,\
- javax.annotation.security,\
- javax.annotation.sql
+ javax.annotation.*;version=1.3
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaAnnotation;\
+ version:List<Version>="1.3,1.2,1.1,1";\
+ uses:='${packages;NAMED;javax.annotation.*}'
+
+-namesection: javax/annotation*/;\
+ Implementation-Title=javax.annotation;\
+ Implementation-Vendor='Apache Software Foundation';\
+ Implementation-Version=1.3.${annotation.revision};\
+ Specification-Title='Common Annotations';\
+ Specification-Vendor='Oracle Corporation';\
+ Specification-Version=1.3
\ 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 1533ede..1c6481d 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: javax.el
+Export-Package: javax.el;version=3.0
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaEL;\
+ version:List<Version>="3.0,2.2,2.1";\
+ uses:='${packages;NAMED;javax.el.*}'
+
+-namesection: javax/el*/;\
+ Specification-Title='Expression Language';\
+ Specification-Version=3.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.el;\
+ Implementation-Version=3.0.${el.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index d911c38..aa964f7 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: \
- javax.security.auth.message,\
- javax.security.auth.message.callback,\
- javax.security.auth.message.config,\
- javax.security.auth.message.module
\ No newline at end of file
+ javax.security.auth.message.*;version=1.1
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJASPIC;\
+ version:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.security.auth.message.*}'
+
+-namesection: javax/security/auth/message*/;\
+ Specification-Title='Java Authentication SPI for Containers';\
+ Specification-Version=1.1;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.security.auth.message;\
+ Implementation-Version=1.1.${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 0746375..f522c57 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: \
- javax.servlet.jsp,\
- javax.servlet.jsp.el,\
- javax.servlet.jsp.resources,\
- javax.servlet.jsp.tagext
\ No newline at end of file
+ javax.servlet.jsp.*;version=2.3
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaJSP;\
+ version:List<Version>="2.3,2.2,2.1,2";\
+ uses:='${packages;NAMED;javax.servlet.jsp.*}'
+
+-namesection: javax/servlet/jsp*/;\
+ Specification-Title='Java API for JavaServer Pages';\
+ Specification-Version=2.3;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet.jsp;\
+ Implementation-Version=2.3.${jsp.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 4c9b25d..cc5697e 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: \
- javax.servlet,\
- javax.servlet.annotation,\
- javax.servlet.descriptor,\
- javax.servlet.http,\
- javax.servlet.resources
\ No newline at end of file
+ !javax.servlet.jsp.*,\
+ javax.servlet.*;version=4.0
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaServlet;\
+ version:List<Version>="4.0,3.1,3,2.5";\
+ uses:='${packages;NAMED;javax.servlet.*;NAMED;!javax.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: javax/servlet*/;\
+ Specification-Title='Java API for Servlets';\
+ Specification-Version=4.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet;\
+ Implementation-Version=4.0.${servlet.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 07f84fe..355941e 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: \
- javax.security.auth.message,\
- javax.security.auth.message.callback,\
- javax.security.auth.message.config,\
- javax.security.auth.message.module,\
- javax.servlet,\
- javax.servlet.annotation,\
- javax.servlet.descriptor,\
- javax.servlet.http,\
- javax.servlet.resources,\
+ !javax.servlet.jsp.*,\
+ javax.security.auth.message.*;version=1.1,\
+ javax.servlet.*;version=4.0,\
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:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.security.auth.message.*}',\
+ osgi.contract;\
+ osgi.contract=JavaServlet;\
+ version:List<Version>="4.0,3.1,3,2.5";\
+ uses:='${packages;NAMED;javax.servlet.*;NAMED;!javax.servlet.jsp.*}'
+
+-namesection: \
+ javax/security/auth/message*/;\
+ Specification-Title='Java Authentication SPI for Containers';\
+ Specification-Version=1.1;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.security.auth.message;\
+ Implementation-Version=1.1.${jaspic.revision};\
+ Implementation-Vendor='Apache Software Foundation',\
+ javax/servlet*/;\
+ Specification-Title='Java API for Servlets';\
+ Specification-Version=4.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet;\
+ Implementation-Version=4.0.${servlet.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 5ed8792..bebc44f 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -19,13 +19,27 @@ 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: \
- javax.el,\
+ javax.el;version=3.0,\
org.apache.el,\
org.apache.el.lang,\
org.apache.el.parser
-includepackage: \
- org.apache.el.stream,\
- org.apache.el.util
+ org.apache.el.stream,\
+ org.apache.el.util
-includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaEL;\
+ version:List<Version>="3.0,2.2,2.1";\
+ uses:='${packages;NAMED;javax.el.*}'
+
+-namesection: javax/el*/;\
+ Specification-Title='Expression Language';\
+ Specification-Version=3.0;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.el;\
+ Implementation-Version=3.0.${el.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 070e273..5a0f1c1 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: \
- javax.servlet.jsp,\
- javax.servlet.jsp.el,\
- javax.servlet.jsp.resources,\
- javax.servlet.jsp.tagext,\
+ javax.servlet.jsp.*;version=2.3,\
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:List<Version>="2.3,2.2,2.1,2";\
+ uses:='${packages;NAMED;javax.servlet.jsp.*}'
+
+-namesection: javax/servlet/jsp*/;\
+ Specification-Title='Java API for JavaServer Pages';\
+ Specification-Version=2.3;\
+ Specification-Vendor='Sun Microsystems, Inc.';\
+ Implementation-Title=javax.servlet.jsp;\
+ Implementation-Version=2.3.${jsp.revision};\
+ Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index f6470f0..889d4a2 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -19,12 +19,25 @@ Automatic-Module-Name: org.apache.tomcat.embed.websocket
Bundle-Name: tomcat-embed-websocket
Bundle-SymbolicName: org.apache.tomcat-embed-websocket
Export-Package: \
- javax.websocket,\
- javax.websocket.server,\
+ javax.websocket.*;version=1.1,\
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
-includepackage: \
- org.apache.tomcat.websocket.pojo
+ org.apache.tomcat.websocket.pojo
-includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaWebSockets;\
+ version:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.websocket.*}'
+
+-namesection: javax/websocket*/;\
+ Specification-Title=WebSocket;\
+ Specification-Version=1.1;\
+ Specification-Vendor='Oracle, Inc.';\
+ Implementation-Title=javax.websocket;\
+ Implementation-Version=1.1.${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 0596155..cacaf01 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: \
- javax.websocket,\
- javax.websocket.server
\ No newline at end of file
+ javax.websocket.*;version=1.1
+
+Provide-Capability: \
+ osgi.contract;\
+ osgi.contract=JavaWebSockets;\
+ version:List<Version>="1.1,1";\
+ uses:='${packages;NAMED;javax.websocket.*}'
+
+-namesection: javax/websocket*/;\
+ Specification-Title=WebSocket;\
+ Specification-Version=1.1;\
+ Specification-Vendor='Oracle, Inc.';\
+ Implementation-Title=javax.websocket;\
+ Implementation-Version=1.1.${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
