From 282859c963c56e477659bb52d8da3fcb35ba0965 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 19 Aug 2020 21:51:59 -0700 Subject: [PATCH] Remove some unnecessary dependencies (#1052) --- instrumentation/akka-http-10.0/akka-http-10.0.gradle | 6 ------ .../elasticsearch-rest-common.gradle | 1 - .../elasticsearch-transport-common.gradle | 1 - instrumentation/java-concurrent/java-concurrent.gradle | 1 - .../java-concurrent/kotlin-testing/kotlin-testing.gradle | 2 -- .../java-concurrent/scala-testing/scala-testing.gradle | 2 -- .../kubernetes-client-7.0/kubernetes-client-7.0.gradle | 2 -- instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle | 4 ---- instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle | 2 -- 9 files changed, 21 deletions(-) diff --git a/instrumentation/akka-http-10.0/akka-http-10.0.gradle b/instrumentation/akka-http-10.0/akka-http-10.0.gradle index a2f25d2377..6fccbd4eb2 100644 --- a/instrumentation/akka-http-10.0/akka-http-10.0.gradle +++ b/instrumentation/akka-http-10.0/akka-http-10.0.gradle @@ -56,12 +56,6 @@ dependencies { library group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0' library group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.4.14' - implementation project(':javaagent-tooling') - implementation deps.autoservice - annotationProcessor deps.autoservice - - testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' - // There are some internal API changes in 10.1 that we would like to test separately for version101TestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.0' version101TestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.5.11' diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle b/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle index 119ee78734..f2ed3bb1b8 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle @@ -2,5 +2,4 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' - implementation project(':javaagent-tooling') } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle b/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle index 412b6f3c4a..c4367baf67 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle @@ -2,5 +2,4 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0' - implementation project(':javaagent-tooling') } diff --git a/instrumentation/java-concurrent/java-concurrent.gradle b/instrumentation/java-concurrent/java-concurrent.gradle index 5590b169e5..480c72016d 100644 --- a/instrumentation/java-concurrent/java-concurrent.gradle +++ b/instrumentation/java-concurrent/java-concurrent.gradle @@ -27,7 +27,6 @@ dependencies { // This is needed for Scala ForJoinTask/Pool instrumentation compileOnly deps.scala - slickTestImplementation project(':instrumentation:java-concurrent') slickTestImplementation project(':instrumentation:jdbc') slickTestImplementation deps.scala slickTestImplementation group: 'com.typesafe.slick', name: 'slick_2.11', version: '3.2.0' diff --git a/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle b/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle index b596a5a189..af2210c985 100644 --- a/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle +++ b/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle @@ -5,6 +5,4 @@ apply from: "$rootDir/gradle/test-with-kotlin.gradle" dependencies { testImplementation deps.kotlin testImplementation deps.coroutines - - testImplementation project(':instrumentation:java-concurrent') } diff --git a/instrumentation/java-concurrent/scala-testing/scala-testing.gradle b/instrumentation/java-concurrent/scala-testing/scala-testing.gradle index 0a85d65c21..38f6bab4b9 100644 --- a/instrumentation/java-concurrent/scala-testing/scala-testing.gradle +++ b/instrumentation/java-concurrent/scala-testing/scala-testing.gradle @@ -6,6 +6,4 @@ dependencies { compileOnly deps.scala testImplementation deps.scala - - testImplementation project(':instrumentation:java-concurrent') } diff --git a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle index 6f01ed438c..3452501040 100644 --- a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle +++ b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle @@ -15,7 +15,5 @@ muzzle { dependencies { library(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0') - - implementation project(':javaagent-tooling') } diff --git a/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle b/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle index 0ecbaf55cc..ac232a4aa0 100644 --- a/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle +++ b/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle @@ -16,10 +16,6 @@ muzzle { dependencies { library(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0') - implementation project(':javaagent-tooling') - - testImplementation project(':instrumentation:java-concurrent') - latestDepTestLibrary group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)' } diff --git a/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle b/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle index 0422da4064..ea60c2918f 100644 --- a/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle +++ b/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle @@ -21,8 +21,6 @@ not transitive. dependencies { library(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0') - implementation project(':javaagent-tooling') - testImplementation(project(':testing-common')) { exclude module: 'okhttp' }