[pinpoint-apm#6826] Cleanup logger dependency

hungbv1 · Aug 14, 2020 · 413b29f · 413b29f
1 parent 0160c5a
commit 413b29f
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 212 deletions.
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -35,6 +35,7 @@
     <properties>
         <!-- for development option -->
         <skip.agent.distribution>false</skip.agent.distribution>
+        <snakeyaml.version>1.23-p1</snakeyaml.version>
     </properties>
 
     <dependencies>

diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
@@ -99,6 +99,13 @@
             <artifactId>log4j-jcl</artifactId>
             <version>${log4j2.version}</version>
         </dependency>
+
+        <!-- for hbase library-->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
 

diff --git a/plugins-it/log4j-it/pom.xml b/plugins-it/log4j-it/pom.xml
@@ -37,7 +37,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/plugins-it/rabbitmq-it/pom.xml b/plugins-it/rabbitmq-it/pom.xml
@@ -45,6 +45,12 @@
             <artifactId>qpid-broker</artifactId>
             <version>6.1.1</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/plugins/log4j/pom.xml b/plugins/log4j/pom.xml
@@ -22,7 +22,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/plugins/mybatis/pom.xml b/plugins/mybatis/pom.xml
@@ -23,7 +23,7 @@
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
             <!-- 3.5.x java8 -->
-            <version>3.2.8</version>
+            <version>${mybatis.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -85,12 +85,12 @@
         <plugin.animal-sniffer.skip>false</plugin.animal-sniffer.skip>
 
         <!-- library -->
-        <slf4j.version>1.7.30</slf4j.version>
         <metrics.version>3.2.6</metrics.version>
 
         <!-- jdk 6 compatibility version -->
         <fastxml.jackson-jdk6.version>2.6.6</fastxml.jackson-jdk6.version>
         <fastxml.jackson.version>2.10.4</fastxml.jackson.version>
+        <snakeyaml.version>1.26</snakeyaml.version>
 
         <httpcomponents.version>4.5.6</httpcomponents.version>
         <httpcomponents-core.version>4.4.10</httpcomponents-core.version>
@@ -107,9 +107,12 @@
 
         <spring.boot.version>2.2.8.RELEASE</spring.boot.version>
 
+        <slf4j.version>1.7.30</slf4j.version>
         <log4j2-jdk6.version>2.3</log4j2-jdk6.version>
         <log4j2-jdk8.version>2.13.3</log4j2-jdk8.version>
         <log4j2.version>${log4j2-jdk6.version}</log4j2.version>
+        <!-- for plugin & hbase client -->
+        <log4j1.version>1.2.17</log4j1.version>
 
 
         <javax.servlet4.version>4.0.1</javax.servlet4.version>
@@ -123,6 +126,9 @@
         <netty3.version>3.10.6.Final</netty3.version>
         <netty4.version>4.1.50.Final</netty4.version>
 
+        <mybatis.spring.version>1.3.3</mybatis.spring.version>
+        <mybatis.version>3.4.6</mybatis.version>
+
         <!-- maven-plugin -->
         <plugin.compiler.version>3.8.1</plugin.compiler.version>
         <plugin.resources.version>3.1.0</plugin.resources.version>
@@ -470,6 +476,7 @@
                 <artifactId>hbase-shaded-client</artifactId>
                 <version>${hbase.shaded.client.version}</version>
                 <exclusions>
+                    <!-- Do not remove the log4j  -->
 <!--                    <exclusion>-->
 <!--                        <groupId>log4j</groupId>-->
 <!--                        <artifactId>log4j</artifactId>-->
@@ -515,7 +522,6 @@
             </dependency>
 
 
-
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-slf4j-impl</artifactId>
@@ -539,23 +545,35 @@
                 <optional>true</optional>
             </dependency>
 
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>${log4j1.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
                 <version>2.7.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.mybatis</groupId>
                 <artifactId>mybatis</artifactId>
                 <!-- build error mybatis-plugin 3.5.5 requried java8 -->
 <!--                <version>3.5.5</version>-->
-                <version>3.4.6</version>
+                <version>${mybatis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.mybatis</groupId>
                 <artifactId>mybatis-spring</artifactId>
                 <!-- 2.0.x java8 & spring5 https://mybatis.org/spring/index.html -->
-                <version>1.3.3</version>
+                <version>${mybatis.spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>

diff --git a/profiler-logging/pom.xml b/profiler-logging/pom.xml
@@ -63,7 +63,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

diff --git a/profiler/pom.xml b/profiler/pom.xml
@@ -27,6 +27,11 @@
     <artifactId>pinpoint-profiler</artifactId>
     <name>pinpoint-profiler</name>
     <packaging>jar</packaging>
+
+    <properties>
+
+    </properties>
+
 
     <dependencies>
         <dependency>

diff --git a/test/pom.xml b/test/pom.xml
@@ -65,13 +65,40 @@
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-http</artifactId>
             <version>${maven-resolver}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-wagon</artifactId>
             <version>${maven-resolver}</version>
         </dependency>
 
+        <!-- Logging dependencies -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <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.maven</groupId>
             <artifactId>maven-aether-provider</artifactId>

diff --git a/web/pom.xml b/web/pom.xml
@@ -240,9 +240,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+    </dependency>
 
         <!-- Caching dependecies -->
         <dependency>
@@ -320,13 +320,7 @@
             <version>${spring.batch.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <!-- spring-batch-test dependency -->
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.4</version>
-            <scope>test</scope>
-        </dependency>
+
 
         <!-- for zookeeper test -->
         <dependency>

diff --git a/web/src/main/resources/profiles/local/log4j.xml b/web/src/main/resources/profiles/local/log4j.xml
diff --git a/web/src/main/resources/profiles/local/log4j2.xml b/web/src/main/resources/profiles/local/log4j2.xml
@@ -81,7 +81,7 @@
             <AppenderRef ref="console"/>
         </Logger>
 
-        <Logger name="org.apache.zookeeper" level="DEBUG" additivity="false">
+        <Logger name="org.apache.zookeeper" level="INFO" additivity="false">
             <AppenderRef ref="console"/>
         </Logger>