From e649d81585cf952b3873f2c1e345ec94b0325a0e Mon Sep 17 00:00:00 2001
From: emeroad <emeroad@gmail.com>
Date: Tue, 28 Jun 2022 18:32:39 +0900
Subject: [PATCH] [#8986] Bump log4j from 2.17.1 to 2.17.2

---
 agent-testweb/pom.xml                   | 1 -
 batch/pom.xml                           | 1 -
 collector/pom.xml                       | 1 -
 commons-hbase/pom.xml                   | 2 --
 commons-server-cluster/pom.xml          | 2 --
 commons-server/pom.xml                  | 1 -
 flink/pom.xml                           | 1 -
 hbase/pom.xml                           | 2 --
 hbase2-module/hbase2-batch/pom.xml      | 1 -
 hbase2-module/hbase2-collector/pom.xml  | 1 -
 hbase2-module/hbase2-flink/pom.xml      | 1 -
 hbase2-module/hbase2-web/pom.xml        | 1 -
 metric-module/collector-starter/pom.xml | 1 -
 metric-module/metric/pom.xml            | 1 -
 metric-module/web-starter/pom.xml       | 2 +-
 plugins-it/log4j2-it/pom.xml            | 1 -
 plugins-it/log4j2-jdk8-it/pom.xml       | 1 -
 pom.xml                                 | 8 +-------
 profiler-logging/pom.xml                | 1 -
 web/pom.xml                             | 1 -
 20 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/agent-testweb/pom.xml b/agent-testweb/pom.xml
index e52d8bb660fa..2b3a1fa2344a 100644
--- a/agent-testweb/pom.xml
+++ b/agent-testweb/pom.xml
@@ -32,7 +32,6 @@
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
 
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <spring-boot-build-skip>false</spring-boot-build-skip>
         <pinpoint.plugintest.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.plugintest.executable.name>
diff --git a/batch/pom.xml b/batch/pom.xml
index b8ac222616dd..04bad6e24f0d 100644
--- a/batch/pom.xml
+++ b/batch/pom.xml
@@ -15,7 +15,6 @@
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
 
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>
 
         <pinpoint.batch.executable.name>${project.artifactId}-${project.version}</pinpoint.batch.executable.name>
diff --git a/collector/pom.xml b/collector/pom.xml
index 97c81ca27274..0c6755cf3c52 100644
--- a/collector/pom.xml
+++ b/collector/pom.xml
@@ -33,7 +33,6 @@
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
 
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>
 
         <pinpoint.collector.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.collector.executable.name>
diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
index d0fa19cfc975..c9aa53f07a80 100644
--- a/commons-hbase/pom.xml
+++ b/commons-hbase/pom.xml
@@ -31,8 +31,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
     <dependencies>
diff --git a/commons-server-cluster/pom.xml b/commons-server-cluster/pom.xml
index a04ed7edb060..dc5f63f33fc5 100644
--- a/commons-server-cluster/pom.xml
+++ b/commons-server-cluster/pom.xml
@@ -31,8 +31,6 @@
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
         <test.jdk.home>${jdk.home}</test.jdk.home>
-
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
     <dependencies>
diff --git a/commons-server/pom.xml b/commons-server/pom.xml
index 893018d801d4..2309cc67e3f9 100644
--- a/commons-server/pom.xml
+++ b/commons-server/pom.xml
@@ -33,7 +33,6 @@
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
         <test.jdk.home>${jdk.home}</test.jdk.home>
 
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
     <dependencies>
diff --git a/flink/pom.xml b/flink/pom.xml
index cda530e2be53..630559c57ac3 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -33,7 +33,6 @@
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
 
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>
     </properties>
 
diff --git a/hbase/pom.xml b/hbase/pom.xml
index 60e04355b56e..742a79a0028b 100644
--- a/hbase/pom.xml
+++ b/hbase/pom.xml
@@ -16,8 +16,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
     <modules>
diff --git a/hbase2-module/hbase2-batch/pom.xml b/hbase2-module/hbase2-batch/pom.xml
index 5c3a1ede8f10..572557a43fe5 100644
--- a/hbase2-module/hbase2-batch/pom.xml
+++ b/hbase2-module/hbase2-batch/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <pinpoint.batch.executable.name>${project.artifactId}-${project.version}</pinpoint.batch.executable.name>
     </properties>
diff --git a/hbase2-module/hbase2-collector/pom.xml b/hbase2-module/hbase2-collector/pom.xml
index f4265cac21e6..a97e221f7d96 100644
--- a/hbase2-module/hbase2-collector/pom.xml
+++ b/hbase2-module/hbase2-collector/pom.xml
@@ -32,7 +32,6 @@
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
 
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <pinpoint.collector.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.collector.executable.name>
     </properties>
diff --git a/hbase2-module/hbase2-flink/pom.xml b/hbase2-module/hbase2-flink/pom.xml
index 0856e64f5f09..b86a4c4f9f00 100644
--- a/hbase2-module/hbase2-flink/pom.xml
+++ b/hbase2-module/hbase2-flink/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
     <dependencies>
diff --git a/hbase2-module/hbase2-web/pom.xml b/hbase2-module/hbase2-web/pom.xml
index 3e8e049d0b56..ad3fdd8b128c 100644
--- a/hbase2-module/hbase2-web/pom.xml
+++ b/hbase2-module/hbase2-web/pom.xml
@@ -38,7 +38,6 @@
         <frontend.build.dir>${basedir}/src/main/frontend</frontend.build.dir>
 
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <pinpoint.web.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.web.executable.name>
     </properties>
diff --git a/metric-module/collector-starter/pom.xml b/metric-module/collector-starter/pom.xml
index 3727d08e55dc..8b4ff318bde4 100644
--- a/metric-module/collector-starter/pom.xml
+++ b/metric-module/collector-starter/pom.xml
@@ -17,7 +17,6 @@
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <pinpoint.collector.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.collector.executable.name>
     </properties>
diff --git a/metric-module/metric/pom.xml b/metric-module/metric/pom.xml
index 02c89c6051f2..e31eeb0f59be 100644
--- a/metric-module/metric/pom.xml
+++ b/metric-module/metric/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 
     <dependencies>
diff --git a/metric-module/web-starter/pom.xml b/metric-module/web-starter/pom.xml
index 2e301bccdbe3..085c0d37fba1 100644
--- a/metric-module/web-starter/pom.xml
+++ b/metric-module/web-starter/pom.xml
@@ -15,8 +15,8 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
+
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <pinpoint.web.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.web.executable.name>
     </properties>
diff --git a/plugins-it/log4j2-it/pom.xml b/plugins-it/log4j2-it/pom.xml
index 69c624b2d5ee..e0f361670275 100644
--- a/plugins-it/log4j2-it/pom.xml
+++ b/plugins-it/log4j2-it/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2-jdk7.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins-it/log4j2-jdk8-it/pom.xml b/plugins-it/log4j2-jdk8-it/pom.xml
index 538fbd574d14..e5d7e9456dfa 100644
--- a/plugins-it/log4j2-jdk8-it/pom.xml
+++ b/plugins-it/log4j2-jdk8-it/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j2-jdk8.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index c2447f1d3a04..119687d9d287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,13 +157,7 @@
         <spring.boot.version>2.5.12</spring.boot.version>
 
         <slf4j.version>1.7.30</slf4j.version>
-        <!--        https://www.lunasec.io/docs/blog/log4j-zero-day/#who-is-impacted
-                    Fix with message layout for jdk7 compatibility
-                    Message layout : %m -> %m{nolookups}
-        -->
-        <log4j2-jdk7.version>2.12.4</log4j2-jdk7.version>
-        <log4j2-jdk8.version>2.17.1</log4j2-jdk8.version>
-        <log4j2.version>${log4j2-jdk7.version}</log4j2.version>
+        <log4j2.version>2.17.2</log4j2.version>
         <!-- for plugin & hbase client -->
         <log4j1.version>1.2.17</log4j1.version>
 
diff --git a/profiler-logging/pom.xml b/profiler-logging/pom.xml
index c3591b10ebfe..0dcdb664aed9 100644
--- a/profiler-logging/pom.xml
+++ b/profiler-logging/pom.xml
@@ -50,7 +50,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4j2-jdk7.version}</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/web/pom.xml b/web/pom.xml
index bcdd538e1dd7..ff315b0c02fb 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -38,7 +38,6 @@
         <build.frontend.skip>false</build.frontend.skip>
 
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
-        <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>
 
         <pinpoint.web.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.web.executable.name>