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 @@
log4j-core
test
-
- org.apache.logging.log4j
- log4j-jcl
- test
-
commons-io
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 @@
${tinylog.version}
runtime
+
+ org.tinylog
+ jcl-tinylog
+ ${tinylog.version}
+
-
-
-
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl
@@ -186,11 +185,6 @@
log4j-core
test
-
- org.apache.logging.log4j
- log4j-jcl
- test
-
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 @@
log4j-core
test
-
- org.apache.logging.log4j
- log4j-jcl
- test
-
\ 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 @@
org.slf4j
slf4j-api
-
- org.apache.logging.log4j
- log4j-jcl
-
org.apache.logging.log4j
log4j-core
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 @@
org.apache.logging.log4j
log4j-api
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl
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 @@
org.slf4j
slf4j-api
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl
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 @@
org.slf4j
slf4j-api
- 2.0.9
-
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
org.apache.logging.log4j
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 @@
compile
true
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl
@@ -194,12 +184,6 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
org.springframework
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 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
org.springframework
@@ -131,17 +125,6 @@
org.apache.logging.log4j
log4j-core
-
- org.apache.logging.log4j
- log4j-jcl
- ${log4j2.version}
-
-
- commons-logging
- commons-logging
-
-
-
org.springframework
spring-context-support
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 @@
org.apache.logging.log4j
log4j-core
-
- org.apache.logging.log4j
- log4j-jcl
- ${log4j2.version}
-
-
- commons-logging
- commons-logging
-
-
-
org.springframework.boot
spring-boot
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 @@
log4j-core
test
-
- org.apache.logging.log4j
- log4j-jcl
- test
-
org.apache.commons
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 @@
org.apache.logging.log4j
log4j-core
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
+
org.springframework
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 @@
org.apache.logging.log4j
log4j-core
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
org.mapstruct
mapstruct
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 @@
org.apache.logging.log4j
log4j-core
-
- org.apache.logging.log4j
- log4j-jcl
- ${log4j2.version}
-
-
- commons-logging
- commons-logging
-
-
-
org.springframework.boot
spring-boot
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 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
com.navercorp.pinpoint
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 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
org.springframework
@@ -151,17 +145,6 @@
org.slf4j
slf4j-api
-
- org.apache.logging.log4j
- log4j-jcl
- test
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl
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 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
org.springframework
@@ -200,16 +194,6 @@
org.apache.logging.log4j
log4j-api
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl
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 @@
org.apache.httpcomponents
httpclient
+
+
+ commons-logging
+ commons-logging
+
+
org.asynchttpclient
@@ -232,6 +238,12 @@
commons-configuration
commons-configuration
1.10
+
+
+ commons-logging
+ commons-logging
+
+
com.101tec
diff --git a/pom.xml b/pom.xml
index 12fed3312e48..059cc09f3bf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1035,6 +1035,13 @@
${log4j2.version}
runtime
true
+
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.logging.log4j
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 @@
log4j-core
test
-
- org.apache.logging.log4j
- log4j-jcl
- test
-
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 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
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 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
org.springframework
@@ -298,16 +292,6 @@
org.apache.logging.log4j
log4j-api
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl
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 @@
org.springframework
spring-core
-
-
- commons-logging
- commons-logging
-
-
org.springframework
@@ -163,16 +157,6 @@
org.apache.logging.log4j
log4j-api
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
-
-
org.apache.logging.log4j
log4j-slf4j2-impl