Skip to content

Commit 287e63d

Browse files
committed
dependencies
1 parent e5cdc0c commit 287e63d

File tree

4 files changed

+18
-100
lines changed

4 files changed

+18
-100
lines changed

instrumentation/jdbc/javaagent/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ dependencies {
2020
compileOnly("com.google.auto.value:auto-value-annotations")
2121
annotationProcessor("com.google.auto.value:auto-value")
2222

23-
// jdbc unit testing
2423
testLibrary("com.h2database:h2:1.3.169")
25-
// first version jdk 1.6 compatible
26-
testLibrary("org.apache.derby:derby:10.6.1.0")
24+
testLibrary("org.apache.derby:derby:10.6.1.0") // first version jdk 1.6 compatible
2725
testLibrary("org.hsqldb:hsqldb:2.0.0")
2826

2927
testLibrary("org.apache.tomcat:tomcat-jdbc:7.0.19")
30-
// tomcat needs this to run
31-
testLibrary("org.apache.tomcat:tomcat-juli:7.0.19")
28+
testLibrary("org.apache.tomcat:tomcat-juli:7.0.19") // tomcat jdbc needs this
3229
testLibrary("com.zaxxer:HikariCP:2.4.0")
3330
testLibrary("com.mchange:c3p0:0.9.5")
3431
testLibrary("com.alibaba:druid:1.2.20")

instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/DruicDataSourceTest.java

Lines changed: 0 additions & 88 deletions
This file was deleted.

instrumentation/jdbc/library/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ dependencies {
1313
annotationProcessor("com.google.auto.value:auto-value")
1414

1515
testImplementation(project(":instrumentation:jdbc:testing"))
16+
17+
testLibrary("com.h2database:h2:1.3.169")
18+
testLibrary("org.apache.derby:derby:10.6.1.0") // first version jdk 1.6 compatible
19+
testLibrary("org.hsqldb:hsqldb:2.0.0")
20+
21+
testLibrary("org.apache.tomcat:tomcat-jdbc:7.0.19")
22+
testLibrary("org.apache.tomcat:tomcat-juli:7.0.19") // tomcat jdbc needs this
23+
testLibrary("com.zaxxer:HikariCP:2.4.0")
24+
testLibrary("com.mchange:c3p0:0.9.5")
1625
}
1726

1827
tasks {

instrumentation/jdbc/testing/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ dependencies {
1111
api(project(":testing-common"))
1212
api("com.google.guava:guava")
1313

14-
api("com.h2database:h2:1.3.169")
15-
api("org.apache.derby:derby:10.6.1.0")
16-
api("org.hsqldb:hsqldb:2.0.0")
14+
compileOnly("com.h2database:h2:1.3.169")
15+
compileOnly("org.apache.derby:derby:10.6.1.0")
16+
compileOnly("org.hsqldb:hsqldb:2.0.0")
1717

18-
api("org.apache.tomcat:tomcat-jdbc:7.0.19")
19-
api("org.apache.tomcat:tomcat-juli:7.0.19")
20-
api("com.zaxxer:HikariCP:2.4.0")
21-
api("com.mchange:c3p0:0.9.5")
18+
compileOnly("org.apache.tomcat:tomcat-jdbc:7.0.19")
19+
compileOnly("org.apache.tomcat:tomcat-juli:7.0.19")
20+
compileOnly("com.zaxxer:HikariCP:2.4.0")
21+
compileOnly("com.mchange:c3p0:0.9.5")
2222
}

0 commit comments

Comments
 (0)