From 6bda122d88e275295e2ae5b6b7138d70fac274cc Mon Sep 17 00:00:00 2001
From: ZhangJian He <shoothzj@gmail.com>
Date: Fri, 10 Dec 2021 08:42:14 +0200
Subject: [PATCH] Bump log4j to 2.15.0 (#13226)

(cherry picked from commit 0015daba660e6ee720f58287b4d1eff6e7960ab0)
(cherry picked from commit dea0f43f32af06e92af38d0aaac5fa400f01411a)
---
 distribution/server/src/assemble/LICENSE.bin.txt | 8 ++++----
 pom.xml                                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 1466cc80ee2f5..72f01536db501 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -394,10 +394,10 @@ The Apache Software License, Version 2.0
     - 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
  * 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/pom.xml b/pom.xml
index 288aa6e8edcd3..d108a7df3cd32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@ flexible messaging model and an intuitive client API.</description>
     <rocksdb.version>6.10.2</rocksdb.version>
     <slf4j.version>1.7.25</slf4j.version>
     <commons.collections.version>3.2.2</commons.collections.version>
-    <log4j2.version>2.10.0</log4j2.version>
+    <log4j2.version>2.15.0</log4j2.version>
     <bouncycastle.version>1.68</bouncycastle.version>
     <bouncycastlefips.version>1.0.2</bouncycastlefips.version>
     <jackson.version>2.11.1</jackson.version>