Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
7bbe9ceb
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7bbe9ceb
编写于
6月 16, 2016
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改部分依赖,试图解决log4j2不兼容的问题。
上级
da06ad18
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
15 addition
and
40 deletion
+15
-40
pom.xml
pom.xml
+7
-0
skywalking-api/pom.xml
skywalking-api/pom.xml
+0
-7
skywalking-sdk-plugin/jdbc-plugin/pom.xml
skywalking-sdk-plugin/jdbc-plugin/pom.xml
+1
-7
skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
...va/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
+2
-2
test/skywalking-agent-test/jdbc-test/pom.xml
test/skywalking-agent-test/jdbc-test/pom.xml
+0
-7
test/skywalking-agent-test/pom.xml
test/skywalking-agent-test/pom.xml
+5
-2
test/skywalking-agent-test/redis-test/pom.xml
test/skywalking-agent-test/redis-test/pom.xml
+0
-15
未找到文件。
pom.xml
浏览文件 @
7bbe9ceb
...
@@ -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>
...
...
skywalking-api/pom.xml
浏览文件 @
7bbe9ceb
...
@@ -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>
...
...
skywalking-sdk-plugin/jdbc-plugin/pom.xml
浏览文件 @
7bbe9ceb
...
@@ -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>
...
...
skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/TracingDriver.java
浏览文件 @
7bbe9ceb
...
@@ -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
;
}
}
...
...
test/skywalking-agent-test/jdbc-test/pom.xml
浏览文件 @
7bbe9ceb
...
@@ -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>
...
...
test/skywalking-agent-test/pom.xml
浏览文件 @
7bbe9ceb
...
@@ -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>
test/skywalking-agent-test/redis-test/pom.xml
浏览文件 @
7bbe9ceb
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录