From b0d44b5fb8d16d03a16beda787e4c689d14bb973 Mon Sep 17 00:00:00 2001
From: emeroad <emeroad@gmail.com>
Date: Fri, 13 Dec 2024 11:09:53 +0900
Subject: [PATCH] [#11822] Replace commons-logging with spring-jcl

---
 .../bootstraps/bootstrap-java9-internal/pom.xml |  5 -----
 .../plugins-test-module/plugins-test/pom.xml    | 16 +++++-----------
 agent-module/plugins/thrift/pom.xml             |  5 -----
 agent-module/profiler-test/pom.xml              |  4 ----
 basic-login/pom.xml                             | 10 ----------
 batch-alarmsender/pom.xml                       | 10 ----------
 batch/pom.xml                                   | 11 -----------
 collector/pom.xml                               | 16 ----------------
 commons-hbase/pom.xml                           | 17 -----------------
 commons-mybatis/pom.xml                         | 11 -----------
 commons-profiler/pom.xml                        |  5 -----
 commons-server-cluster/pom.xml                  | 11 +----------
 commons-server/pom.xml                          | 10 ----------
 datasource/pom.xml                              | 11 -----------
 exceptiontrace/exceptiontrace-common/pom.xml    |  6 ------
 flink/pom.xml                                   | 17 -----------------
 metric-module/metric/pom.xml                    | 16 ----------------
 pinot/pinot-datasource/pom.xml                  | 12 ++++++++++++
 pom.xml                                         |  7 +++++++
 thrift/pom.xml                                  |  5 -----
 uristat/uristat-common/pom.xml                  |  6 ------
 web/pom.xml                                     | 16 ----------------
 webhook/pom.xml                                 | 16 ----------------
 23 files changed, 25 insertions(+), 218 deletions(-)

diff --git a/agent-module/bootstraps/bootstrap-java9-internal/pom.xml b/agent-module/bootstraps/bootstrap-java9-internal/pom.xml
index 69f2d0542dfd..3131b47d766c 100644
--- a/agent-module/bootstraps/bootstrap-java9-internal/pom.xml
+++ b/agent-module/bootstraps/bootstrap-java9-internal/pom.xml
@@ -61,11 +61,6 @@
             <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/agent-module/plugins-test-module/plugins-test/pom.xml b/agent-module/plugins-test-module/plugins-test/pom.xml
index a8ab351a1257..4905d3929ec3 100644
--- a/agent-module/plugins-test-module/plugins-test/pom.xml
+++ b/agent-module/plugins-test-module/plugins-test/pom.xml
@@ -169,13 +169,12 @@
             <version>${tinylog.version}</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.tinylog</groupId>
+            <artifactId>jcl-tinylog</artifactId>
+            <version>${tinylog.version}</version>
+        </dependency>
 
-
-        <!--                <dependency>-->
-        <!--            <groupId>org.slf4j</groupId>-->
-        <!--            <artifactId>slf4j-jdk14</artifactId>-->
-        <!--            <version>${slf4j.version}</version>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
@@ -186,11 +185,6 @@
             <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 
diff --git a/agent-module/plugins/thrift/pom.xml b/agent-module/plugins/thrift/pom.xml
index 5ba96a05de10..d1312705bab4 100644
--- a/agent-module/plugins/thrift/pom.xml
+++ b/agent-module/plugins/thrift/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/agent-module/profiler-test/pom.xml b/agent-module/profiler-test/pom.xml
index 86e0b99fa762..c41eeeffb053 100644
--- a/agent-module/profiler-test/pom.xml
+++ b/agent-module/profiler-test/pom.xml
@@ -81,10 +81,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
diff --git a/basic-login/pom.xml b/basic-login/pom.xml
index c92898eb709c..3b7a7cfd0f4f 100644
--- a/basic-login/pom.xml
+++ b/basic-login/pom.xml
@@ -65,16 +65,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/batch-alarmsender/pom.xml b/batch-alarmsender/pom.xml
index 516aa16494c5..31a8d69ce088 100644
--- a/batch-alarmsender/pom.xml
+++ b/batch-alarmsender/pom.xml
@@ -21,16 +21,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/batch/pom.xml b/batch/pom.xml
index a0664a7c196b..2694f9d138b4 100644
--- a/batch/pom.xml
+++ b/batch/pom.xml
@@ -142,17 +142,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/collector/pom.xml b/collector/pom.xml
index 170d1a5993cd..0d444452d20d 100644
--- a/collector/pom.xml
+++ b/collector/pom.xml
@@ -167,16 +167,6 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
@@ -194,12 +184,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
index b31686d07e74..67a6514d9e38 100644
--- a/commons-hbase/pom.xml
+++ b/commons-hbase/pom.xml
@@ -81,12 +81,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -131,17 +125,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <version>${log4j2.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
diff --git a/commons-mybatis/pom.xml b/commons-mybatis/pom.xml
index ea995cad2b8e..864b7c07376a 100644
--- a/commons-mybatis/pom.xml
+++ b/commons-mybatis/pom.xml
@@ -66,17 +66,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <version>${log4j2.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
diff --git a/commons-profiler/pom.xml b/commons-profiler/pom.xml
index e2421c5f5d74..19c93a5da022 100644
--- a/commons-profiler/pom.xml
+++ b/commons-profiler/pom.xml
@@ -48,11 +48,6 @@
             <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/commons-server-cluster/pom.xml b/commons-server-cluster/pom.xml
index bfd1ba8c045a..ff880a928f20 100644
--- a/commons-server-cluster/pom.xml
+++ b/commons-server-cluster/pom.xml
@@ -83,16 +83,7 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
 
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/commons-server/pom.xml b/commons-server/pom.xml
index e73437b4cb59..d6f1380b078f 100644
--- a/commons-server/pom.xml
+++ b/commons-server/pom.xml
@@ -159,16 +159,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>
diff --git a/datasource/pom.xml b/datasource/pom.xml
index bf9723ad19a6..906ce42ba0dd 100644
--- a/datasource/pom.xml
+++ b/datasource/pom.xml
@@ -71,17 +71,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <version>${log4j2.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
diff --git a/exceptiontrace/exceptiontrace-common/pom.xml b/exceptiontrace/exceptiontrace-common/pom.xml
index ec021bf59cc5..7d109d4b9467 100644
--- a/exceptiontrace/exceptiontrace-common/pom.xml
+++ b/exceptiontrace/exceptiontrace-common/pom.xml
@@ -25,12 +25,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
diff --git a/flink/pom.xml b/flink/pom.xml
index f8ab734aad2a..799a45a4dc88 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -116,12 +116,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -151,17 +145,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/metric-module/metric/pom.xml b/metric-module/metric/pom.xml
index d64d1d4ca2c5..e92eeb6d9bef 100644
--- a/metric-module/metric/pom.xml
+++ b/metric-module/metric/pom.xml
@@ -66,12 +66,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -200,16 +194,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/pinot/pinot-datasource/pom.xml b/pinot/pinot-datasource/pom.xml
index fe5cc95e6eb3..a87602d67584 100644
--- a/pinot/pinot-datasource/pom.xml
+++ b/pinot/pinot-datasource/pom.xml
@@ -214,6 +214,12 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.asynchttpclient</groupId>
@@ -232,6 +238,12 @@
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
             <version>1.10</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.101tec</groupId>
diff --git a/pom.xml b/pom.xml
index 12fed3312e48..059cc09f3bf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1035,6 +1035,13 @@
                 <version>${log4j2.version}</version>
                 <scope>runtime</scope>
                 <optional>true</optional>
+                <exclusions>
+                    <exclusion>
+                        <!-- replace spring-jcl -->
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
diff --git a/thrift/pom.xml b/thrift/pom.xml
index cafb5b9eeb1a..9b595e9a037b 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -64,11 +64,6 @@
             <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 
diff --git a/uristat/uristat-common/pom.xml b/uristat/uristat-common/pom.xml
index 3914b7ff6391..318657e54ee4 100644
--- a/uristat/uristat-common/pom.xml
+++ b/uristat/uristat-common/pom.xml
@@ -25,12 +25,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/web/pom.xml b/web/pom.xml
index 04d23dad480f..167c2be2916d 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -147,12 +147,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -298,16 +292,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/webhook/pom.xml b/webhook/pom.xml
index a8d637fac176..ac89249ef480 100644
--- a/webhook/pom.xml
+++ b/webhook/pom.xml
@@ -59,12 +59,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -163,16 +157,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>