Update Geronimo Mail, Fix FFM BOMs

tomitribe · Nov 20, 2024 · 5b5c5bd · 5b5c5bd
1 parent de951a7
commit 5b5c5bd
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 53 deletions.
diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
@@ -169,7 +169,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
+      <version>3.2.2-TT.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -334,7 +334,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -661,6 +661,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-coyote-ffm</artifactId>
+      <version>${tomcat.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-coyote</artifactId>

diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
@@ -178,6 +178,7 @@ taglibs-standard-spec-*.jar,\
 tagsoup-*.jar,\
 tomcat-api.jar,\
 tomcat-coyote.jar,\
+tomcat-coyote-ffm.jar,\
 tomcat-dbcp.jar,\
 tomcat-i18n-*.jar,\
 tomcat-jdbc.jar,\

diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/logging.properties b/boms/tomee-microprofile/src/main/resources/tomee/conf/logging.properties
@@ -22,31 +22,31 @@ handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.jul
 # Describes specific configuration info for Handlers.
 ############################################################
 
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.level = ALL
 1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
 1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
 1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.level = ALL
 2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
 2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
 2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.level = ALL
 3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
 3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
 3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.level = ALL
 4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
 4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
 4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-org.apache.tomee.jul.formatter.AsyncConsoleHandler.level = FINE
+org.apache.tomee.jul.formatter.AsyncConsoleHandler.level = ALL
 org.apache.tomee.jul.formatter.AsyncConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 org.apache.tomee.jul.formatter.AsyncConsoleHandler.encoding = UTF-8
 
@@ -69,9 +69,6 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
 # each component that extends LifecycleBase changing state:
 #org.apache.catalina.util.LifecycleBase.level = FINE
 
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
 # To see debug messages for HTTP/2 handling, uncomment the following line:
 #org.apache.coyote.http2.level = FINE
 

diff --git 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" />
+  <!-- APR connector and 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-api/pom.xml b/boms/tomee-plume-api/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
@@ -169,7 +169,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
+      <version>3.2.2-TT.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -444,7 +444,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -760,6 +760,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-coyote-ffm</artifactId>
+      <version>${tomcat.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-coyote</artifactId>

diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
@@ -178,6 +178,7 @@ taglibs-standard-spec-*.jar,\
 tagsoup-*.jar,\
 tomcat-api.jar,\
 tomcat-coyote.jar,\
+tomcat-coyote-ffm.jar,\
 tomcat-dbcp.jar,\
 tomcat-i18n-*.jar,\
 tomcat-jdbc.jar,\

diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/logging.properties b/boms/tomee-plume/src/main/resources/tomee/conf/logging.properties
@@ -22,31 +22,31 @@ handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.jul
 # Describes specific configuration info for Handlers.
 ############################################################
 
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.level = ALL
 1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
 1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
 1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.level = ALL
 2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
 2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
 2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.level = ALL
 3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
 3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
 3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.level = ALL
 4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
 4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
 4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-org.apache.tomee.jul.formatter.AsyncConsoleHandler.level = FINE
+org.apache.tomee.jul.formatter.AsyncConsoleHandler.level = ALL
 org.apache.tomee.jul.formatter.AsyncConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 org.apache.tomee.jul.formatter.AsyncConsoleHandler.encoding = UTF-8
 
@@ -69,9 +69,6 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
 # each component that extends LifecycleBase changing state:
 #org.apache.catalina.util.LifecycleBase.level = FINE
 
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
 # To see debug messages for HTTP/2 handling, uncomment the following line:
 #org.apache.coyote.http2.level = FINE
 

diff --git 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" />
+  <!-- APR connector and 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-api/pom.xml b/boms/tomee-plus-api/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
@@ -169,7 +169,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
+      <version>3.2.2-TT.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -455,7 +455,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -793,6 +793,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-coyote-ffm</artifactId>
+      <version>${tomcat.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-coyote</artifactId>

diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
@@ -178,6 +178,7 @@ taglibs-standard-spec-*.jar,\
 tagsoup-*.jar,\
 tomcat-api.jar,\
 tomcat-coyote.jar,\
+tomcat-coyote-ffm.jar,\
 tomcat-dbcp.jar,\
 tomcat-i18n-*.jar,\
 tomcat-jdbc.jar,\

diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/logging.properties b/boms/tomee-plus/src/main/resources/tomee/conf/logging.properties
@@ -22,31 +22,31 @@ handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.jul
 # Describes specific configuration info for Handlers.
 ############################################################
 
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.level = ALL
 1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
 1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
 1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.level = ALL
 2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
 2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
 2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.level = ALL
 3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
 3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
 3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.level = ALL
 4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
 4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
 4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
-org.apache.tomee.jul.formatter.AsyncConsoleHandler.level = FINE
+org.apache.tomee.jul.formatter.AsyncConsoleHandler.level = ALL
 org.apache.tomee.jul.formatter.AsyncConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 org.apache.tomee.jul.formatter.AsyncConsoleHandler.encoding = UTF-8
 
@@ -69,9 +69,6 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
 # each component that extends LifecycleBase changing state:
 #org.apache.catalina.util.LifecycleBase.level = FINE
 
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
 # To see debug messages for HTTP/2 handling, uncomment the following line:
 #org.apache.coyote.http2.level = FINE
 

diff --git 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" />
+  <!-- APR connector and 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-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>

diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.2</version>
+      <version>3.2.2-TT.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -224,7 +224,7 @@
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.6_mail</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-TT.2</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
@@ -463,6 +463,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-coyote-ffm</artifactId>
+      <version>${tomcat.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-coyote</artifactId>

diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
@@ -178,6 +178,7 @@ taglibs-standard-spec-*.jar,\
 tagsoup-*.jar,\
 tomcat-api.jar,\
 tomcat-coyote.jar,\
+tomcat-coyote-ffm.jar,\
 tomcat-dbcp.jar,\
 tomcat-i18n-*.jar,\
 tomcat-jdbc.jar,\