This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2c6d23e2fc Fix manifests with bnd
2c6d23e2fc is described below
commit 2c6d23e2fc3d25fd271b2d83f8adaa30e3308d4b
Author: remm <r...@apache.org>
AuthorDate: Tue Jul 16 11:59:21 2024 +0200
Fix manifests with bnd
---
res/bnd/annotations-api.jar.tmp.bnd | 2 ++
res/bnd/build-defaults.bnd | 3 ---
res/bnd/catalina-ha.jar.tmp.bnd | 2 ++
res/bnd/catalina-ssi.jar.tmp.bnd | 2 ++
res/bnd/catalina-storeconfig.jar.tmp.bnd | 2 ++
res/bnd/catalina-tribes.jar.tmp.bnd | 2 ++
res/bnd/catalina.jar.tmp.bnd | 2 ++
res/bnd/el-api.jar.tmp.bnd | 2 ++
res/bnd/jasper-el.jar.tmp.bnd | 2 ++
res/bnd/jasper.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-api.jar.tmp.bnd | 2 ++
res/bnd/tomcat-coyote.jar.tmp.bnd | 2 ++
res/bnd/tomcat-dbcp.jar.tmp.bnd | 2 ++
res/bnd/tomcat-embed-core.jar.tmp.bnd | 2 ++
res/bnd/tomcat-embed-el.jar.tmp.bnd | 2 ++
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 2 ++
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 ++
res/bnd/tomcat-jni.jar.tmp.bnd | 2 ++
res/bnd/tomcat-juli.jar.tmp.bnd | 2 ++
res/bnd/tomcat-util-scan.jar.tmp.bnd | 2 ++
res/bnd/tomcat-util.jar.tmp.bnd | 2 ++
res/bnd/tomcat-websocket.jar.tmp.bnd | 2 ++
res/bnd/websocket-api.jar.tmp.bnd | 2 ++
26 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index f21889dbb6..b3e1b88f06 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
Export-Package: \
javax.annotation.*;version=1.3
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index b804587bc0..37532ca3c7 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -23,9 +23,6 @@ Implementation-Title: Apache Tomcat
Implementation-Version: ${version}
Implementation-Vendor: Apache Software Foundation
-X-Compile-Source-JDK: ${compile.release}
-X-Compile-Target-JDK: ${compile.release}
-
-includeresource.notice:
META-INF/NOTICE=${tomcat.output}/manifests/default.notice
-includeresource.license:
META-INF/LICENSE=${tomcat.output}/manifests/default.license
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 278e6a813b..d506d92b55 100644
--- a/res/bnd/catalina-ha.jar.tmp.bnd
+++ b/res/bnd/catalina-ha.jar.tmp.bnd
@@ -25,6 +25,8 @@ Export-Package: \
org.apache.catalina.ha.deploy,\
org.apache.catalina.ha.session,\
org.apache.catalina.ha.tcp
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
index a8b0c3b6d5..99fe6aa292 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-ssi
Bundle-SymbolicName: org.apache.tomcat-ssi
Export-Package: \
org.apache.catalina.ssi
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd
b/res/bnd/catalina-storeconfig.jar.tmp.bnd
index c47666a43e..cffdc6320e 100644
--- a/res/bnd/catalina-storeconfig.jar.tmp.bnd
+++ b/res/bnd/catalina-storeconfig.jar.tmp.bnd
@@ -18,6 +18,8 @@
Bundle-Name: tomcat-storeconfig
Bundle-SymbolicName: org.apache.tomcat-storeconfig
Export-Package: org.apache.catalina.storeconfig
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd
b/res/bnd/catalina-tribes.jar.tmp.bnd
index 09c7f54394..fac5f438d1 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -29,6 +29,8 @@ Export-Package: \
org.apache.catalina.tribes.transport.bio,\
org.apache.catalina.tribes.transport.nio,\
org.apache.catalina.tribes.util
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.catalina.tribes.membership.cloud
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 8f2d0111cf..8c28118293 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -45,6 +45,8 @@ Export-Package: \
org.apache.catalina.webresources.war,\
org.apache.catalina.manager.util,\
org.apache.catalina
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.naming.factory.webservices
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 0a0cb1a29f..62a4e0263f 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -18,6 +18,8 @@
Bundle-Name: tomcat-el-api
Bundle-SymbolicName: org.apache.tomcat-el-api
Export-Package: javax.el;version=3.0
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 94536a45c5..fd475d5a12 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -21,6 +21,8 @@ Export-Package: \
org.apache.el,\
org.apache.el.lang,\
org.apache.el.parser
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.el.stream,\
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index 9747933400..c13c138bc0 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -29,6 +29,8 @@ Export-Package: \
org.apache.jasper.tagplugins.jstl,\
org.apache.jasper.tagplugins.jstl.core,\
org.apache.jasper.util
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.jasper.resources
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index ad74c64868..66c818ec1e 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-jaspic-api
Bundle-SymbolicName: org.apache.tomcat-jaspic-api
Export-Package: \
javax.security.auth.message.*;version=1.1
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 5d2948859e..7de49691c4 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-jsp-api
Bundle-SymbolicName: org.apache.tomcat-jsp-api
Export-Package: \
javax.servlet.jsp.*;version=2.3
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 43602ca86e..e7292af452 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -20,6 +20,8 @@ Bundle-SymbolicName: org.apache.tomcat-servlet-api
Export-Package: \
!javax.servlet.jsp.*,\
javax.servlet.*;version=4.0
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/tomcat-api.jar.tmp.bnd b/res/bnd/tomcat-api.jar.tmp.bnd
index 8a624b8ee3..967155bc6b 100644
--- a/res/bnd/tomcat-api.jar.tmp.bnd
+++ b/res/bnd/tomcat-api.jar.tmp.bnd
@@ -18,6 +18,8 @@
Bundle-Name: tomcat-api
Bundle-SymbolicName: org.apache.tomcat-api
Export-Package: org.apache.tomcat
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd
b/res/bnd/tomcat-coyote.jar.tmp.bnd
index 0f9314adf3..3412d089d2 100644
--- a/res/bnd/tomcat-coyote.jar.tmp.bnd
+++ b/res/bnd/tomcat-coyote.jar.tmp.bnd
@@ -38,6 +38,8 @@ Export-Package: \
org.apache.tomcat.util.net.jsse,\
org.apache.tomcat.util.net.openssl,\
org.apache.tomcat.util.net.openssl.ciphers
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.tomcat.util.bcel,\
diff --git a/res/bnd/tomcat-dbcp.jar.tmp.bnd b/res/bnd/tomcat-dbcp.jar.tmp.bnd
index a6f973ded3..f5314e9fd4 100644
--- a/res/bnd/tomcat-dbcp.jar.tmp.bnd
+++ b/res/bnd/tomcat-dbcp.jar.tmp.bnd
@@ -24,6 +24,8 @@ Export-Package: \
org.apache.tomcat.dbcp.dbcp2,\
org.apache.tomcat.dbcp.pool2,\
org.apache.tomcat.dbcp.pool2.impl
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 60267c1c51..5b8ff28a3c 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -86,6 +86,8 @@ Export-Package: \
org.apache.tomcat.util.scan,\
org.apache.tomcat.util.security,\
org.apache.tomcat.util.threads
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.naming.factory.webservices,\
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index a7447cae0f..74ce408bca 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -22,6 +22,8 @@ Export-Package: \
org.apache.el,\
org.apache.el.lang,\
org.apache.el.parser
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.el.stream,\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index c46114d917..ac90b006c9 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -31,6 +31,8 @@ Export-Package: \
org.apache.jasper.tagplugins.jstl.core,\
org.apache.jasper.util,\
org.apache.tomcat.util.descriptor.tld
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.jasper.resources
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 52fdc82691..d4e0077a84 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -21,6 +21,8 @@ Export-Package: \
javax.websocket.*;version=1.1,\
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.tomcat.websocket.pojo
diff --git a/res/bnd/tomcat-jni.jar.tmp.bnd b/res/bnd/tomcat-jni.jar.tmp.bnd
index ec12bc8444..b3c7997e9a 100644
--- a/res/bnd/tomcat-jni.jar.tmp.bnd
+++ b/res/bnd/tomcat-jni.jar.tmp.bnd
@@ -18,6 +18,8 @@
Bundle-Name: tomcat-jni
Bundle-SymbolicName: org.apache.tomcat-jni
Export-Package: org.apache.tomcat.jni
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/tomcat-juli.jar.tmp.bnd b/res/bnd/tomcat-juli.jar.tmp.bnd
index 14383c4436..124fdd2ac2 100644
--- a/res/bnd/tomcat-juli.jar.tmp.bnd
+++ b/res/bnd/tomcat-juli.jar.tmp.bnd
@@ -20,6 +20,8 @@ Bundle-SymbolicName: org.apache.tomcat-juli
Export-Package: \
org.apache.juli,\
org.apache.juli.logging
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/tomcat-util-scan.jar.tmp.bnd
b/res/bnd/tomcat-util-scan.jar.tmp.bnd
index 1a376c7db6..d9891c5296 100644
--- a/res/bnd/tomcat-util-scan.jar.tmp.bnd
+++ b/res/bnd/tomcat-util-scan.jar.tmp.bnd
@@ -24,6 +24,8 @@ Export-Package: \
org.apache.tomcat.util.descriptor.web,\
org.apache.tomcat.util.digester,\
org.apache.tomcat.util.scan
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-jpms-module-info: \
${module.name};\
diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
index f687924d3b..896a1469e9 100644
--- a/res/bnd/tomcat-util.jar.tmp.bnd
+++ b/res/bnd/tomcat-util.jar.tmp.bnd
@@ -27,6 +27,8 @@ Export-Package: \
org.apache.tomcat.util.res,\
org.apache.tomcat.util.security,\
org.apache.tomcat.util.threads
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.tomcat.util.json
diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd
b/res/bnd/tomcat-websocket.jar.tmp.bnd
index 5429d0c68b..4e08ce4279 100644
--- a/res/bnd/tomcat-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-websocket.jar.tmp.bnd
@@ -20,6 +20,8 @@ Bundle-SymbolicName: org.apache.tomcat-websocket
Export-Package: \
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includepackage: \
org.apache.tomcat.websocket.pojo
diff --git a/res/bnd/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index af74d5cf89..bc9eb53bab 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-websocket-api
Bundle-SymbolicName: org.apache.tomcat-websocket-api
Export-Package: \
javax.websocket.*;version=1.1
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Provide-Capability: \
osgi.contract;\
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
