Merge pull request #870 from DataDog/mar-kolya/cleanup-tooling-dependencies

Make agent-tooling compile-depend on dd-tracing-ot directly
This commit is contained in:
Nikolay Martynov 2019-06-11 15:32:45 -04:00 committed by GitHub
commit 2c173549b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 22 additions and 21 deletions

View File

@ -16,7 +16,7 @@ dependencies {
annotationProcessor deps.autoservice
implementation deps.autoservice
compileOnly project(':dd-trace-ot')
compile project(':dd-trace-ot')
testCompile deps.opentracing
testCompile project(':dd-java-agent:testing')

View File

@ -19,7 +19,6 @@ testSets {
dependencies {
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy

View File

@ -44,7 +44,6 @@ testSets {
dependencies {
compileOnly group: 'io.grpc', name: 'grpc-core', version: grpcVersion
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy

View File

@ -20,7 +20,6 @@ dependencies {
compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy

View File

@ -12,7 +12,6 @@ dependencies {
compileOnly deps.scala
testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot')
testCompile deps.scala
testCompile group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0'

View File

@ -11,7 +11,6 @@ dependencies {
compileOnly deps.scala
testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot')
testCompile deps.scala
testCompile group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.3.16'
testCompile group: 'com.typesafe.akka', name: 'akka-testkit_2.11', version: '2.3.16'

View File

@ -3,7 +3,8 @@ apply from: "${rootDir}/gradle/test-with-kotlin.gradle"
dependencies {
testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot')
testCompile deps.kotlin
testCompile deps.coroutines

View File

@ -11,7 +11,6 @@ dependencies {
compileOnly deps.scala
testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot')
testCompile deps.scala
testCompile project(':dd-java-agent:testing')

View File

@ -20,7 +20,6 @@ testSets {
dependencies {
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy

View File

@ -23,7 +23,6 @@ dependencies {
compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0'
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy

View File

@ -17,10 +17,21 @@ testSets {
}
}
/*
Note: there is a bit of dependency exclusion magic goin on.
We have to exclude all transitive dependencies on 'okhttp' because we would like to force
specific version. We cannot use . Unfortunately we cannot just force version on
a dependency because this doesn't work well with version ranges - it doesn't select latest.
And we cannot use configurations to exclude this dependency from everywhere in one go
because it looks like exclusions using configurations excludes dependency even if it explicit
not transitive.
*/
dependencies {
compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
compileOnly(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
compile project(':dd-java-agent:agent-tooling')
compile(project(':dd-java-agent:agent-tooling')) {
exclude module: 'okhttp'
}
compile deps.bytebuddy
compile deps.opentracing
@ -30,7 +41,9 @@ dependencies {
testCompile(project(':dd-java-agent:testing')) {
exclude module: 'okhttp'
}
testCompile project(':dd-java-agent:instrumentation:java-concurrent')
testCompile(project(':dd-java-agent:instrumentation:java-concurrent')) {
exclude module: 'okhttp'
}
testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
// 4.x.x-alpha has been released and it looks like there are lots of incompatible changes

View File

@ -20,7 +20,6 @@ testSets {
dependencies {
compileOnly group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy

View File

@ -25,7 +25,6 @@ testSets {
dependencies {
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
compile deps.bytebuddy

View File

@ -22,9 +22,6 @@ dependencies {
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.11.0'
compile project(':dd-trace-ot')
compile project(':dd-java-agent:agent-tooling')
annotationProcessor deps.autoservice