kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改部分依赖，试图解决log4j2不兼容的问题。

This commit is contained in:
wusheng 2016-06-16 13:20:35 +08:00
parent da06ad18a0
commit 7bbe9ceb07
7 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -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>

7
skywalking-api/pom.xml
View File

@ -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>

8
skywalking-sdk-plugin/jdbc-plugin/pom.xml
View File

@ -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>

4
skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
View File

@ -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;
}

7
test/skywalking-agent-test/jdbc-test/pom.xml
View File

@ -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>

7
test/skywalking-agent-test/pom.xml
View File

@ -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>

15
test/skywalking-agent-test/redis-test/pom.xml
View File

@ -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>