(tomee) 02/02: TOMEE-4328 - TomEE 10.1.23

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit fd647119aca0097f08c873d0acba4f7143a9dd82
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Wed Apr 24 06:35:10 2024 +0200

    TOMEE-4328 - TomEE 10.1.23
---
 boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml | 6 ++++--
 boms/tomee-plume/src/main/resources/tomee/conf/server.xml        | 6 ++++--
 boms/tomee-plus/src/main/resources/tomee/conf/server.xml         | 6 ++++--
 boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml   | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml 
b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
index df284fe40c..6217ce095d 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
@@ -26,8 +26,10 @@
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />
   -->
-  <!-- APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" 
SSLEngine="on" />
+  <!-- OpenSSL support using Tomcat Native -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+  <!-- OpenSSL support using FFM API from Java 22 -->
+  <!-- <Listener className="org.apache.catalina.core.OpenSSLLifecycleListener" 
/> -->
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener 
className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener 
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml 
b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
index df284fe40c..6217ce095d 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
@@ -26,8 +26,10 @@
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />
   -->
-  <!-- APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" 
SSLEngine="on" />
+  <!-- OpenSSL support using Tomcat Native -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+  <!-- OpenSSL support using FFM API from Java 22 -->
+  <!-- <Listener className="org.apache.catalina.core.OpenSSLLifecycleListener" 
/> -->
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener 
className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener 
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml 
b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
index df284fe40c..6217ce095d 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
@@ -26,8 +26,10 @@
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />
   -->
-  <!-- APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" 
SSLEngine="on" />
+  <!-- OpenSSL support using Tomcat Native -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+  <!-- OpenSSL support using FFM API from Java 22 -->
+  <!-- <Listener className="org.apache.catalina.core.OpenSSLLifecycleListener" 
/> -->
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener 
className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener 
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml 
b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
index df284fe40c..6217ce095d 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
@@ -26,8 +26,10 @@
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />
   -->
-  <!-- APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" 
SSLEngine="on" />
+  <!-- OpenSSL support using Tomcat Native -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+  <!-- OpenSSL support using FFM API from Java 22 -->
+  <!-- <Listener className="org.apache.catalina.core.OpenSSLLifecycleListener" 
/> -->
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener 
className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener 
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />