提交 7bbe9ceb 编写于 作者: wu-sheng's avatar wu-sheng

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

上级 da06ad18
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.4.1</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
......
...@@ -38,13 +38,6 @@ ...@@ -38,13 +38,6 @@
<version>4.0.33.Final</version> <version>4.0.33.Final</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.4.1</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>com.ai.cloud</groupId> <groupId>com.ai.cloud</groupId>
<artifactId>skywalking-test-api</artifactId> <artifactId>skywalking-test-api</artifactId>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.36</version> <version>5.1.36</version>
<scope>provided</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.oracle</groupId> <groupId>com.oracle</groupId>
...@@ -35,12 +35,6 @@ ...@@ -35,12 +35,6 @@
<version>10.2.0.4.0</version> <version>10.2.0.4.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.6</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -110,12 +110,12 @@ public class TracingDriver implements Driver { ...@@ -110,12 +110,12 @@ public class TracingDriver implements Driver {
String urlPrefix = mapping.next(); String urlPrefix = mapping.next();
if (url.startsWith(urlPrefix)) { if (url.startsWith(urlPrefix)) {
String driverClassStr = urlDriverMapping.get(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; 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; return null;
} }
......
...@@ -14,13 +14,6 @@ ...@@ -14,13 +14,6 @@
<name>jdbc-test</name> <name>jdbc-test</name>
<url>http://maven.apache.org</url> <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> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-Final</version> <version>1.0-Final</version>
<name>skywalking-agent</name> <name>skywalking-agent-test</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<modules> <modules>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>2.6</version> <version>2.4.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ai.cloud</groupId> <groupId>com.ai.cloud</groupId>
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -59,4 +60,6 @@ ...@@ -59,4 +60,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
...@@ -18,21 +18,6 @@ ...@@ -18,21 +18,6 @@
</properties> </properties>
<dependencies> <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> <dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>
<artifactId>jedis</artifactId> <artifactId>jedis</artifactId>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册