From de72bd544ab1d677d6f3b2d9a2ce63e2950533c8 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 4 Jan 2022 15:08:47 -0600
Subject: [PATCH] Issue #7297 - Removing log4j 1.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-home/pom.xml                                 |  5 -----
 .../src/main/resources/modules/logging-log4j1.mod  |  2 +-
 .../src/main/resources/modules/logging-log4j2.mod  | 14 +++++++-------
 pom.xml                                            |  6 ------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 34ada1fcf22a..956d213628ed 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -876,11 +876,6 @@
       <type>jar</type>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod
index b19a511afbc3..fec58dc54e39 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j1.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod
@@ -25,7 +25,7 @@ lib/logging/slf4j-log4j12-${slf4j.version}.jar
 lib/logging/log4j-${log4j.version}.jar
 
 [ini]
-log4j.version?=@log4j.version@
+log4j.version?=1.2.17
 jetty.webapp.addServerClasses+=,org.apache.log4j.
 
 
diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod
index b75067bda21e..6467342313a4 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j2.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j2.mod
@@ -17,17 +17,17 @@ log4j
 
 [files]
 basehome:modules/logging/log4j2
-maven://org.apache.logging.log4j/log4j-slf4j18-impl/${log4j.version}|lib/logging/log4j-slf4j18-impl-${log4j.version}.jar
-maven://org.apache.logging.log4j/log4j-api/${log4j.version}|lib/logging/log4j-api-${log4j.version}.jar
-maven://org.apache.logging.log4j/log4j-core/${log4j.version}|lib/logging/log4j-core-${log4j.version}.jar
+maven://org.apache.logging.log4j/log4j-slf4j18-impl/${log4j2.version}|lib/logging/log4j-slf4j18-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-${log4j.version}.jar
-lib/logging/log4j-api-${log4j.version}.jar
-lib/logging/log4j-core-${log4j.version}.jar
+lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
+lib/logging/log4j-api-${log4j2.version}.jar
+lib/logging/log4j-core-${log4j2.version}.jar
 
 [ini]
-log4j.version?=@log4j2.version@
+log4j2.version?=@log4j2.version@
 jetty.webapp.addServerClasses+=,org.apache.logging.log4j.
 
 [license]
diff --git a/pom.xml b/pom.xml
index 6c590df967a9..74e27ddee078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,6 @@
     <jsp.impl.version>9.0.52</jsp.impl.version>
     <junit.version>5.8.2</junit.version>
     <kerb-simplekdc.version>2.0.1</kerb-simplekdc.version>
-    <log4j.version>1.2.17</log4j.version>
     <log4j2.version>2.17.1</log4j2.version>
     <logback.version>1.3.0-alpha12</logback.version>
     <mariadb.version>2.7.4</mariadb.version>
@@ -1119,11 +1118,6 @@
         <artifactId>jakarta.xml.ws-api</artifactId>
         <version>${jakarta.xml.ws.api.version}</version>
       </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna-jpms</artifactId>