Browse Source

More fixes for Gradle warnings (#643)

* More gradle deprecation warnings fixed

* More gradle deprecation warnings fixed

* More fixes

* More fixes

Co-authored-by: Anuraag Agrawal <aanuraag@amazon.co.jp>
Nikita Salnikov-Tarnovski 4 years ago
parent
commit
a62801649f
100 changed files with 553 additions and 552 deletions
  1. 1 1
      agent-tooling/agent-tooling.gradle
  2. 6 6
      auto-exporters/auto-exporters.gradle
  3. 3 3
      auto-exporters/jaeger/jaeger.gradle
  4. 3 3
      auto-exporters/otlp/otlp.gradle
  5. 2 2
      auto-exporters/zipkin/zipkin.gradle
  6. 4 4
      benchmark-integration/jetty-perftest/jetty-perftest.gradle
  7. 1 0
      build.gradle
  8. 1 1
      gradle/checkstyle.gradle
  9. 7 7
      gradle/java.gradle
  10. 19 19
      instrumentation-core/aws-sdk/aws-sdk-2.2/aws-sdk-2.2.gradle
  11. 7 7
      instrumentation/akka-http-10.0/akka-http-10.0.gradle
  12. 8 8
      instrumentation/annotations/annotations.gradle
  13. 2 2
      instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle
  14. 2 2
      instrumentation/apache-httpclient/apache-httpclient-2.0/apache-httpclient-2.0.gradle
  15. 2 2
      instrumentation/apache-httpclient/apache-httpclient-4.0/apache-httpclient-4.0.gradle
  16. 14 14
      instrumentation/aws-sdk/aws-sdk-1.11/aws-sdk-1.11.gradle
  17. 19 19
      instrumentation/aws-sdk/aws-sdk-2.2/aws-sdk-2.2.gradle
  18. 3 3
      instrumentation/cassandra/cassandra-3.0/cassandra-3.0.gradle
  19. 3 3
      instrumentation/cassandra/cassandra-4.0/cassandra-4.0.gradle
  20. 6 6
      instrumentation/cdi-testing/cdi-testing.gradle
  21. 7 7
      instrumentation/couchbase/couchbase-2.0/couchbase-2.0.gradle
  22. 10 10
      instrumentation/couchbase/couchbase-2.6/couchbase-2.6.gradle
  23. 6 6
      instrumentation/dropwizard-testing/dropwizard-testing.gradle
  24. 2 2
      instrumentation/dropwizard-views-0.7/dropwizard-views-0.7.gradle
  25. 12 12
      instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle
  26. 13 13
      instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle
  27. 1 1
      instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle
  28. 12 12
      instrumentation/elasticsearch/elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle
  29. 8 8
      instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle
  30. 12 12
      instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
  31. 10 10
      instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle
  32. 1 1
      instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle
  33. 7 7
      instrumentation/finatra-2.9/finatra-2.9.gradle
  34. 2 2
      instrumentation/geode-1.4/geode-1.4.gradle
  35. 2 2
      instrumentation/google-http-client-1.19/google-http-client-1.19.gradle
  36. 5 5
      instrumentation/grizzly-2.0/grizzly-2.0.gradle
  37. 2 2
      instrumentation/grizzly-client-1.9/grizzly-client-1.9.gradle
  38. 10 10
      instrumentation/grpc-1.5/grpc-1.5.gradle
  39. 16 16
      instrumentation/hibernate/hibernate-3.3/hibernate-3.3.gradle
  40. 13 13
      instrumentation/hibernate/hibernate-4.0/hibernate-4.0.gradle
  41. 12 12
      instrumentation/hibernate/hibernate-4.3/hibernate-4.3.gradle
  42. 1 1
      instrumentation/http-url-connection/http-url-connection.gradle
  43. 6 6
      instrumentation/hystrix-1.4/hystrix-1.4.gradle
  44. 6 6
      instrumentation/instrumentation.gradle
  45. 2 2
      instrumentation/java-classloader/jboss-testing/jboss-testing.gradle
  46. 4 4
      instrumentation/java-classloader/osgi-testing/osgi-testing.gradle
  47. 3 3
      instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle
  48. 4 4
      instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle
  49. 5 5
      instrumentation/java-concurrent/akka-testing/akka-testing.gradle
  50. 1 1
      instrumentation/java-concurrent/java-concurrent.gradle
  51. 4 4
      instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle
  52. 3 3
      instrumentation/java-concurrent/scala-testing/scala-testing.gradle
  53. 2 2
      instrumentation/java-util-logging/java-util-logging.gradle
  54. 2 2
      instrumentation/jaxrs-client/jaxrs-client-1.1/jaxrs-client-1.1.gradle
  55. 1 1
      instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/jaxrs-client-2.0-jersey-2.0.gradle
  56. 1 1
      instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/jaxrs-client-2.0-resteasy-2.0.gradle
  57. 11 11
      instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0.gradle
  58. 2 2
      instrumentation/jaxrs/jaxrs-1.0/jaxrs-1.0.gradle
  59. 1 1
      instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/jaxrs-2.0-jersey-2.0.gradle
  60. 1 1
      instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/jaxrs-2.0-resteasy-3.0.gradle
  61. 1 1
      instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/jaxrs-2.0-resteasy-3.1.gradle
  62. 10 10
      instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle
  63. 16 16
      instrumentation/jdbc/jdbc.gradle
  64. 3 3
      instrumentation/jedis/jedis-1.4/jedis-1.4.gradle
  65. 4 4
      instrumentation/jedis/jedis-3.0/jedis-3.0.gradle
  66. 8 8
      instrumentation/jetty-8.0/jetty-8.0.gradle
  67. 7 7
      instrumentation/jms-1.1/jms-1.1.gradle
  68. 9 9
      instrumentation/jsp-2.3/jsp-2.3.gradle
  69. 11 11
      instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle
  70. 14 14
      instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle
  71. 2 2
      instrumentation/khttp-0.1/khttp-0.1.gradle
  72. 3 3
      instrumentation/lettuce/lettuce-4.0/lettuce-4.0.gradle
  73. 3 3
      instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle
  74. 4 4
      instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle
  75. 4 4
      instrumentation/log4j/log4j-1.1/log4j-1.1.gradle
  76. 5 5
      instrumentation/log4j/log4j-2.0/log4j-2.0.gradle
  77. 1 1
      instrumentation/logback-1.0/logback-1.0.gradle
  78. 5 5
      instrumentation/mongo/mongo-3.1/mongo-3.1.gradle
  79. 5 5
      instrumentation/mongo/mongo-3.7/mongo-3.7.gradle
  80. 6 6
      instrumentation/mongo/mongo-async-3.3/mongo-async-3.3.gradle
  81. 1 1
      instrumentation/mongo/mongo-common/mongo-common.gradle
  82. 5 5
      instrumentation/netty/netty-3.8/netty-3.8.gradle
  83. 5 5
      instrumentation/netty/netty-4.0/netty-4.0.gradle
  84. 6 6
      instrumentation/netty/netty-4.1/netty-4.1.gradle
  85. 5 5
      instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle
  86. 3 3
      instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle
  87. 1 1
      instrumentation/opentelemetry-api-beta/opentelemetry-api-beta.gradle
  88. 7 7
      instrumentation/play-ws/play-ws-1.0/play-ws-1.0.gradle
  89. 7 7
      instrumentation/play-ws/play-ws-2.0/play-ws-2.0.gradle
  90. 7 7
      instrumentation/play-ws/play-ws-2.1/play-ws-2.1.gradle
  91. 1 1
      instrumentation/play-ws/play-ws-common/play-ws-common.gradle
  92. 7 7
      instrumentation/play/play-2.3/play-2.3.gradle
  93. 9 9
      instrumentation/play/play-2.4/play-2.4.gradle
  94. 7 7
      instrumentation/play/play-2.6/play-2.6.gradle
  95. 5 5
      instrumentation/rabbitmq-2.7/rabbitmq-2.7.gradle
  96. 4 4
      instrumentation/ratpack-1.5/ratpack-1.5.gradle
  97. 4 4
      instrumentation/reactor-3.1/reactor-3.1.gradle
  98. 3 3
      instrumentation/rediscala-1.8/rediscala-1.8.gradle
  99. 4 4
      instrumentation/servlet/glassfish-testing/glassfish-testing.gradle
  100. 5 5
      instrumentation/servlet/servlet-2.3/servlet-2.3.gradle

+ 1 - 1
agent-tooling/agent-tooling.gradle

@@ -28,6 +28,6 @@ dependencies {
   testImplementation project(':testing')
 
   instrumentationMuzzle sourceSets.main.output
-  instrumentationMuzzle configurations.compile
+  instrumentationMuzzle configurations.implementation
 }
 

+ 6 - 6
auto-exporters/auto-exporters.gradle

@@ -5,13 +5,13 @@ plugins {
 apply from: "$rootDir/gradle/java.gradle"
 
 dependencies {
-  testCompile project(':auto-tooling')
+  testImplementation project(':auto-tooling')
 
-  testCompile deps.opentelemetrySdkAutoConfig
-  testCompile project(':auto-exporters:opentelemetry-auto-exporter-otlp')
-  testCompile project(':auto-exporters:opentelemetry-auto-exporter-jaeger')
-  testCompile project(':auto-exporters:opentelemetry-auto-exporter-logging')
-  testCompile project(':auto-exporters:opentelemetry-auto-exporter-zipkin')
+  testImplementation deps.opentelemetrySdkAutoConfig
+  testImplementation project(':auto-exporters:opentelemetry-auto-exporter-otlp')
+  testImplementation project(':auto-exporters:opentelemetry-auto-exporter-jaeger')
+  testImplementation project(':auto-exporters:opentelemetry-auto-exporter-logging')
+  testImplementation project(':auto-exporters:opentelemetry-auto-exporter-zipkin')
 }
 
 tasks.withType(Test).configureEach() {

+ 3 - 3
auto-exporters/jaeger/jaeger.gradle

@@ -6,12 +6,12 @@ apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/publish.gradle"
 
 dependencies {
-  compile(deps.opentelemetryJaeger) {
+  implementation(deps.opentelemetryJaeger) {
     exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
   }
   compileOnly deps.opentelemetrySdkAutoConfig
-  compile group: 'io.grpc', name: 'grpc-api', version: '1.24.0'
-  compile group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.24.0'
+  implementation group: 'io.grpc', name: 'grpc-api', version: '1.24.0'
+  implementation group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.24.0'
 }
 
 shadowJar {

+ 3 - 3
auto-exporters/otlp/otlp.gradle

@@ -6,12 +6,12 @@ apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/publish.gradle"
 
 dependencies {
-  compile(deps.opentelemetryOtlp) {
+  implementation(deps.opentelemetryOtlp) {
     exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
   }
   compileOnly deps.opentelemetrySdkAutoConfig
-  compile group: 'io.grpc', name: 'grpc-api', version: '1.24.0'
-  compile group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.24.0'
+  implementation group: 'io.grpc', name: 'grpc-api', version: '1.24.0'
+  implementation group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.24.0'
 }
 
 shadowJar {

+ 2 - 2
auto-exporters/zipkin/zipkin.gradle

@@ -6,11 +6,11 @@ apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/publish.gradle"
 
 dependencies {
-  compile(deps.opentelemetryZipkin) {
+  implementation(deps.opentelemetryZipkin) {
     exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
   }
   compileOnly deps.opentelemetrySdkAutoConfig
-  compile group: 'io.zipkin.reporter2', name: 'zipkin-sender-okhttp3', version: '2.12.2'
+  implementation group: 'io.zipkin.reporter2', name: 'zipkin-sender-okhttp3', version: '2.12.2'
 }
 
 shadowJar {

+ 4 - 4
benchmark-integration/jetty-perftest/jetty-perftest.gradle

@@ -1,9 +1,9 @@
 dependencies {
-  compile project(':auto-bootstrap')
-  compile project(':benchmark-integration')
+  implementation project(':auto-bootstrap')
+  implementation project(':benchmark-integration')
 
-  compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120'
-  compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120'
+  implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120'
+  implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120'
 }
 
 jar {

+ 1 - 0
build.gradle

@@ -72,6 +72,7 @@ spotless {
   // and would be missed otherwise
   format 'misc', {
     target '**/.gitignore', '**/*.md', '**/*.sh'
+    targetExclude 'smoke-tests/**/build/**'
     indentWithSpaces()
     trimTrailingWhitespace()
     endWithNewline()

+ 1 - 1
gradle/checkstyle.gradle

@@ -7,7 +7,7 @@ dependencies {
 def checkstyleConfigDir = file("${buildscript.sourceFile.parentFile}/enforcement/checkstyle")
 
 checkstyle {
-  configDir = checkstyleConfigDir
+  configDirectory = checkstyleConfigDir
   configProperties.checkstyleConfigDir = checkstyleConfigDir
   maxWarnings = 500
 }

+ 7 - 7
gradle/java.gradle

@@ -109,11 +109,11 @@ repositories {
 }
 
 dependencies {
-  testCompile deps.spock
-  testCompile deps.groovy
-  testCompile deps.testLogging
-  testCompile group: 'info.solidsoft.spock', name: 'spock-global-unroll', version: '0.5.1'
-  testCompile group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
+  testImplementation deps.spock
+  testImplementation deps.groovy
+  testImplementation deps.testLogging
+  testImplementation group: 'info.solidsoft.spock', name: 'spock-global-unroll', version: '0.5.1'
+  testImplementation group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
 }
 
 jar {
@@ -155,8 +155,8 @@ project.afterEvaluate {
   if (project.plugins.hasPlugin('org.unbroken-dome.test-sets') && configurations.hasProperty("latestDepTestRuntime")) {
     tasks.withType(Test).configureEach {
       doFirst {
-        def testArtifacts = configurations.testRuntime.resolvedConfiguration.resolvedArtifacts
-        def latestTestArtifacts = configurations.latestDepTestRuntime.resolvedConfiguration.resolvedArtifacts
+        def testArtifacts = configurations.testRuntimeClasspath.resolvedConfiguration.resolvedArtifacts
+        def latestTestArtifacts = configurations.latestDepTestRuntimeClasspath.resolvedConfiguration.resolvedArtifacts
         assert testArtifacts != latestTestArtifacts: "latestDepTest dependencies are identical to test"
       }
     }

+ 19 - 19
instrumentation-core/aws-sdk/aws-sdk-2.2/aws-sdk-2.2.gradle

@@ -22,29 +22,29 @@ dependencies {
 
   api group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
 
-  testCompile project(':testing')
+  testImplementation project(':testing')
 
   // Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
-  testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
+  testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
   // Also include netty instrumentation because it is used by aws async client
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'ec2', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0'
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'ec2', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0'
   testImplementation deps.guava
 
-  latestDepTestCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
-  latestDepTestCompile project(':instrumentation:netty:netty-4.1')
+  latestDepTestImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
+  latestDepTestImplementation project(':instrumentation:netty:netty-4.1')
 
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 's3', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'rds', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'ec2', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'sqs', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'dynamodb', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'kinesis', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 's3', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'rds', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'ec2', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'sqs', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'dynamodb', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '+'
 }

+ 7 - 7
instrumentation/akka-http-10.0/akka-http-10.0.gradle

@@ -72,13 +72,13 @@ muzzle {
 dependencies {
   compileOnly group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
 
-  compile project(':auto-tooling')
-  compile deps.autoservice
+  implementation project(':auto-tooling')
+  implementation deps.autoservice
   annotationProcessor deps.autoservice
 
-  testCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
-  testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
-  testCompile project(':instrumentation:annotations')
+  testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
+  testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
+  testImplementation project(':instrumentation:annotations')
 
   lagomTestCompile project(':instrumentation:akka-http-10.0')
 
@@ -88,8 +88,8 @@ dependencies {
   version101TestCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.0'
   version101TestCompile group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.5.11'
 
-  latestDepTestCompile group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '+'
-  latestDepTestCompile group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '+'
+  latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '+'
+  latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '+'
 }
 
 test.dependsOn lagomTest

+ 8 - 8
instrumentation/annotations/annotations.gradle

@@ -12,19 +12,19 @@ muzzle {
 dependencies {
   implementation deps.opentelemetryApiAutoAnnotations
 
-  testCompile group: 'com.newrelic.agent.java', name: 'newrelic-api', version: '+'
-  testCompile(group: 'io.opentracing.contrib.dropwizard', name: 'dropwizard-opentracing', version: '0.2.2') {
+  testImplementation group: 'com.newrelic.agent.java', name: 'newrelic-api', version: '+'
+  testImplementation(group: 'io.opentracing.contrib.dropwizard', name: 'dropwizard-opentracing', version: '0.2.2') {
     transitive = false
   }
-  testCompile group: 'com.signalfx.public', name: 'signalfx-trace-api', version: '+'
+  testImplementation group: 'com.signalfx.public', name: 'signalfx-trace-api', version: '+'
   //Old and new versions of kamon use different packages for Trace annotation
-  testCompile(group: 'io.kamon', name: 'kamon-annotation_2.11', version: '0.6.7') {
+  testImplementation(group: 'io.kamon', name: 'kamon-annotation_2.11', version: '0.6.7') {
     transitive = false
   }
-  testCompile group: 'io.kamon', name: 'kamon-annotation-api', version: '+'
-  testCompile group: 'com.appoptics.agent.java', name: 'appoptics-sdk', version: '+'
-  testCompile group: 'com.tracelytics.agent.java', name: 'tracelytics-api', version: '+'
-  testCompile(group: 'org.springframework.cloud', name: 'spring-cloud-sleuth-core', version: '+') {
+  testImplementation group: 'io.kamon', name: 'kamon-annotation-api', version: '+'
+  testImplementation group: 'com.appoptics.agent.java', name: 'appoptics-sdk', version: '+'
+  testImplementation group: 'com.tracelytics.agent.java', name: 'tracelytics-api', version: '+'
+  testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-sleuth-core', version: '+') {
     transitive = false
   }
 }

+ 2 - 2
instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle

@@ -23,7 +23,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
 
-  testCompile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
+  testImplementation group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
 
-  latestDepTestCompile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '+'
+  latestDepTestImplementation group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '+'
 }

+ 2 - 2
instrumentation/apache-httpclient/apache-httpclient-2.0/apache-httpclient-2.0.gradle

@@ -20,7 +20,7 @@ testSets {
 dependencies {
   compileOnly group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
 
-  testCompile group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
+  testImplementation group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
 
-  latestDepTestCompile group: 'commons-httpclient', name: 'commons-httpclient', version: '+'
+  latestDepTestImplementation group: 'commons-httpclient', name: 'commons-httpclient', version: '+'
 }

+ 2 - 2
instrumentation/apache-httpclient/apache-httpclient-4.0/apache-httpclient-4.0.gradle

@@ -32,7 +32,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
 
-  testCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
+  testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
 
-  latestDepTestCompile group: 'org.apache.httpcomponents', name: 'httpclient', version: '+'
+  latestDepTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '+'
 }

+ 14 - 14
instrumentation/aws-sdk/aws-sdk-1.11/aws-sdk-1.11.gradle

@@ -37,16 +37,16 @@ dependencies {
   compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'
 
   // Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
-  testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
-  testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106'
-  testCompile group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106'
-  testCompile group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106'
-  testCompile group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.106'
-  testCompile group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106'
-  testCompile group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.106'
+  testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
+  testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106'
+  testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106'
+  testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106'
+  testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.106'
+  testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106'
+  testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.106'
 
   // needed for kinesis:
-  testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: versions.jackson
+  testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: versions.jackson
 
   test_before_1_11_106Compile(group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.0') {
     force = true
@@ -67,12 +67,12 @@ dependencies {
     force = true
   }
 
-  latestDepTestCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '+'
-  latestDepTestCompile group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '+'
-  latestDepTestCompile group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '+'
-  latestDepTestCompile group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '+'
-  latestDepTestCompile group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '+'
-  latestDepTestCompile group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+'
+  latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '+'
+  latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '+'
+  latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '+'
+  latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '+'
+  latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '+'
+  latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+'
 }
 
 test.dependsOn test_before_1_11_106

+ 19 - 19
instrumentation/aws-sdk/aws-sdk-2.2/aws-sdk-2.2.gradle

@@ -18,31 +18,31 @@ testSets {
 }
 
 dependencies {
-  compile project(':instrumentation-core:aws-sdk:aws-sdk-2.2')
+  implementation project(':instrumentation-core:aws-sdk:aws-sdk-2.2')
 
   compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
 
   // Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
-  testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
+  testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
   // Also include netty instrumentation because it is used by aws async client
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'ec2', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.2.0'
-  testCompile group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0'
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 's3', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'ec2', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.2.0'
+  testImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0'
   testImplementation deps.guava
 
-  latestDepTestCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
-  latestDepTestCompile project(':instrumentation:netty:netty-4.1')
+  latestDepTestImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
+  latestDepTestImplementation project(':instrumentation:netty:netty-4.1')
 
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 's3', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'rds', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'ec2', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'sqs', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'dynamodb', version: '+'
-  latestDepTestCompile group: 'software.amazon.awssdk', name: 'kinesis', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 's3', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'rds', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'ec2', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'sqs', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'dynamodb', version: '+'
+  latestDepTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '+'
 }

+ 3 - 3
instrumentation/cassandra/cassandra-3.0/cassandra-3.0.gradle

@@ -56,8 +56,8 @@ dependencies {
   implementation(project(':utils:thread-utils'))
   compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
 
-  testCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
-  testCompile group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
+  testImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
+  testImplementation group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
 
-  latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+'
+  latestDepTestImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+'
 }

+ 3 - 3
instrumentation/cassandra/cassandra-4.0/cassandra-4.0.gradle

@@ -26,8 +26,8 @@ testSets {
 dependencies {
   compileOnly group: 'com.datastax.oss', name: 'java-driver-core', version: '4.0.0'
 
-  testCompile group: 'com.datastax.oss', name: 'java-driver-core', version: '4.0.0'
-  testCompile group: 'org.cassandraunit', name: 'cassandra-unit', version: '4.3.1.0'
+  testImplementation group: 'com.datastax.oss', name: 'java-driver-core', version: '4.0.0'
+  testImplementation group: 'org.cassandraunit', name: 'cassandra-unit', version: '4.3.1.0'
 
-  latestDepTestCompile group: 'com.datastax.oss', name: 'java-driver-core', version: '4.+'
+  latestDepTestImplementation group: 'com.datastax.oss', name: 'java-driver-core', version: '4.+'
 }

+ 6 - 6
instrumentation/cdi-testing/cdi-testing.gradle

@@ -9,12 +9,12 @@ testSets {
 }
 
 dependencies {
-  testCompile group: 'org.jboss.weld', name: 'weld-core', version: '2.3.0.Final'
-  testCompile group: 'org.jboss.weld.se', name: 'weld-se', version: '2.3.0.Final'
-  testCompile group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.3.0.Final'
+  testImplementation group: 'org.jboss.weld', name: 'weld-core', version: '2.3.0.Final'
+  testImplementation group: 'org.jboss.weld.se', name: 'weld-se', version: '2.3.0.Final'
+  testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.3.0.Final'
 
   // Beyond 2.x is CDI 2+ and requires Java 8
-  latestDepTestCompile group: 'org.jboss.weld', name: 'weld-core', version: '2.+'
-  latestDepTestCompile group: 'org.jboss.weld.se', name: 'weld-se', version: '2.+'
-  latestDepTestCompile group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+'
+  latestDepTestImplementation group: 'org.jboss.weld', name: 'weld-core', version: '2.+'
+  latestDepTestImplementation group: 'org.jboss.weld.se', name: 'weld-se', version: '2.+'
+  latestDepTestImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+'
 }

+ 7 - 7
instrumentation/couchbase/couchbase-2.0/couchbase-2.0.gradle

@@ -47,17 +47,17 @@ artifacts {
 }
 
 dependencies {
-  compile project(':instrumentation:rxjava-1.0')
+  implementation project(':instrumentation:rxjava-1.0')
 
   compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.0.0'
 
-  testCompile group: 'com.couchbase.mock', name: 'CouchbaseMock', version: '1.5.19'
+  testImplementation group: 'com.couchbase.mock', name: 'CouchbaseMock', version: '1.5.19'
 
-  testCompile group: 'org.springframework.data', name: 'spring-data-couchbase', version: '2.0.0.RELEASE'
+  testImplementation group: 'org.springframework.data', name: 'spring-data-couchbase', version: '2.0.0.RELEASE'
   // Earliest version that seems to allow queries with CouchbaseMock:
-  testCompile group: 'com.couchbase.client', name: 'java-client', version: '2.5.0'
+  testImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.5.0'
 
-  latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.+'
-  latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.+'
-  latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '+'
+  latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.+'
+  latestDepTestImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.+'
+  latestDepTestImplementation group: 'com.couchbase.client', name: 'encryption', version: '+'
 }

+ 10 - 10
instrumentation/couchbase/couchbase-2.6/couchbase-2.6.gradle

@@ -43,20 +43,20 @@ muzzle {
 }
 
 dependencies {
-  compile project(':instrumentation:rxjava-1.0')
+  implementation project(':instrumentation:rxjava-1.0')
 
   compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
 
-  testCompile project(':instrumentation:couchbase:couchbase-2.0')
-  testCompile project(path: ':instrumentation:couchbase:couchbase-2.0', configuration: 'testArtifacts')
-  testCompile group: 'com.couchbase.mock', name: 'CouchbaseMock', version: '1.5.19'
+  testImplementation project(':instrumentation:couchbase:couchbase-2.0')
+  testImplementation project(path: ':instrumentation:couchbase:couchbase-2.0', configuration: 'testArtifacts')
+  testImplementation group: 'com.couchbase.mock', name: 'CouchbaseMock', version: '1.5.19'
 
-  testCompile group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1.0.RELEASE'
+  testImplementation group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1.0.RELEASE'
 
-  testCompile group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
-  testCompile group: 'com.couchbase.client', name: 'encryption', version: '1.0.0'
+  testImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
+  testImplementation group: 'com.couchbase.client', name: 'encryption', version: '1.0.0'
 
-  latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1+'
-  latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.+'
-  latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '+'
+  latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1+'
+  latestDepTestImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.+'
+  latestDepTestImplementation group: 'com.couchbase.client', name: 'encryption', version: '+'
 }

+ 6 - 6
instrumentation/dropwizard-testing/dropwizard-testing.gradle

@@ -10,14 +10,14 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 //}
 
 dependencies {
-  testCompile project(':instrumentation:jaxrs:jaxrs-2.0')
-  testCompile project(':instrumentation:servlet:servlet-3.0')
+  testImplementation project(':instrumentation:jaxrs:jaxrs-2.0')
+  testImplementation project(':instrumentation:servlet:servlet-3.0')
 
   // First version with DropwizardTestSupport:
-  testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
-  testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
-  testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
+  testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
+  testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+  testImplementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
 
   // Anything 1.0+ fails with a java.lang.NoClassDefFoundError: org/eclipse/jetty/server/RequestLog
-//  latestDepTestCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
+//  latestDepTestImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
 }

+ 2 - 2
instrumentation/dropwizard-views-0.7/dropwizard-views-0.7.gradle

@@ -11,6 +11,6 @@ muzzle {
 dependencies {
   compileOnly group: 'io.dropwizard', name: 'dropwizard-views', version: '0.7.0'
 
-  testCompile group: 'io.dropwizard', name: 'dropwizard-views-freemarker', version: '0.7.0'
-  testCompile group: 'io.dropwizard', name: 'dropwizard-views-mustache', version: '0.7.0'
+  testImplementation group: 'io.dropwizard', name: 'dropwizard-views-freemarker', version: '0.7.0'
+  testImplementation group: 'io.dropwizard', name: 'dropwizard-views-mustache', version: '0.7.0'
 }

+ 12 - 12
instrumentation/elasticsearch/elasticsearch-rest-5.0/elasticsearch-rest-5.0.gradle

@@ -28,23 +28,23 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-rest-common')
+  implementation project(':instrumentation:elasticsearch:elasticsearch-rest-common')
 
-  testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
-  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
+  testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.0')
 
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
 
-  testCompile group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
-  testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '5.0.0'
-  testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.0.0'
+  testImplementation group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
+  testImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '5.0.0'
+  testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.0.0'
 
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.3.+'
-  latestDepTestCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '6.3.+'
-  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.3.+'
+  latestDepTestImplementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.3.+'
+  latestDepTestImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '6.3.+'
+  latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.3.+'
 }
 
-configurations.latestDepTestCompile {
+configurations.latestDepTestImplementation {
   exclude group: "org.elasticsearch.client", module: "rest"
 }

+ 13 - 13
instrumentation/elasticsearch/elasticsearch-rest-6.4/elasticsearch-rest-6.4.gradle

@@ -29,23 +29,23 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.4.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-rest-common')
+  implementation project(':instrumentation:elasticsearch:elasticsearch-rest-common')
 
-  testCompile project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
-  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
+  testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.0')
   // Netty is used, but it adds complexity to the tests since we're using embedded ES.
-  //testCompile project(':instrumentation:netty:netty-4.1')
+  //testImplementation project(':instrumentation:netty:netty-4.1')
 
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
 
-  testCompile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.4.0'
-  testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '6.4.0'
-  testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.4.0'
+  testImplementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.4.0'
+  testImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '6.4.0'
+  testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.4.0'
 
   // TODO: The tests are incompatible with 7.x.  The instrumentation may be as well.
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.+'
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '6.+'
-  latestDepTestCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '6.+'
-  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.+'
+  latestDepTestImplementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.+'
+  latestDepTestImplementation group: 'org.elasticsearch.client', name: 'transport', version: '6.+'
+  latestDepTestImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '6.+'
+  latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.+'
 }

+ 1 - 1
instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle

@@ -2,5 +2,5 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
-  compile project(':auto-tooling')
+  implementation project(':auto-tooling')
 }

+ 12 - 12
instrumentation/elasticsearch/elasticsearch-transport-2.0/elasticsearch-transport-2.0.gradle

@@ -23,24 +23,24 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
+  implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
-  testCompile project(':instrumentation:elasticsearch:elasticsearch-transport-5.0')
-  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
+  testImplementation project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
+  testImplementation project(':instrumentation:elasticsearch:elasticsearch-transport-5.0')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.0')
 
-  testCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
+  testImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
 
-  testCompile group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '2.0.0.RELEASE'
+  testImplementation group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '2.0.0.RELEASE'
 
-  testCompile group: 'net.java.dev.jna', name: 'jna', version: '4.5.1'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+  testImplementation group: 'net.java.dev.jna', name: 'jna', version: '4.5.1'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
 
-  testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-smile', version: '2.9.9'
+  testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-smile', version: '2.9.9'
   // ^ is needed because we are using a newer version of jackson that isn't compatible without this.
 
-  latestDepTestCompile group: 'org.elasticsearch', name: 'elasticsearch', version: '2.4.6'
-  latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '2.1.15.RELEASE'
+  latestDepTestImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '2.4.6'
+  latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '2.1.15.RELEASE'
 }

+ 8 - 8
instrumentation/elasticsearch/elasticsearch-transport-5.0/elasticsearch-transport-5.0.gradle

@@ -23,16 +23,16 @@ muzzle {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
+  implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
-  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
 
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
 
-  testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.0.0'
-  testCompile group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
+  testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.0.0'
+  testImplementation group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
 }

+ 12 - 12
instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle

@@ -30,22 +30,22 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
+  implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
-  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile project(':instrumentation:spring-data-1.8')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:spring-data-1.8')
 
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
 
-  testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.3.0'
-  testCompile group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
+  testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.3.0'
+  testImplementation group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
 
   // Unfortunately this will bump the transport version up to 5.5.0.
-  testCompile group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.0.RELEASE'
+  testImplementation group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.0.RELEASE'
 
-  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.+'
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '5.+'
-  latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.+'
+  latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.+'
+  latestDepTestImplementation group: 'org.elasticsearch.client', name: 'transport', version: '5.+'
+  latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.+'
 }

+ 10 - 10
instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle

@@ -30,20 +30,20 @@ testSets {
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
 
-  compile project(':instrumentation:elasticsearch:elasticsearch-transport-common')
+  implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common')
 
   // Ensure no cross interference
-  testCompile project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
-  testCompile project(':instrumentation:apache-httpasyncclient-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:elasticsearch:elasticsearch-rest-5.0')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
 
-  testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'
-  testCompile group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
+  testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'
+  testImplementation group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
 
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
 
   // Limit tests to <6.5 as the latest versions have a breaking change for the tests.
-  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '(6.1,6.5)'
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '(6.1,6.5)'
+  latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '(6.1,6.5)'
+  latestDepTestImplementation group: 'org.elasticsearch.client', name: 'transport', version: '(6.1,6.5)'
 }

+ 1 - 1
instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle

@@ -2,5 +2,5 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
   compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
-  compile project(':auto-tooling')
+  implementation project(':auto-tooling')
 }

+ 7 - 7
instrumentation/finatra-2.9/finatra-2.9.gradle

@@ -32,16 +32,16 @@ muzzle {
 dependencies {
   compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0'
 
-  testCompile project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:netty:netty-4.1')
 
-  testCompile group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
-  testCompile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
+  testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
+  testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
   // Required for older versions of finatra on JDKs >= 11
-  testCompile group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
+  testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
 
-  latestDepTestCompile project(':instrumentation:netty:netty-4.1')
-  latestDepTestCompile group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
-  latestDepTestCompile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0')
+  latestDepTestImplementation project(':instrumentation:netty:netty-4.1')
+  latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
+  latestDepTestImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0')
 }
 
 compileLatestDepTestGroovy {

+ 2 - 2
instrumentation/geode-1.4/geode-1.4.gradle

@@ -24,6 +24,6 @@ testSets {
 dependencies {
   compileOnly group: 'org.apache.geode', name: 'geode-core', version: '1.4.0'
 
-  testCompile group: 'org.apache.geode', name: 'geode-core', version: '1.4.0'
-  latestDepTestCompile group: 'org.apache.geode', name: 'geode-core', version: '+'
+  testImplementation group: 'org.apache.geode', name: 'geode-core', version: '1.4.0'
+  latestDepTestImplementation group: 'org.apache.geode', name: 'geode-core', version: '+'
 }

+ 2 - 2
instrumentation/google-http-client-1.19/google-http-client-1.19.gradle

@@ -20,7 +20,7 @@ testSets {
 dependencies {
   compileOnly group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
 
-  testCompile group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
+  testImplementation group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
 
-  latestDepTestCompile group: 'com.google.http-client', name: 'google-http-client', version: '+'
+  latestDepTestImplementation group: 'com.google.http-client', name: 'google-http-client', version: '+'
 }

+ 5 - 5
instrumentation/grizzly-2.0/grizzly-2.0.gradle

@@ -20,10 +20,10 @@ dependencies {
 
   compileOnly group: 'org.glassfish.grizzly', name: 'grizzly-http', version: '2.0'
 
-  testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
-  testCompile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
-  testCompile group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.0'
+  testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+  testImplementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
+  testImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.0'
 
-  latestDepTestCompile group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.+'
-  latestDepTestCompile group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
+  latestDepTestImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.+'
+  latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
 }

+ 2 - 2
instrumentation/grizzly-client-1.9/grizzly-client-1.9.gradle

@@ -29,7 +29,7 @@ testSets {
 dependencies {
   compileOnly group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.9'
   // for some reason, the tests don't *load* until 1.12, but muzzles works as far back as 1.9
-  testCompile group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.12'
+  testImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.12'
 
-  latestDepTestCompile group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.16'
+  latestDepTestImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.16'
 }

+ 10 - 10
instrumentation/grpc-1.5/grpc-1.5.gradle

@@ -44,21 +44,21 @@ testSets {
 dependencies {
   compileOnly group: 'io.grpc', name: 'grpc-core', version: grpcVersion
 
-  testCompile group: 'io.grpc', name: 'grpc-netty', version: grpcVersion
-  testCompile group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion
-  testCompile group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
-  testCompile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
-  testCompile project(':utils:thread-utils')
+  testImplementation group: 'io.grpc', name: 'grpc-netty', version: grpcVersion
+  testImplementation group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion
+  testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
+  testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
+  testImplementation project(':utils:thread-utils')
 
-  latestDepTestCompile sourceSets.test.output // include the protobuf generated classes
-  latestDepTestCompile group: 'io.grpc', name: 'grpc-netty', version: '+'
-  latestDepTestCompile group: 'io.grpc', name: 'grpc-protobuf', version: '+'
-  latestDepTestCompile group: 'io.grpc', name: 'grpc-stub', version: '+'
+  latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes
+  latestDepTestImplementation group: 'io.grpc', name: 'grpc-netty', version: '+'
+  latestDepTestImplementation group: 'io.grpc', name: 'grpc-protobuf', version: '+'
+  latestDepTestImplementation group: 'io.grpc', name: 'grpc-stub', version: '+'
 
   // this instrumentation needs to be able to be able to reference the OpenTelemetry API's gRPC Context
   // that is shaded in the bootstrap class loader (for sending telemetry to the agent),
   // separately from the gRPC Context that is brought by gRPC
   compileOnly project(path: ':opentelemetry-api-beta-shaded-for-instrumenting', configuration: 'shadow')
 
-  testCompile project(path: ':opentelemetry-api-beta-shaded-for-instrumenting', configuration: 'shadow')
+  testImplementation project(path: ':opentelemetry-api-beta-shaded-for-instrumenting', configuration: 'shadow')
 }

+ 16 - 16
instrumentation/hibernate/hibernate-3.3/hibernate-3.3.gradle

@@ -26,26 +26,26 @@ testSets {
 dependencies {
   compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.GA'
 
-  compile project(':instrumentation:hibernate:hibernate-common')
+  implementation project(':instrumentation:hibernate:hibernate-common')
 
-  testCompile project(':instrumentation:jdbc')
+  testImplementation project(':instrumentation:jdbc')
   // Added to ensure cross compatibility:
-  testCompile project(':instrumentation:hibernate:hibernate-4.0')
-  testCompile project(':instrumentation:hibernate:hibernate-4.3')
-
-  testCompile group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.SP1'
-  testCompile group: 'org.hibernate', name: 'hibernate-annotations', version: '3.4.0.GA'
-  testCompile group: 'javassist', name: 'javassist', version: '+'
-  testCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
-  testCompile "javax.xml.bind:jaxb-api:2.2.11"
-  testCompile "com.sun.xml.bind:jaxb-core:2.2.11"
-  testCompile "com.sun.xml.bind:jaxb-impl:2.2.11"
-  testCompile "javax.activation:activation:1.1.1"
-
-  latestDepTestCompile group: 'org.hibernate', name: 'hibernate-core', version: '3.+'
+  testImplementation project(':instrumentation:hibernate:hibernate-4.0')
+  testImplementation project(':instrumentation:hibernate:hibernate-4.3')
+
+  testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.SP1'
+  testImplementation group: 'org.hibernate', name: 'hibernate-annotations', version: '3.4.0.GA'
+  testImplementation group: 'javassist', name: 'javassist', version: '+'
+  testImplementation group: 'com.h2database', name: 'h2', version: '1.4.197'
+  testImplementation "javax.xml.bind:jaxb-api:2.2.11"
+  testImplementation "com.sun.xml.bind:jaxb-core:2.2.11"
+  testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11"
+  testImplementation "javax.activation:activation:1.1.1"
+
+  latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '3.+'
 }
 
 configurations {
   // Needed for test, but for latestDepTest this would otherwise bundle a second incompatible version of hibernate-core.
-  latestDepTestCompile.exclude group: 'org.hibernate', module: 'hibernate-annotations'
+  latestDepTestImplementation.exclude group: 'org.hibernate', module: 'hibernate-annotations'
 }

+ 13 - 13
instrumentation/hibernate/hibernate-4.0/hibernate-4.0.gradle

@@ -19,22 +19,22 @@ testSets {
 dependencies {
   compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final'
 
-  compile project(':instrumentation:hibernate:hibernate-common')
+  implementation project(':instrumentation:hibernate:hibernate-common')
 
-  testCompile project(':instrumentation:jdbc')
+  testImplementation project(':instrumentation:jdbc')
   // Added to ensure cross compatibility:
-  testCompile project(':instrumentation:hibernate:hibernate-3.3')
-  testCompile project(':instrumentation:hibernate:hibernate-4.3')
+  testImplementation project(':instrumentation:hibernate:hibernate-3.3')
+  testImplementation project(':instrumentation:hibernate:hibernate-4.3')
 
-  testCompile group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final'
-  testCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
-  testCompile "javax.xml.bind:jaxb-api:2.2.11"
-  testCompile "com.sun.xml.bind:jaxb-core:2.2.11"
-  testCompile "com.sun.xml.bind:jaxb-impl:2.2.11"
-  testCompile "javax.activation:activation:1.1.1"
+  testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final'
+  testImplementation group: 'com.h2database', name: 'h2', version: '1.4.197'
+  testImplementation "javax.xml.bind:jaxb-api:2.2.11"
+  testImplementation "com.sun.xml.bind:jaxb-core:2.2.11"
+  testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11"
+  testImplementation "javax.activation:activation:1.1.1"
 
-  latestDepTestCompile group: 'org.hibernate', name: 'hibernate-core', version: '4.2.+'
-  latestDepTestCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
+  latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '4.2.+'
+  latestDepTestImplementation group: 'com.h2database', name: 'h2', version: '1.4.197'
   // Test that the incremental instrumentation for hibernate 4.3 doesn't cause issues.
-  latestDepTestCompile project(':instrumentation:hibernate:hibernate-4.3')
+  latestDepTestImplementation project(':instrumentation:hibernate:hibernate-4.3')
 }

+ 12 - 12
instrumentation/hibernate/hibernate-4.3/hibernate-4.3.gradle

@@ -19,20 +19,20 @@ testSets {
 dependencies {
   compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
 
-  compile project(':instrumentation:hibernate:hibernate-common')
+  implementation project(':instrumentation:hibernate:hibernate-common')
 
-  testCompile project(':instrumentation:jdbc')
+  testImplementation project(':instrumentation:jdbc')
   // Added to ensure cross compatibility:
-  testCompile project(':instrumentation:hibernate:hibernate-3.3')
-  testCompile project(':instrumentation:hibernate:hibernate-4.0')
+  testImplementation project(':instrumentation:hibernate:hibernate-3.3')
+  testImplementation project(':instrumentation:hibernate:hibernate-4.0')
 
-  testCompile group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
-  testCompile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
-  testCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
-  testCompile group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.5.1.RELEASE'
+  testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
+  testImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
+  testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
+  testImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.5.1.RELEASE'
 
-  latestDepTestCompile group: 'org.hibernate', name: 'hibernate-core', version: '(,6.0.0.Final)'
-  latestDepTestCompile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '(,6.0.0.Final)'
-  latestDepTestCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
-  latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
+  latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '(,6.0.0.Final)'
+  latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '(,6.0.0.Final)'
+  latestDepTestImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
+  latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
 }

+ 1 - 1
instrumentation/http-url-connection/http-url-connection.gradle

@@ -7,5 +7,5 @@ muzzle {
 }
 
 dependencies {
-  testCompile group: 'org.springframework', name: 'spring-web', version: '4.3.7.RELEASE'
+  testImplementation group: 'org.springframework', name: 'spring-web', version: '4.3.7.RELEASE'
 }

+ 6 - 6
instrumentation/hystrix-1.4/hystrix-1.4.gradle

@@ -16,16 +16,16 @@ testSets {
 }
 
 dependencies {
-  compile project(':instrumentation:rxjava-1.0')
+  implementation project(':instrumentation:rxjava-1.0')
 
   compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
   compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
 
-  testCompile project(':instrumentation:annotations')
+  testImplementation project(':instrumentation:annotations')
 
-  testCompile group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
-  testCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
+  testImplementation group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
+  testImplementation group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
 
-  latestDepTestCompile group: 'io.reactivex', name: 'rxjava', version: '+'
-  latestDepTestCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
+  latestDepTestImplementation group: 'io.reactivex', name: 'rxjava', version: '+'
+  latestDepTestImplementation group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
 }

+ 6 - 6
instrumentation/instrumentation.gradle

@@ -25,23 +25,23 @@ subprojects {
       instr_project.tasks.test.dependsOn(subProj.tasks.test)
 
       instr_project.dependencies {
-        compile(project(subProj.getPath()))
+        implementation(project(subProj.getPath()))
       }
     }
   }
 }
 
 dependencies {
-  compile(project(':auto-tooling')) {
+  implementation(project(':auto-tooling')) {
     exclude module: ':auto-bootstrap'
   }
 }
 
 configurations {
   // exclude bootstrap dependencies from shadowJar
-  runtime.exclude module: deps.slf4j
-  runtime.exclude group: 'org.slf4j'
-  runtime.exclude group: 'io.opentelemetry', module: 'opentelemetry-api'
+  implementation.exclude module: deps.slf4j
+  implementation.exclude group: 'org.slf4j'
+  implementation.exclude group: 'io.opentelemetry', module: 'opentelemetry-api'
 }
 
 // need to perform shading in two steps in order to avoid shading java.util.logging.Logger
@@ -54,7 +54,7 @@ task shadowJarStep1(type: com.github.jengelman.gradle.plugins.shadow.tasks.Shado
   archiveClassifier = 'step1'
   destinationDirectory = file("${project.buildDir}/step1")
 
-  configurations = [project.configurations.runtime]
+  configurations = [project.configurations.runtimeClasspath]
 
   dependencies {
     exclude(project(':instrumentation:java-util-logging'))

+ 2 - 2
instrumentation/java-classloader/jboss-testing/jboss-testing.gradle

@@ -2,7 +2,7 @@ ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
-  testCompile project(':instrumentation:java-classloader')
+  testImplementation project(':instrumentation:java-classloader')
 
-  testCompile group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final'
+  testImplementation group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final'
 }

+ 4 - 4
instrumentation/java-classloader/osgi-testing/osgi-testing.gradle

@@ -2,12 +2,12 @@ ext.skipPublish = true
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
 dependencies {
-  testCompile project(':instrumentation:java-classloader')
+  testImplementation project(':instrumentation:java-classloader')
 
   // TODO: we should separate core and Eclipse tests at some point,
   // but right now core-specific tests are quite dump and are run with
   // core version provided by Eclipse implementation.
-  //testCompile group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0'
-  testCompile group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200'
-  testCompile group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2'
+  //testImplementation group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0'
+  testImplementation group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200'
+  testImplementation group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2'
 }

+ 3 - 3
instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle

@@ -19,11 +19,11 @@ testSets {
 }
 
 dependencies {
-  testCompile project(':instrumentation:java-classloader')
+  testImplementation project(':instrumentation:java-classloader')
 
   //This seems to be the earliest version that has org.apache.catalina.loader.WebappClassLoaderBase
   //Older versions would require slightly different instrumentation.
-  testCompile group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14'
+  testImplementation group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14'
 
-  latestDepTestCompile group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '+'
+  latestDepTestImplementation group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '+'
 }

+ 4 - 4
instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle

@@ -10,9 +10,9 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"
 dependencies {
   compileOnly deps.scala
 
-  testCompile deps.scala
-  testCompile group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0'
+  testImplementation deps.scala
+  testImplementation group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0'
 
-  testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:annotations')
+  testImplementation project(':instrumentation:java-concurrent')
+  testImplementation project(':instrumentation:annotations')
 }

+ 5 - 5
instrumentation/java-concurrent/akka-testing/akka-testing.gradle

@@ -5,10 +5,10 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"
 dependencies {
   compileOnly deps.scala
 
-  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'
+  testImplementation deps.scala
+  testImplementation group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.3.16'
+  testImplementation group: 'com.typesafe.akka', name: 'akka-testkit_2.11', version: '2.3.16'
 
-  testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:annotations')
+  testImplementation project(':instrumentation:java-concurrent')
+  testImplementation project(':instrumentation:annotations')
 }

+ 1 - 1
instrumentation/java-concurrent/java-concurrent.gradle

@@ -23,7 +23,7 @@ dependencies {
   // This is needed for Akka ForJoinTask/Pool instrumentation
   compileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0'
 
-  testCompile project(':instrumentation:annotations')
+  testImplementation project(':instrumentation:annotations')
 
   slickTestCompile project(':instrumentation:java-concurrent')
   slickTestCompile project(':instrumentation:annotations')

+ 4 - 4
instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle

@@ -3,9 +3,9 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-kotlin.gradle"
 
 dependencies {
-  testCompile deps.kotlin
-  testCompile deps.coroutines
+  testImplementation deps.kotlin
+  testImplementation deps.coroutines
 
-  testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:annotations')
+  testImplementation project(':instrumentation:java-concurrent')
+  testImplementation project(':instrumentation:annotations')
 }

+ 3 - 3
instrumentation/java-concurrent/scala-testing/scala-testing.gradle

@@ -5,8 +5,8 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"
 dependencies {
   compileOnly deps.scala
 
-  testCompile deps.scala
+  testImplementation deps.scala
 
-  testCompile project(':instrumentation:java-concurrent')
-  testCompile project(':instrumentation:annotations')
+  testImplementation project(':instrumentation:java-concurrent')
+  testImplementation project(':instrumentation:annotations')
 }

+ 2 - 2
instrumentation/java-util-logging/java-util-logging.gradle

@@ -16,7 +16,7 @@ testSets {
 }
 
 dependencies {
-  testCompile 'org.jboss.logmanager:jboss-logmanager:1.0.0.GA'
+  testImplementation 'org.jboss.logmanager:jboss-logmanager:1.0.0.GA'
 
-  latestDepTestCompile 'org.jboss.logmanager:jboss-logmanager:+'
+  latestDepTestImplementation 'org.jboss.logmanager:jboss-logmanager:+'
 }

+ 2 - 2
instrumentation/jaxrs-client/jaxrs-client-1.1/jaxrs-client-1.1.gradle

@@ -20,7 +20,7 @@ testSets {
 dependencies {
   compileOnly group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
 
-  testCompile group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
+  testImplementation group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
 
-  latestDepTestCompile group: 'com.sun.jersey', name: 'jersey-client', version: '+'
+  latestDepTestImplementation group: 'com.sun.jersey', name: 'jersey-client', version: '+'
 }

+ 1 - 1
instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/jaxrs-client-2.0-jersey-2.0.gradle

@@ -11,5 +11,5 @@ muzzle {
 dependencies {
   compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
 
-  compile project(':instrumentation:jaxrs-client:jaxrs-client-2.0')
+  implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0')
 }

+ 1 - 1
instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/jaxrs-client-2.0-resteasy-2.0.gradle

@@ -11,5 +11,5 @@ muzzle {
 dependencies {
   compileOnly group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.0.Final'
 
-  compile project(':instrumentation:jaxrs-client:jaxrs-client-2.0')
+  implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0')
 }

+ 11 - 11
instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0.gradle

@@ -26,22 +26,22 @@ dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
   compileOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2'
 
-  testCompile project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-jersey-2.0')
-  testCompile project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-resteasy-2.0')
+  testImplementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-jersey-2.0')
+  testImplementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-resteasy-2.0')
 
-  testCompile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
+  testImplementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
 
-  testCompile group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
-  testCompile group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.5.Final'
+  testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
+  testImplementation group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.5.Final'
   // ^ This version has timeouts https://issues.redhat.com/browse/RESTEASY-975
-  testCompile group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.1.0'
+  testImplementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.1.0'
   // Doesn't work with CXF 3.0.x because their context is wrong:
   // https://github.com/apache/cxf/commit/335c7bad2436f08d6d54180212df5a52157c9f21
 
-  testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+  testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
 
-  latestDepTestCompile group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.27'
-  latestDepTestCompile group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.27'
-  latestDepTestCompile group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.2.6'
-  latestDepTestCompile group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.26.Final'
+  latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.27'
+  latestDepTestImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.27'
+  latestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.2.6'
+  latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.26.Final'
 }

+ 2 - 2
instrumentation/jaxrs/jaxrs-1.0/jaxrs-1.0.gradle

@@ -16,6 +16,6 @@ muzzle {
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'
 
-  testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.7.1'
-  testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+  testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.7.1'
+  testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
 }

+ 1 - 1
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/jaxrs-2.0-jersey-2.0.gradle

@@ -14,5 +14,5 @@ dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
   compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-server', version: '2.0'
 
-  compile project(':instrumentation:jaxrs:jaxrs-2.0')
+  implementation project(':instrumentation:jaxrs:jaxrs-2.0')
 }

+ 1 - 1
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/jaxrs-2.0-resteasy-3.0.gradle

@@ -22,5 +22,5 @@ dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
   compileOnly group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final'
 
-  compile project(':instrumentation:jaxrs:jaxrs-2.0')
+  implementation project(':instrumentation:jaxrs:jaxrs-2.0')
 }

+ 1 - 1
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/jaxrs-2.0-resteasy-3.1.gradle

@@ -16,5 +16,5 @@ dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
   compileOnly group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.1.0.Final'
 
-  compile project(':instrumentation:jaxrs:jaxrs-2.0')
+  implementation project(':instrumentation:jaxrs:jaxrs-2.0')
 }

+ 10 - 10
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle

@@ -27,27 +27,27 @@ testSets {
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
 
-  testCompile project(':instrumentation:servlet:servlet-3.0')
-  testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-jersey-2.0')
-  testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0')
-  testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1')
+  testImplementation project(':instrumentation:servlet:servlet-3.0')
+  testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-jersey-2.0')
+  testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0')
+  testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1')
 
   // Jersey
   // First version with DropwizardTestSupport:
-  testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
-  testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
-  testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
+  testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
+  testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+  testImplementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
 
-  latestDepTestCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
+  latestDepTestImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
 
   // Resteasy
-  testCompile group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final'
+  testImplementation group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final'
 
   resteasy31TestCompile(group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.1.0.Final') {
     force = true
   }
 
-  latestDepTestCompile group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '+'
+  latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '+'
 }
 
 test.dependsOn resteasy31Test

+ 16 - 16
instrumentation/jdbc/jdbc.gradle

@@ -33,24 +33,24 @@ testSets {
 
 dependencies {
   // jdbc unit testing
-  testCompile group: 'com.h2database', name: 'h2', version: '1.3.169'
+  testImplementation group: 'com.h2database', name: 'h2', version: '1.3.169'
   // first version jdk 1.6 compatible
-  testCompile group: 'org.apache.derby', name: 'derby', version: '10.6.1.0'
-  testCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
+  testImplementation group: 'org.apache.derby', name: 'derby', version: '10.6.1.0'
+  testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
 
-  testCompile group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '7.0.19'
+  testImplementation group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '7.0.19'
   // tomcat needs this to run
-  testCompile group: 'org.apache.tomcat', name: 'tomcat-juli', version: '7.0.19'
-  testCompile group: 'com.zaxxer', name: 'HikariCP', version: '2.4.0'
-  testCompile group: 'com.mchange', name: 'c3p0', version: '0.9.5'
-
-  latestDepTestCompile group: 'com.h2database', name: 'h2', version: '+'
-  latestDepTestCompile group: 'org.apache.derby', name: 'derby', version: '10.14.+'
-  latestDepTestCompile group: 'org.hsqldb', name: 'hsqldb', version: '+'
-
-  latestDepTestCompile group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '+'
-  latestDepTestCompile group: 'org.apache.tomcat', name: 'tomcat-juli', version: '+'
-  latestDepTestCompile group: 'com.zaxxer', name: 'HikariCP', version: '+'
-  latestDepTestCompile group: 'com.mchange', name: 'c3p0', version: '+'
+  testImplementation group: 'org.apache.tomcat', name: 'tomcat-juli', version: '7.0.19'
+  testImplementation group: 'com.zaxxer', name: 'HikariCP', version: '2.4.0'
+  testImplementation group: 'com.mchange', name: 'c3p0', version: '0.9.5'
+
+  latestDepTestImplementation group: 'com.h2database', name: 'h2', version: '+'
+  latestDepTestImplementation group: 'org.apache.derby', name: 'derby', version: '10.14.+'
+  latestDepTestImplementation group: 'org.hsqldb', name: 'hsqldb', version: '+'
+
+  latestDepTestImplementation group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '+'
+  latestDepTestImplementation group: 'org.apache.tomcat', name: 'tomcat-juli', version: '+'
+  latestDepTestImplementation group: 'com.zaxxer', name: 'HikariCP', version: '+'
+  latestDepTestImplementation group: 'com.mchange', name: 'c3p0', version: '+'
 }
 

+ 3 - 3
instrumentation/jedis/jedis-1.4/jedis-1.4.gradle

@@ -19,9 +19,9 @@ testSets {
 dependencies {
   compileOnly group: 'redis.clients', name: 'jedis', version: '1.4.0'
 
-  testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
-  testCompile group: 'redis.clients', name: 'jedis', version: '1.4.0'
+  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
+  testImplementation group: 'redis.clients', name: 'jedis', version: '1.4.0'
 
   // Jedis 3.0 has API changes that prevent instrumentation from applying
-  latestDepTestCompile group: 'redis.clients', name: 'jedis', version: '2.+'
+  latestDepTestImplementation group: 'redis.clients', name: 'jedis', version: '2.+'
 }

+ 4 - 4
instrumentation/jedis/jedis-3.0/jedis-3.0.gradle

@@ -24,11 +24,11 @@ testSets {
 dependencies {
   compileOnly group: 'redis.clients', name: 'jedis', version: '3.0.0'
 
-  testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
-  testCompile group: 'redis.clients', name: 'jedis', version: '3.0.0'
+  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
+  testImplementation group: 'redis.clients', name: 'jedis', version: '3.0.0'
   // ensures jedis-1.4 instrumentation does not load with jedis 3.0+ by failing
   // the tests in the event it does. The tests will end up with double spans
-  testCompile project(':instrumentation:jedis:jedis-1.4')
+  testImplementation project(':instrumentation:jedis:jedis-1.4')
 
-  latestDepTestCompile group: 'redis.clients', name: 'jedis', version: '3.+'
+  latestDepTestImplementation group: 'redis.clients', name: 'jedis', version: '3.+'
 }

+ 8 - 8
instrumentation/jetty-8.0/jetty-8.0.gradle

@@ -18,20 +18,20 @@ testSets {
 
 dependencies {
   compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
-  compile project(':instrumentation:servlet:servlet-3.0')
+  implementation project(':instrumentation:servlet:servlet-3.0')
 
   // Don't want to conflict with jetty from the test server.
-  testCompile(project(':testing')) {
+  testImplementation(project(':testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
-  testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
-  testCompile group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '8.0.0.v20110901'
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '8.0.0.v20110901'
 
   // Jetty 10 seems to refuse to run on java8.
   // TODO: we need to setup separate test for Jetty 10 when that is released.
-  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
-  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
-  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+'
+  latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
+  latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
+  latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+'
 }

+ 7 - 7
instrumentation/jms-1.1/jms-1.1.gradle

@@ -22,14 +22,14 @@ testSets {
 dependencies {
   compileOnly group: 'javax.jms', name: 'jms-api', version: '1.1-rev-1'
 
-  testCompile group: 'org.apache.activemq.tooling', name: 'activemq-junit', version: '5.14.5'
-  testCompile group: 'org.apache.activemq', name: 'activemq-pool', version: '5.14.5'
-  testCompile group: 'org.apache.activemq', name: 'activemq-broker', version: '5.14.5'
+  testImplementation group: 'org.apache.activemq.tooling', name: 'activemq-junit', version: '5.14.5'
+  testImplementation group: 'org.apache.activemq', name: 'activemq-pool', version: '5.14.5'
+  testImplementation group: 'org.apache.activemq', name: 'activemq-broker', version: '5.14.5'
 
   // required for Java 11+ .  Latest version that runs on Java 7
-  testCompile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2'
-  testCompile group: 'org.springframework', name: 'spring-jms', version: '4.3.21.RELEASE' // 4.x required for Java 7
+  testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2'
+  testImplementation group: 'org.springframework', name: 'spring-jms', version: '4.3.21.RELEASE' // 4.x required for Java 7
 
-  latestDepTestCompile group: 'org.hornetq', name: 'hornetq-jms-client', version: '2.4.7.Final'
-  latestDepTestCompile group: 'org.hornetq', name: 'hornetq-jms-server', version: '2.4.7.Final'
+  latestDepTestImplementation group: 'org.hornetq', name: 'hornetq-jms-client', version: '2.4.7.Final'
+  latestDepTestImplementation group: 'org.hornetq', name: 'hornetq-jms-server', version: '2.4.7.Final'
 }

+ 9 - 9
instrumentation/jsp-2.3/jsp-2.3.gradle

@@ -22,16 +22,16 @@ 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'
 
-  testCompile project(':instrumentation:servlet:servlet-3.0')
+  testImplementation project(':instrumentation:servlet:servlet-3.0')
   // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37
   // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in
-  testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'
-  testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.37'
-  testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.37'
+  testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'
+  testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.37'
+  testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.37'
 
-  latestDepTestCompile group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '+'
-  latestDepTestCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '+'
-  latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.+'
-  latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.+'
-  latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '9.+'
+  latestDepTestImplementation group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '+'
+  latestDepTestImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '+'
+  latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.+'
+  latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.+'
+  latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '9.+'
 }

+ 11 - 11
instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle

@@ -19,20 +19,20 @@ testSets {
 dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
 
-  testCompile group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
-  testCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
-  testCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
-  testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
-  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
-  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
+  testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
+  testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
+  testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
+  testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+  testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
+  testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.
-  latestDepTestCompile group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
+  latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
   // (Pinning to 2.3.x: 2.4.0 introduces an error when executing compileLatestDepTestGroovy)
   //  Caused by: java.lang.NoClassDefFoundError: org.I0Itec.zkclient.ZkClient
-  latestDepTestCompile group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
-  latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
-  latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
-  latestDepTestCompile group: 'org.assertj', name: 'assertj-core', version: '3.+'
+  latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
+  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
+  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
+  latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.+'
 }

+ 14 - 14
instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle

@@ -19,25 +19,25 @@ dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
 
   // Include kafka-clients instrumentation for tests.
-  testCompile project(':instrumentation:kafka-clients-0.11')
+  testImplementation project(':instrumentation:kafka-clients-0.11')
 
-  testCompile group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
-  testCompile group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
-  testCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
-  testCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
-  testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
-  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
-  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
+  testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
+  testImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
+  testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
+  testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
+  testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+  testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
+  testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
 
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.
-  latestDepTestCompile group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
+  latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
   // (Pinning to 2.3.x: 2.4.0 introduces an error when executing compileLatestDepTestGroovy)
   //  Caused by: java.lang.NoClassDefFoundError: org.I0Itec.zkclient.ZkClient
-  latestDepTestCompile group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
-  latestDepTestCompile group: 'org.apache.kafka', name: 'kafka-streams', version: '2.3.+'
-  latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
-  latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
-  latestDepTestCompile group: 'org.assertj', name: 'assertj-core', version: '3.+'
+  latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
+  latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '2.3.+'
+  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
+  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
+  latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.+'
 }

+ 2 - 2
instrumentation/khttp-0.1/khttp-0.1.gradle

@@ -22,7 +22,7 @@ testSets {
 dependencies {
   compileOnly group: 'khttp', name: 'khttp', version: '0.1.0'
 
-  testCompile group: 'khttp', name: 'khttp', version: '0.1.0'
+  testImplementation group: 'khttp', name: 'khttp', version: '0.1.0'
 
-  latestDepTestCompile group: 'khttp', name: 'khttp', version: '+'
+  latestDepTestImplementation group: 'khttp', name: 'khttp', version: '+'
 }

+ 3 - 3
instrumentation/lettuce/lettuce-4.0/lettuce-4.0.gradle

@@ -24,8 +24,8 @@ testSets {
 dependencies {
   compileOnly group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
 
-  testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
-  testCompile group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
+  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
+  testImplementation group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
 
-  latestDepTestCompile group: 'biz.paluch.redis', name: 'lettuce', version: '4.+'
+  latestDepTestImplementation group: 'biz.paluch.redis', name: 'lettuce', version: '4.+'
 }

+ 3 - 3
instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle

@@ -18,7 +18,7 @@ muzzle {
 dependencies {
   compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE'
 
-  testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
-  testCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE'
-  testCompile project(':instrumentation:reactor-3.1')
+  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
+  testImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE'
+  testImplementation project(':instrumentation:reactor-3.1')
 }

+ 4 - 4
instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle

@@ -24,10 +24,10 @@ testSets {
 dependencies {
   compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE'
 
-  testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
+  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
   // Only 5.2+ will have command arguments in the db.statement tag.
-  testCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.2.0.RELEASE'
-  testCompile project(':instrumentation:reactor-3.1')
+  testImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.2.0.RELEASE'
+  testImplementation project(':instrumentation:reactor-3.1')
 
-  latestDepTestCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.+'
+  latestDepTestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.+'
 }

+ 4 - 4
instrumentation/log4j/log4j-1.1/log4j-1.1.gradle

@@ -19,16 +19,16 @@ configurations {
   // In order to test the real log4j library we need to remove the log4j transitive
   // dependency 'log4j-over-slf4j' brought in by :testing which would shadow
   // the log4j module under test using a proxy to slf4j instead.
-  testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
+  testImplementation.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 
   // See: https://stackoverflow.com/a/9047963/2749853
-  testCompile.exclude group: 'javax.jms', module: 'jms'
+  testImplementation.exclude group: 'javax.jms', module: 'jms'
 }
 
 dependencies {
   compileOnly group: 'log4j', name: 'log4j', version: '1.2.16'
 
-  testCompile group: 'log4j', name: 'log4j', version: '1.2.16'
+  testImplementation group: 'log4j', name: 'log4j', version: '1.2.16'
 
-  latestDepTestCompile group: 'log4j', name: 'log4j', version: '+'
+  latestDepTestImplementation group: 'log4j', name: 'log4j', version: '+'
 }

+ 5 - 5
instrumentation/log4j/log4j-2.0/log4j-2.0.gradle

@@ -25,16 +25,16 @@ configurations {
   // In order to test the real log4j library we need to remove the log4j transitive
   // dependency 'log4j-over-slf4j' brought in by :testing which would shadow
   // the log4j module under test using a proxy to slf4j instead.
-  testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
+  testImplementation.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
 }
 
 dependencies {
   compileOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.0'
   compileOnly group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.0'
 
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.0'
-  testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.0'
+  testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.0'
 
-  latestDepTestCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '+'
-  latestDepTestCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '+'
+  latestDepTestImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '+'
+  latestDepTestImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '+'
 }

+ 1 - 1
instrumentation/logback-1.0/logback-1.0.gradle

@@ -3,5 +3,5 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 dependencies {
   compileOnly group: 'ch.qos.logback', name: 'logback-classic', version: '0.9.16'
 
-  testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '0.9.16'
+  testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '0.9.16'
 }

+ 5 - 5
instrumentation/mongo/mongo-3.1/mongo-3.1.gradle

@@ -21,13 +21,13 @@ testSets {
 compileTestJava.dependsOn tasks.getByPath(':instrumentation:mongo:mongo-common:testClasses')
 
 dependencies {
-  compile(project(':instrumentation:mongo:mongo-common'))
+  implementation(project(':instrumentation:mongo:mongo-common'))
 
   compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
 
-  testCompile project(':instrumentation:mongo:mongo-common').sourceSets.test.output
-  testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
+  testImplementation project(':instrumentation:mongo:mongo-common').sourceSets.test.output
+  testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
 
-  testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
-  latestDepTestCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
+  testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
+  latestDepTestImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
 }

+ 5 - 5
instrumentation/mongo/mongo-3.7/mongo-3.7.gradle

@@ -21,14 +21,14 @@ testSets {
 compileTestJava.dependsOn tasks.getByPath(':instrumentation:mongo:mongo-common:testClasses')
 
 dependencies {
-  compile(project(':instrumentation:mongo:mongo-common'))
+  implementation(project(':instrumentation:mongo:mongo-common'))
 
   // a couple of test attribute verifications don't pass until 3.8.0
   compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0'
 
-  testCompile project(':instrumentation:mongo:mongo-common').sourceSets.test.output
-  testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
+  testImplementation project(':instrumentation:mongo:mongo-common').sourceSets.test.output
+  testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
 
-  testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0'
-  latestDepTestCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
+  testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0'
+  latestDepTestImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
 }

+ 6 - 6
instrumentation/mongo/mongo-async-3.3/mongo-async-3.3.gradle

@@ -28,15 +28,15 @@ testSets {
 compileTestJava.dependsOn tasks.getByPath(':instrumentation:mongo:mongo-common:testClasses')
 
 dependencies {
-  compile(project(':instrumentation:mongo:mongo-common'))
+  implementation(project(':instrumentation:mongo:mongo-common'))
 
   compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0'
 
-  testCompile project(':instrumentation:mongo:mongo-common').sourceSets.test.output
-  testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
+  testImplementation project(':instrumentation:mongo:mongo-common').sourceSets.test.output
+  testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
 
-  testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0'
-  latestDepTestCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '+'
+  testImplementation group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0'
+  latestDepTestImplementation group: 'org.mongodb', name: 'mongodb-driver-async', version: '+'
 
-  testCompile project(':instrumentation:mongo:mongo-3.7')
+  testImplementation project(':instrumentation:mongo:mongo-3.7')
 }

+ 1 - 1
instrumentation/mongo/mongo-common/mongo-common.gradle

@@ -3,5 +3,5 @@ apply from: "$rootDir/gradle/instrumentation.gradle"
 dependencies {
   compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
 
-  testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
+  testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
 }

+ 5 - 5
instrumentation/netty/netty-3.8/netty-3.8.gradle

@@ -27,15 +27,15 @@ testSets {
 dependencies {
   compileOnly group: 'io.netty', name: 'netty', version: '3.8.0.Final'
 
-  testCompile group: 'io.netty', name: 'netty', version: '3.8.0.Final'
-  testCompile group: 'com.ning', name: 'async-http-client', version: '1.8.0'
+  testImplementation group: 'io.netty', name: 'netty', version: '3.8.0.Final'
+  testImplementation group: 'com.ning', name: 'async-http-client', version: '1.8.0'
 
-  latestDepTestCompile group: 'io.netty', name: 'netty', version: '3.10.+'
-  latestDepTestCompile group: 'com.ning', name: 'async-http-client', version: '1.9.+'
+  latestDepTestImplementation group: 'io.netty', name: 'netty', version: '3.10.+'
+  latestDepTestImplementation group: 'com.ning', name: 'async-http-client', version: '1.9.+'
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
-configurations.testCompile {
+configurations.testImplementation {
   resolutionStrategy {
     eachDependency { DependencyResolveDetails details ->
       //specifying a fixed version for all libraries with io.netty' group

+ 5 - 5
instrumentation/netty/netty-4.0/netty-4.0.gradle

@@ -43,15 +43,15 @@ testSets {
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
 
-  testCompile group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
-  testCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.0'
+  testImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
+  testImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.0'
 
-  latestDepTestCompile group: 'io.netty', name: 'netty-codec-http', version: '4.0.56.Final'
-  latestDepTestCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.+'
+  latestDepTestImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.0.56.Final'
+  latestDepTestImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.+'
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
-configurations.testCompile {
+configurations.testImplementation {
   resolutionStrategy {
     eachDependency { DependencyResolveDetails details ->
       //specifying a fixed version for all libraries with io.netty' group

+ 6 - 6
instrumentation/netty/netty-4.1/netty-4.1.gradle

@@ -41,17 +41,17 @@ testSets {
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
 
-  testCompile project(':instrumentation:annotations')
-  testCompile group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
-  testCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
+  testImplementation project(':instrumentation:annotations')
+  testImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
+  testImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
 
-  latestDepTestCompile group: 'io.netty', name: 'netty-codec-http', version: '(,5.0)'
+  latestDepTestImplementation group: 'io.netty', name: 'netty-codec-http', version: '(,5.0)'
   // latest async-http-client incompatable with 5.0+ netty
-  latestDepTestCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '+'
+  latestDepTestImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '+'
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
-configurations.testCompile {
+configurations.testImplementation {
   resolutionStrategy {
     eachDependency { DependencyResolveDetails details ->
       //specifying a fixed version for all libraries with io.netty' group

+ 5 - 5
instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle

@@ -23,13 +23,13 @@ testSets {
 dependencies {
   compileOnly(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0')
 
-  compile project(':auto-tooling')
+  implementation project(':auto-tooling')
 
-  testCompile project(':testing')
-  testCompile project(':instrumentation:java-concurrent')
-  testCompile group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
+  testImplementation project(':testing')
+  testImplementation project(':instrumentation:java-concurrent')
+  testImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
 
-  latestDepTestCompile group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)'
+  latestDepTestImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)'
 }
 
 

+ 3 - 3
instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle

@@ -28,13 +28,13 @@ not transitive.
 dependencies {
   compileOnly(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
 
-  compile project(':auto-tooling')
+  implementation project(':auto-tooling')
 
   testImplementation(project(':testing')) {
     exclude module: 'okhttp'
   }
-  testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
+  testImplementation 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
-  latestDepTestCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)'
+  latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)'
 }

+ 1 - 1
instrumentation/opentelemetry-api-beta/opentelemetry-api-beta.gradle

@@ -21,5 +21,5 @@ dependencies {
   // bootstrap class loader (as those references will later be shaded)
   compileOnly project(path: ':opentelemetry-api-beta-shaded-for-instrumenting', configuration: 'shadow')
 
-  testCompile project(path: ':opentelemetry-api-beta-shaded-for-instrumenting', configuration: 'shadow')
+  testImplementation project(path: ':opentelemetry-api-beta-shaded-for-instrumenting', configuration: 'shadow')
 }

+ 7 - 7
instrumentation/play-ws/play-ws-1.0/play-ws-1.0.gradle

@@ -37,15 +37,15 @@ def scalaVersion = '2.12'
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
 
-  compile project(':instrumentation:play-ws:play-ws-common')
-  testCompile project(path: ':instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
+  implementation project(':instrumentation:play-ws:play-ws-common')
+  testImplementation project(path: ':instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
 
   // These are to ensure cross compatibility
-  testCompile project(':instrumentation:netty:netty-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile project(':instrumentation:akka-http-10.0')
+  testImplementation project(':instrumentation:netty:netty-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:akka-http-10.0')
 
-  testCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
+  testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
 
-  latestDepTestCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.+'
+  latestDepTestImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.+'
 }

+ 7 - 7
instrumentation/play-ws/play-ws-2.0/play-ws-2.0.gradle

@@ -42,15 +42,15 @@ def scalaVersion = '2.12'
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
 
-  compile project(':instrumentation:play-ws:play-ws-common')
-  testCompile project(path: ':instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
+  implementation project(':instrumentation:play-ws:play-ws-common')
+  testImplementation project(path: ':instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
 
   // These are to ensure cross compatibility
-  testCompile project(':instrumentation:netty:netty-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile project(':instrumentation:akka-http-10.0')
+  testImplementation project(':instrumentation:netty:netty-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:akka-http-10.0')
 
-  testCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
+  testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
 
-  latestDepTestCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.+'
+  latestDepTestImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.+'
 }

+ 7 - 7
instrumentation/play-ws/play-ws-2.1/play-ws-2.1.gradle

@@ -42,15 +42,15 @@ def scalaVersion = '2.12'
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
 
-  compile project(':instrumentation:play-ws:play-ws-common')
-  testCompile project(path: ':instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
+  implementation project(':instrumentation:play-ws:play-ws-common')
+  testImplementation project(path: ':instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts')
 
   // These are to ensure cross compatibility
-  testCompile project(':instrumentation:netty:netty-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile project(':instrumentation:akka-http-10.0')
+  testImplementation project(':instrumentation:netty:netty-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:akka-http-10.0')
 
-  testCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
+  testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
 
-  latestDepTestCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '+'
+  latestDepTestImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '+'
 }

+ 1 - 1
instrumentation/play-ws/play-ws-common/play-ws-common.gradle

@@ -21,5 +21,5 @@ artifacts {
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
 
-  testCompile group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
+  testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
 }

+ 7 - 7
instrumentation/play/play-2.3/play-2.3.gradle

@@ -36,17 +36,17 @@ testSets {
 dependencies {
   compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.3.0'
 
-  testCompile project(':instrumentation:netty:netty-3.8')
+  testImplementation project(':instrumentation:netty:netty-3.8')
 
-  testCompile group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.0'
-  testCompile group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.0'
-  testCompile(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.0') {
+  testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.0'
+  testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.0'
+  testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.0') {
     exclude group: 'org.eclipse.jetty', module: 'jetty-websocket'
   }
 
-  latestDepTestCompile group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.+'
-  latestDepTestCompile group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.+'
-  latestDepTestCompile(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.+') {
+  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.+'
+  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.+'
+  latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.+') {
     exclude group: 'org.eclipse.jetty', module: 'jetty-websocket'
   }
 }

+ 9 - 9
instrumentation/play/play-2.4/play-2.4.gradle

@@ -35,20 +35,20 @@ testSets {
 dependencies {
   compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
 
-  testCompile project(':instrumentation:netty:netty-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile project(':instrumentation:akka-http-10.0')
+  testImplementation project(':instrumentation:netty:netty-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:akka-http-10.0')
 
   // Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5
-  testCompile group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
-  testCompile group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0'
-  testCompile(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') {
+  testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
+  testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0'
+  testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
 
-  latestDepTestCompile group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+'
-  latestDepTestCompile group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+'
-  latestDepTestCompile(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') {
+  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+'
+  latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+'
+  latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
 }

+ 7 - 7
instrumentation/play/play-2.6/play-2.6.gradle

@@ -40,19 +40,19 @@ testSets {
 dependencies {
   compileOnly group: 'com.typesafe.play', name: "play_$scalaVersion", version: playVersion
 
-  testCompile project(':instrumentation:netty:netty-4.0')
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile project(':instrumentation:akka-http-10.0')
+  testImplementation project(':instrumentation:netty:netty-4.0')
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation project(':instrumentation:akka-http-10.0')
 
-  testCompile group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: playVersion
+  testImplementation group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: playVersion
   // TODO: Play WS is a separately versioned library starting with 2.6 and needs separate instrumentation.
-  testCompile(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: playVersion) {
+  testImplementation(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: playVersion) {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
 
   // TODO: This should be changed to the latest in scala 2.13 instead of 2.11 since its ahead
-  latestDepTestCompile group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: '2.+'
-  latestDepTestCompile(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: '2.+') {
+  latestDepTestImplementation group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: '2.+'
+  latestDepTestImplementation(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: '2.+') {
     exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
   }
 }

+ 5 - 5
instrumentation/rabbitmq-2.7/rabbitmq-2.7.gradle

@@ -19,13 +19,13 @@ testSets {
 dependencies {
   compileOnly group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
 
-  testCompile group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
-  testCompile group: 'org.springframework.amqp', name: 'spring-rabbit', version: '1.1.0.RELEASE'
+  testImplementation group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
+  testImplementation group: 'org.springframework.amqp', name: 'spring-rabbit', version: '1.1.0.RELEASE'
 
-  testCompile deps.testcontainers
+  testImplementation deps.testcontainers
 
-  latestDepTestCompile group: 'com.rabbitmq', name: 'amqp-client', version: '+'
-  latestDepTestCompile group: 'org.springframework.amqp', name: 'spring-rabbit', version: '+'
+  latestDepTestImplementation group: 'com.rabbitmq', name: 'amqp-client', version: '+'
+  latestDepTestImplementation group: 'org.springframework.amqp', name: 'spring-rabbit', version: '+'
 }
 
 configurations.testRuntime {

+ 4 - 4
instrumentation/ratpack-1.5/ratpack-1.5.gradle

@@ -25,10 +25,10 @@ testSets {
 dependencies {
   compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.5.0'
 
-  testCompile project(':instrumentation:netty:netty-4.1')
-  testCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0'
-  latestDepTestCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '+'
+  testImplementation project(':instrumentation:netty:netty-4.1')
+  testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0'
+  latestDepTestImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '+'
   if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
-    testCompile group: 'com.sun.activation', name: 'jakarta.activation', version: '1.2.2'
+    testImplementation group: 'com.sun.activation', name: 'jakarta.activation', version: '1.2.2'
   }
 }

+ 4 - 4
instrumentation/reactor-3.1/reactor-3.1.gradle

@@ -25,11 +25,11 @@ testSets {
 dependencies {
   compileOnly group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
 
-  testCompile project(':instrumentation:annotations')
+  testImplementation project(':instrumentation:annotations')
 
-  testCompile group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
+  testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
 
-  latestDepTestCompile group: 'io.projectreactor', name: 'reactor-core', version: '3.+'
+  latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.+'
   // Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
-  latestDepTestCompile group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
+  latestDepTestImplementation group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
 }

+ 3 - 3
instrumentation/rediscala-1.8/rediscala-1.8.gradle

@@ -58,8 +58,8 @@ testSets {
 dependencies {
   compileOnly group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
 
-  testCompile group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
-  testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
+  testImplementation group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
+  testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
 
-  latestDepTestCompile group: 'com.github.etaty', name: 'rediscala_2.11', version: '+'
+  latestDepTestImplementation group: 'com.github.etaty', name: 'rediscala_2.11', version: '+'
 }

+ 4 - 4
instrumentation/servlet/glassfish-testing/glassfish-testing.gradle

@@ -14,9 +14,9 @@ testSets {
 }
 
 dependencies {
-  testCompile project(':instrumentation:servlet:servlet-3.0')
-  testCompile project(':instrumentation:grizzly-2.0')
+  testImplementation project(':instrumentation:servlet:servlet-3.0')
+  testImplementation project(':instrumentation:grizzly-2.0')
 
-  testCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
-  latestDepTestCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '+'
+  testImplementation group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
+  latestDepTestImplementation group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '+'
 }

+ 5 - 5
instrumentation/servlet/servlet-2.3/servlet-2.3.gradle

@@ -24,14 +24,14 @@ testSets {
 
 dependencies {
   compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.2'
-  compile(project(':instrumentation:servlet:servlet-common'))
+  implementation(project(':instrumentation:servlet:servlet-common'))
 
   testImplementation(project(':testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
-  testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
-  testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
 
-  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.+'
-  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.+'
+  latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.+'
+  latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.+'
 }

Some files were not shown because too many files changed in this diff