From 13956b27e2e635fe1b22dda179f52974e7f9d2b3 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 5 Jan 2022 12:26:05 -0600
Subject: [PATCH] Issue #7297 - Removing log4j 1.x (#7353)

* Issue #7297 - Removing log4j 1.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #7297 - Deprecating log4j 1.x

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

diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 4879dee19b1a..32833fe6bc7f 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..11acb6dfee7b 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j1.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod
@@ -4,8 +4,13 @@
 Configures Jetty logging to use Log4j.
 SLF4J is used as the core logging mechanism.
 
+[deprecated]
+Module 'logging-log4j1' is deprecated for removal.
+Use 'logging-log4j2' instead.
+
 [tags]
 logging
+deprecated
 
 [depends]
 logging/slf4j
@@ -25,7 +30,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/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
index e78ee66dc9f4..8dfe843774d9 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
@@ -13,10 +13,10 @@ Use 'unixdomain-http' instead (requires Java 16 or later).
 
 [tags]
 connector
+deprecated
 
 [depend]
 unixsocket-http
-deprecated
 
 [xml]
 etc/jetty-unixsocket-secure.xml
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>