From 3dd81be05178487ec49923027cd1a12f3ff9b225 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Tue, 20 Sep 2022 22:04:36 +0200
Subject: [PATCH] Updated SLF4J to 2.0.1. Updated Log4j2 to 2.19.0. Updated
 logging-log4j2.mod. Removed references to og4j-slf4j18-impl, replaced by
 log4j-slf4j2-impl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../asciidoc/operations-guide/logging/logging-server.adoc     | 2 +-
 jetty-home/src/main/resources/modules/logging-log4j2.mod      | 4 ++--
 pom.xml                                                       | 4 ++--
 .../eclipse/jetty/tests/distribution/LoggingOptionsTests.java | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/logging/logging-server.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/logging/logging-server.adoc
index 46ddf9506f9..df4e330e1b6 100644
--- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/logging/logging-server.adoc
+++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/logging/logging-server.adoc
@@ -165,7 +165,7 @@ $JETTY_BASE
 │   └── logging
 │       ├── log4j-api-<version>.jar
 │       ├── log4j-core-<version>.jar
-│       └── log4j-slf4j18-impl-<version>.jar
+│       └── log4j-slf4j2-impl-<version>.jar
 ├── resources
 │   └── log4j2.xml
 └── start.d
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/pom.xml b/pom.xml
index a2631d9cf40..db9a818d688 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
     <json-smart.version>2.4.8</json-smart.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.0</logback.version>
     <mariadb.version>3.0.7</mariadb.version>
     <mariadb.docker.version>10.3.6</mariadb.docker.version>
@@ -88,7 +88,7 @@
     <org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
     <plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
     <plexus-utils.version>3.4.2</plexus-utils.version>
-    <slf4j.version>2.0.0</slf4j.version>
+    <slf4j.version>2.0.1</slf4j.version>
     <springboot.version>2.1.1.RELEASE</springboot.version>
     <testcontainers.version>1.17.3</testcontainers.version>
     <weld.version>4.0.3.Final</weld.version>
diff --git a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
index 394c769e54b..77e64cfd639 100644
--- a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
+++ b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
@@ -88,7 +88,7 @@ public class LoggingOptionsTests extends AbstractJettyHomeTest
             arguments.add(Arguments.of(env, "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"
                 ),