From ebfb7c63bbc7bde22f56bb0e7ba9ba76f2bbfdf3 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Thu, 22 Sep 2022 02:38:48 -0500
Subject: [PATCH] Bump log4j2 to 2.19.0 (#8605)

* Bump log4j2 to 2.19.0
+ Remove old exclusions to log4j in infinispan
  (no longer relevant)
* fix usage of log4j-slf4j2-impl

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 javadoc/pom.xml                                            | 7 -------
 jetty-home/src/main/resources/modules/logging-log4j2.mod   | 4 ++--
 jetty-infinispan/infinispan-common/pom.xml                 | 7 -------
 jetty-infinispan/infinispan-remote-query/pom.xml           | 7 -------
 jetty-infinispan/infinispan-remote/pom.xml                 | 7 -------
 pom.xml                                                    | 2 +-
 .../jetty/tests/distribution/LoggingOptionsTests.java      | 2 +-
 tests/test-sessions/test-infinispan-sessions/pom.xml       | 7 -------
 8 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index f94c5ad38d3..3e1cfb5b672 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -426,13 +426,6 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-client-hotrod</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- to make infinispan-common source sane -->
     <dependency>
diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod
index 6467342313a..505095f5a66 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j2.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j2.mod
@@ -17,12 +17,12 @@ log4j
 
 [files]
 basehome:modules/logging/log4j2
-maven://org.apache.logging.log4j/log4j-slf4j18-impl/${log4j2.version}|lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
+maven://org.apache.logging.log4j/log4j-slf4j2-impl/${log4j2.version}|lib/logging/log4j-slf4j2-impl-${log4j2.version}.jar
 maven://org.apache.logging.log4j/log4j-api/${log4j2.version}|lib/logging/log4j-api-${log4j2.version}.jar
 maven://org.apache.logging.log4j/log4j-core/${log4j2.version}|lib/logging/log4j-core-${log4j2.version}.jar
 
 [lib]
-lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
+lib/logging/log4j-slf4j2-impl-${log4j2.version}.jar
 lib/logging/log4j-api-${log4j2.version}.jar
 lib/logging/log4j-core-${log4j2.version}.jar
 
diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml
index d5ebbc8fc4e..2086c3c9704 100644
--- a/jetty-infinispan/infinispan-common/pom.xml
+++ b/jetty-infinispan/infinispan-common/pom.xml
@@ -46,13 +46,6 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-client-hotrod</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml
index 49fd9cf9ce4..c4430b42a2e 100644
--- a/jetty-infinispan/infinispan-remote-query/pom.xml
+++ b/jetty-infinispan/infinispan-remote-query/pom.xml
@@ -102,13 +102,6 @@
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-client-hotrod</artifactId>
-      <exclusions>
-        <!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml
index 80903a30e6f..fba89b7e9f6 100644
--- a/jetty-infinispan/infinispan-remote/pom.xml
+++ b/jetty-infinispan/infinispan-remote/pom.xml
@@ -81,13 +81,6 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-client-hotrod</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
diff --git a/pom.xml b/pom.xml
index 3ad9f40ecb6..7aa4a034e90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
     <jsp.impl.version>9.0.52</jsp.impl.version>
     <junit.version>5.9.0</junit.version>
     <kerb-simplekdc.version>2.0.2</kerb-simplekdc.version>
-    <log4j2.version>2.18.0</log4j2.version>
+    <log4j2.version>2.19.0</log4j2.version>
     <logback.version>1.4.1</logback.version>
     <mariadb.version>3.0.7</mariadb.version>
     <mariadb.docker.version>10.3.6</mariadb.docker.version>
diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
index cf4831dcb7e..9aff9b7ed4e 100644
--- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
+++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
@@ -83,7 +83,7 @@ public class LoggingOptionsTests extends AbstractJettyHomeTest
             Arguments.of("logging-log4j2",
                 Arrays.asList(
                     "\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
-                    "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-slf4j18-impl-.*\\.jar",
+                    "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-slf4j2-impl-.*\\.jar",
                     "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-api-.*\\.jar",
                     "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-core-.*\\.jar"
                 ),
diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml
index 9cfe3047e2a..b62b3e5607c 100644
--- a/tests/test-sessions/test-infinispan-sessions/pom.xml
+++ b/tests/test-sessions/test-infinispan-sessions/pom.xml
@@ -121,13 +121,6 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-client-hotrod</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>