This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 1de8896 Refer to correct log4j web jar 1de8896 is described below commit 1de88961ba73e191bae629142d8ec26a9adf9c88 Author: Michael Seele <mse...@gmail.com> AuthorDate: Tue Feb 22 08:26:18 2022 +0100 Refer to correct log4j web jar log4j-jakarta-web*.jar is the jar that supports Jakarta EE 9+ web servlet containers --- conf/catalina.properties | 2 +- webapps/docs/changelog.xml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/conf/catalina.properties b/conf/catalina.properties index 6a31180..dd35d24 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -200,7 +200,7 @@ xom-*.jar # scan types by configuring a JarScanner with a nested JarScanFilter. tomcat.util.scan.StandardJarScanFilter.jarsToScan=\ log4j-taglib*.jar,\ -log4j-web*.jar,\ +log4j-jakarta-web*.jar,\ log4javascript*.jar,\ slf4j-taglib*.jar diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4b6f9dc..5743ab7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,15 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 10.1.0-M12 (markt)" rtext="in development"> + <subsection name="Catalina"> + <changelog> + <fix> + <pr>477</pr>: Update the default list of JARs to skip to include the + Apache Log4j JAR for Jakarta EE platforms. Pull request by Michael + Seele. (markt) + </fix> + </changelog> + </subsection> <subsection name="Jasper"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org