From 7bbe9ceb076718e96d85c60c946172c3f773f005 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Thu, 16 Jun 2016 13:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=EF=BC=8C=E8=AF=95=E5=9B=BE=E8=A7=A3=E5=86=B3log4j2?=
 =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                           |  7 +++++++
 skywalking-api/pom.xml                            |  7 -------
 skywalking-sdk-plugin/jdbc-plugin/pom.xml         |  8 +-------
 .../skywalking/plugin/jdbc/TracingDriver.java     |  4 ++--
 test/skywalking-agent-test/jdbc-test/pom.xml      |  7 -------
 test/skywalking-agent-test/pom.xml                |  7 +++++--
 test/skywalking-agent-test/redis-test/pom.xml     | 15 ---------------
 7 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ce45a92c..8bff1ac21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,13 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.4.1</version>
+			<scope>provided</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/skywalking-api/pom.xml b/skywalking-api/pom.xml
index 5cced7e8e..edbe11675 100644
--- a/skywalking-api/pom.xml
+++ b/skywalking-api/pom.xml
@@ -38,13 +38,6 @@
 			<version>4.0.33.Final</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>2.4.1</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.ai.cloud</groupId>
 			<artifactId>skywalking-test-api</artifactId>
diff --git a/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-sdk-plugin/jdbc-plugin/pom.xml
index 151e6a095..b30a49cda 100755
--- a/skywalking-sdk-plugin/jdbc-plugin/pom.xml
+++ b/skywalking-sdk-plugin/jdbc-plugin/pom.xml
@@ -27,7 +27,7 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.36</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.oracle</groupId>
@@ -35,12 +35,6 @@
             <version>10.2.0.4.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.6</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
index 756b49998..2c6897f59 100755
--- a/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
+++ b/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
@@ -110,12 +110,12 @@ public class TracingDriver implements Driver {
                 String urlPrefix = mapping.next();
                 if (url.startsWith(urlPrefix)) {
                     String driverClassStr = urlDriverMapping.get(urlPrefix);
-                    logger.debug("Success choose the driver class [" + driverClassStr + "] by connection url[ " + url + " ]");
+                    logger.debug("Success choose the driver class [{}] by connection url[{}]", driverClassStr, url);
                     return driverClassStr;
                 }
             }
 
-            logger.warn("Cannot match the driver class by connection url [" + url + "].");
+            logger.warn("Cannot match the driver class by connection url [{}].", url);
             return null;
         }
 
diff --git a/test/skywalking-agent-test/jdbc-test/pom.xml b/test/skywalking-agent-test/jdbc-test/pom.xml
index 1451df09d..a64aa76c0 100644
--- a/test/skywalking-agent-test/jdbc-test/pom.xml
+++ b/test/skywalking-agent-test/jdbc-test/pom.xml
@@ -14,13 +14,6 @@
     <name>jdbc-test</name>
     <url>http://maven.apache.org</url>
 
-    <repositories>
-        <repository>
-            <id>Company</id>
-            <url>http://10.1.228.199:18081/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/test/skywalking-agent-test/pom.xml b/test/skywalking-agent-test/pom.xml
index 0a314e0ad..2415c662a 100644
--- a/test/skywalking-agent-test/pom.xml
+++ b/test/skywalking-agent-test/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>pom</packaging>
 	<version>1.0-Final</version>
 
-	<name>skywalking-agent</name>
+	<name>skywalking-agent-test</name>
 	<url>http://maven.apache.org</url>
 
 	<modules>
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.6</version>
+			<version>2.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ai.cloud</groupId>
@@ -39,6 +39,7 @@
 		</dependency>
 	</dependencies>
 
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -59,4 +60,6 @@
 			</plugin>
 		</plugins>
 	</build>
+	
+	
 </project>
diff --git a/test/skywalking-agent-test/redis-test/pom.xml b/test/skywalking-agent-test/redis-test/pom.xml
index ed022e9d4..f360fac63 100644
--- a/test/skywalking-agent-test/redis-test/pom.xml
+++ b/test/skywalking-agent-test/redis-test/pom.xml
@@ -18,21 +18,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ai.cloud</groupId>
-            <artifactId>skywalking-test-api</artifactId>
-            <version>1.0-Final</version>
-        </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-- 
GitLab