From f056e84d931ab5b49b230abbf6984ae3ed1d296a Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Fri, 10 Dec 2021 08:53:24 +0200
Subject: [PATCH] [logging] Use Log4j2's BOM to ensure that Log4j2 version is
 consistent. Replace legacy log4j with log4j-1.2-api

backports PR #8880 to branch-2.7
[logging] Upgrade Log4j2 version to 2.14.0, replace legacy log4j dependency with log4j-1.2-api (#8880)

- import Log4j2's BOM into Pulsar's dependency management instead of
  defining versions separately for each Log4j2 library

- distribution/server/pom.xml included log4j:log4j dependency.
  - replace with org.apache.logging.log4j:log4j-1.2-api to
    keep supporting the legacy logging api in the case something
    depends on it

(cherry picked from commit 2e1fb0511bbcf76e08e83d3f3d9a68a275c56973)
(cherry picked from commit 6fee20fddec47bfc98924fdea6a4d28ff3894c1e)
---
 buildtools/pom.xml                            |  6 +--
 distribution/server/pom.xml                   |  4 +-
 .../server/src/assemble/LICENSE.bin.txt       | 10 ++---
 managed-ledger/pom.xml                        |  4 +-
 pom.xml                                       | 37 ++-----------------
 5 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 0adcb0633f226..181527c162a15 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -48,17 +48,17 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.10.0</version>
+      <version>2.15.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.10.0</version>
+      <version>2.15.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.10.0</version>
+      <version>2.15.0</version>
     </dependency>
   </dependencies>
 
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index 2ce3cee8b7c60..9583aac51945c 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -83,8 +83,8 @@
     </dependency>
 
     <dependency>
-      <artifactId>log4j</artifactId>
-      <groupId>log4j</groupId>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
     </dependency>
 
     <dependency>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 1466cc80ee2f5..57bd35e0c45c8 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -393,11 +393,11 @@ The Apache Software License, Version 2.0
     - jakarta.validation-jakarta.validation-api-2.0.2.jar
     - javax.validation-validation-api-1.1.0.Final.jar
  * Log4J
-    - log4j-log4j-1.2.17.jar
-    - org.apache.logging.log4j-log4j-api-2.10.0.jar
-    - org.apache.logging.log4j-log4j-core-2.10.0.jar
-    - org.apache.logging.log4j-log4j-slf4j-impl-2.10.0.jar
-    - org.apache.logging.log4j-log4j-web-2.10.0.jar
+    - org.apache.logging.log4j-log4j-api-2.15.0.jar
+    - org.apache.logging.log4j-log4j-core-2.15.0.jar
+    - org.apache.logging.log4j-log4j-slf4j-impl-2.15.0.jar
+    - org.apache.logging.log4j-log4j-web-2.15.0.jar
+    - org.apache.logging.log4j-log4j-1.2-api-2.15.0.jar
  * Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar
  * BookKeeper
     - org.apache.bookkeeper-bookkeeper-common-4.14.3.jar
diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml
index 07002281071e0..a4f8d7b1d44b8 100644
--- a/managed-ledger/pom.xml
+++ b/managed-ledger/pom.xml
@@ -102,8 +102,8 @@
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 288aa6e8edcd3..fd9931fc5adbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -574,41 +574,10 @@ flexible messaging model and an intuitive client API.</description>
 
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-api</artifactId>
+        <artifactId>log4j-bom</artifactId>
         <version>${log4j2.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-slf4j-impl</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-web</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-api</artifactId>
-        <type>test-jar</type>
-        <version>${log4j2.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
-        <type>test-jar</type>
-        <version>${log4j2.version}</version>
-
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <dependency>