From a2040d54567d69b7bca9bc9d4fd53e4463fc9123 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Thu, 12 Sep 2024 09:36:42 +0200 Subject: [PATCH] TOMEE-4399 - Tomcat 10.1.29 --- .../main/resources/tomee/conf/catalina.properties | 1 + .../main/resources/tomee/conf/logging.properties | 13 +++++-------- .../main/resources/tomee/conf/catalina.properties | 1 + .../main/resources/tomee/conf/logging.properties | 13 +++++-------- .../main/resources/tomee/conf/catalina.properties | 1 + .../main/resources/tomee/conf/logging.properties | 13 +++++-------- .../main/resources/tomee/conf/catalina.properties | 1 + .../main/resources/tomee/conf/logging.properties | 13 +++++-------- pom.xml | 2 +- 9 files changed, 25 insertions(+), 33 deletions(-) diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties index edf1a909b6b..def59593499 100644 --- a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties +++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties @@ -179,6 +179,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 index 66603794740..a5db12f797d 100644 --- 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-plume/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties index edf1a909b6b..def59593499 100644 --- a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties +++ b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties @@ -179,6 +179,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 index 66603794740..a5db12f797d 100644 --- 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-plus/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties index edf1a909b6b..def59593499 100644 --- a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties +++ b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties @@ -179,6 +179,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 index 66603794740..a5db12f797d 100644 --- 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-webprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties index edf1a909b6b..def59593499 100644 --- a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties +++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties @@ -179,6 +179,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-webprofile/src/main/resources/tomee/conf/logging.properties b/boms/tomee-webprofile/src/main/resources/tomee/conf/logging.properties index 66603794740..a5db12f797d 100644 --- a/boms/tomee-webprofile/src/main/resources/tomee/conf/logging.properties +++ b/boms/tomee-webprofile/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/pom.xml b/pom.xml index 9c12e6d7cfa..03b83f77d5f 100644 --- a/pom.xml +++ b/pom.xml @@ -205,7 +205,7 @@ 1.0.0-M1 - 10.1.28 + 10.1.29 2.0.1