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
commit 2164f92e840fc5c0a0d733c1b9b4426700b3ae7d
Author: remm <r...@apache.org>
AuthorDate: Wed Jun 26 16:15:25 2024 +0200
Move OpenSSL support using FFM to a separate tomcat-coyote-ffm.jar JAR
The manifest advertises Java 22.
---
build.xml | 14 +++++-
res/META-INF/tomcat-coyote-ffm.jar.manifest | 9 ++++
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 +
...i.jar.tmp.bnd => tomcat-coyote-ffm.jar.tmp.bnd} | 11 +++--
res/bnd/tomcat-coyote.jar.tmp.bnd | 6 +--
res/bnd/tomcat-dbcp.jar.tmp.bnd | 2 +
res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 +-
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 +
res/bnd/websocket-client-api.jar.tmp.bnd | 2 +
res/maven/mvn-pub.xml | 2 +
res/maven/tomcat-coyote-ffm.pom | 55 ++++++++++++++++++++++
webapps/docs/changelog.xml | 5 ++
33 files changed, 144 insertions(+), 13 deletions(-)
diff --git a/build.xml b/build.xml
index 179a4bf862..735eee9bc4 100644
--- a/build.xml
+++ b/build.xml
@@ -142,6 +142,7 @@
<property name="catalina-ant.jar"
value="${tomcat.build}/lib/catalina-ant.jar"/>
<property name="catalina-storeconfig.jar"
value="${tomcat.build}/lib/catalina-storeconfig.jar"/>
<property name="tomcat-coyote.jar"
value="${tomcat.build}/lib/tomcat-coyote.jar"/>
+ <property name="tomcat-coyote-ffm.jar"
value="${tomcat.build}/lib/tomcat-coyote-ffm.jar"/>
<property name="tomcat-dbcp.jar"
value="${tomcat.build}/lib/tomcat-dbcp.jar"/>
<property name="tomcat-jni.jar" value="${tomcat.build}/lib/tomcat-jni.jar"/>
<property name="tomcat-api.jar" value="${tomcat.build}/lib/tomcat-api.jar"/>
@@ -548,7 +549,6 @@
<include name="org/apache/tomcat/util/json/**" />
<include name="org/apache/tomcat/util/log/**" />
<include name="org/apache/tomcat/util/net/**" />
- <include name="org/apache/tomcat/util/openssl/**"/>
<include name="org/apache/tomcat/util/res/**" />
<include name="org/apache/tomcat/util/security/**" />
<include name="org/apache/tomcat/util/threads/**" />
@@ -761,6 +761,11 @@
<include name="org/apache/tomcat/util/log/**" />
<include name="org/apache/tomcat/util/modeler/**" />
<include name="org/apache/tomcat/util/net/**" />
+ <exclude name="org/apache/tomcat/util/net/openssl/panama/**"/>
+ </patternset>
+
+ <patternset id="files.tomcat-coyote-ffm">
+ <include name="org/apache/tomcat/util/net/openssl/panama/**"/>
<include name="org/apache/tomcat/util/openssl/**"/>
</patternset>
@@ -1202,6 +1207,13 @@
filesId="files.tomcat-coyote"
addOSGi="true" />
+ <!-- OpenSSL FFM - Coyote -->
+ <jarIt jarfile="${tomcat-coyote-ffm.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-coyote-ffm"
+ manifest="${tomcat.manifests}/tomcat-coyote-ffm.jar.manifest"
+ addOSGi="true" />
+
<!-- WebSocket implementation JAR File -->
<jarIt jarfile="${tomcat-websocket.jar}"
filesDir="${tomcat.classes}"
diff --git a/res/META-INF/tomcat-coyote-ffm.jar.manifest
b/res/META-INF/tomcat-coyote-ffm.jar.manifest
new file mode 100644
index 0000000000..a9a34f20a8
--- /dev/null
+++ b/res/META-INF/tomcat-coyote-ffm.jar.manifest
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Specification-Title: Apache Tomcat
+Specification-Version: @VERSION_MAJOR_MINOR@
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Apache Tomcat
+Implementation-Version: @VERSION@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: 22
+X-Compile-Target-JDK: 22
\ No newline at end of file
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index 0b0ff9292d..2b6cfc44e6 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: \
jakarta.annotation.*;version=${annotation.spec.version}
+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 5b45cd88d6..5f3635b290 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -28,6 +28,8 @@ Export-Package: \
org.apache.catalina.tribes.transport,\
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 8720b37d7f..f1275e41b6 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 23451d4792..58a436f4d1 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: jakarta.el;version=${el.spec.version}
+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 088f53632d..f380ec7639 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: \
jakarta.security.auth.message.*;version=${jaspic.spec.version}
+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 e6d1152c91..b5ca8318ce 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: \
jakarta.servlet.jsp.*;version=${jsp.spec.version}
+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 09e542cf39..54682a6a1a 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: \
!jakarta.servlet.jsp.*,\
jakarta.servlet.*;version=${servlet.spec.version}
+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/catalina-ssi.jar.tmp.bnd
b/res/bnd/tomcat-coyote-ffm.jar.tmp.bnd
similarity index 77%
copy from res/bnd/catalina-ssi.jar.tmp.bnd
copy to res/bnd/tomcat-coyote-ffm.jar.tmp.bnd
index a8b0c3b6d5..bf16548c38 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/tomcat-coyote-ffm.jar.tmp.bnd
@@ -15,10 +15,13 @@
-include: build-defaults.bnd
-Bundle-Name: tomcat-ssi
-Bundle-SymbolicName: org.apache.tomcat-ssi
+Bundle-Name: tomcat-coyote-ffm
+Bundle-SymbolicName: org.apache.tomcat-coyote-ffm
Export-Package: \
- org.apache.catalina.ssi
+ org.apache.tomcat.util.net.openssl.panama,\
+ org.apache.tomcat.util.openssl
+X-Compile-Source-JDK: ${release.java.version}
+X-Compile-Target-JDK: ${release.java.version}
-jpms-module-info: \
${module.name};\
@@ -26,4 +29,4 @@ Export-Package: \
version=${Bundle-Version}
-jpms-module-info-options: \
${module.name};\
- substitute=catalina-ssi
\ No newline at end of file
+ substitute=${Bundle-Name}
\ No newline at end of file
diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd
b/res/bnd/tomcat-coyote.jar.tmp.bnd
index 9900a31ccc..3412d089d2 100644
--- a/res/bnd/tomcat-coyote.jar.tmp.bnd
+++ b/res/bnd/tomcat-coyote.jar.tmp.bnd
@@ -37,9 +37,9 @@ Export-Package: \
org.apache.tomcat.util.net,\
org.apache.tomcat.util.net.jsse,\
org.apache.tomcat.util.net.openssl,\
- org.apache.tomcat.util.net.openssl.ciphers,\
- org.apache.tomcat.util.net.openssl.panama,\
- org.apache.tomcat.util.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 067a86fd6f..15efc4f89f 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -82,12 +82,12 @@ Export-Package: \
org.apache.tomcat.util.net,\
org.apache.tomcat.util.net.openssl,\
org.apache.tomcat.util.net.openssl.ciphers,\
- org.apache.tomcat.util.net.openssl.panama,\
- org.apache.tomcat.util.openssl,\
org.apache.tomcat.util.res,\
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 86fd7a6593..b3d559c063 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 195eafb30e..83d6a9a6d8 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 e3b938de83..6d47520c01 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: \
jakarta.websocket.*;version=${websocket.spec.version},\
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 0184c99bc5..1480213455 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: \
jakarta.websocket.server.*;version=${websocket.spec.version}
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Provide-Capability: \
osgi.contract;\
diff --git a/res/bnd/websocket-client-api.jar.tmp.bnd
b/res/bnd/websocket-client-api.jar.tmp.bnd
index 492e495a18..c040e9aff5 100644
--- a/res/bnd/websocket-client-api.jar.tmp.bnd
+++ b/res/bnd/websocket-client-api.jar.tmp.bnd
@@ -19,6 +19,8 @@ Bundle-Name: tomcat-websocket-client-api
Bundle-SymbolicName: org.apache.tomcat-websocket-client-api
Export-Package: \
jakarta.websocket;version=${websocket.spec.version}
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
Require-Capability: \
osgi.extender;\
diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index 80e4fa26ee..80293ddcd8 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -361,6 +361,7 @@
<doMavenInstall artifactId="tomcat-util"/>
<doMavenInstall artifactId="tomcat-util-scan"/>
<doMavenInstall artifactId="tomcat-coyote"/>
+ <doMavenInstall artifactId="tomcat-coyote-ffm"/>
<doMavenInstall artifactId="tomcat-dbcp"/>
<doMavenInstall artifactId="tomcat-websocket"/>
@@ -468,6 +469,7 @@
<doMavenDeploy artifactId="tomcat-util"/>
<doMavenDeploy artifactId="tomcat-util-scan"/>
<doMavenDeploy artifactId="tomcat-coyote"/>
+ <doMavenDeploy artifactId="tomcat-coyote-ffm"/>
<doMavenDeploy artifactId="tomcat-dbcp"/>
<doMavenDeploy artifactId="tomcat-websocket"/>
<doMavenDeployNoSrc artifactId="tomcat-i18n-cs"/>
diff --git a/res/maven/tomcat-coyote-ffm.pom b/res/maven/tomcat-coyote-ffm.pom
new file mode 100644
index 0000000000..d4f7b06681
--- /dev/null
+++ b/res/maven/tomcat-coyote-ffm.pom
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote-ffm</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Tomcat Connectors support for OpenSSL using FFM</description>
+ <url>https://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3970fbd116..a138b0664d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,11 @@
longer an allowed value for <code>maxTrailerSize</code>. Adjust
documentation accordingly. (remm)
</fix>
+ <update>
+ Move OpenSSL support using FFM to a separate JAR named
+ <code>tomcat-coyote-ffm.jar</code> that advertises Java 22 in its
+ manifest. (remm)
+ </update>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
