test latest deps cleanup (#5269)

trask · iNikem · web-flow · commit 022914139e0d · 2022-02-01T09:49:07.000-08:00
* test latest deps cleanup

* Revert currently irrelevant change

* Update instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts

Co-authored-by: Nikita Salnikov-Tarnovski &lt;gnikem@gmail.com&gt;

Co-authored-by: Nikita Salnikov-Tarnovski &lt;gnikem@gmail.com&gt;
diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts
@@ -34,7 +34,14 @@ extra["testLatestDeps"] = testLatestDeps
 abstract class TestLatestDepsRule : ComponentMetadataRule {
   override fun execute(context: ComponentMetadataContext) {
     val version = context.details.id.version
-    if (version.contains("-alpha") || version.contains("-beta") || version.contains("-rc")) {
+    if (version.contains("-alpha", true)
+      || version.contains("-beta", true)
+      || version.contains("-rc", true)
+      || version.contains("-m", true) // e.g. spring milestones are published to grails repo
+      || version.contains(".alpha", true) // e.g. netty
+      || version.contains(".beta", true) // e.g. hibernate
+      || version.contains(".cr", true) // e.g. hibernate
+    ) {
       context.details.status = "milestone"
     }
   }
diff --git a/docs/supported-libraries.md b/docs/supported-libraries.md
@@ -24,7 +24,7 @@ These are the supported libraries and frameworks:
 | [Akka Actors](https://doc.akka.io/docs/akka/current/typed/index.html)                                                             | 2.5+                           |
 | [Akka HTTP](https://doc.akka.io/docs/akka-http/current/index.html)                                                                | 10.0+                          |
 | [Apache Axis2](https://axis.apache.org/axis2/java/core/)                                                                          | 1.6+                           |
-| [Apache Camel](https://camel.apache.org/)                                                                                         | 2.20+                          |
+| [Apache Camel](https://camel.apache.org/)                                                                                         | 2.20+ (not including 3.x yet)  |
 | [Apache CXF JAX-RS](https://cxf.apache.org/)                                                                                      | 3.2+                           |
 | [Apache CXF JAX-RS Client](https://cxf.apache.org/)                                                                               | 3.0+                           |
 | [Apache CXF JAX-WS](https://cxf.apache.org/)                                                                                      | 3.0+                           |
diff --git a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts b/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts
@@ -49,14 +49,14 @@ dependencies {
   testImplementation("org.testcontainers:localstack")
   testImplementation("org.testcontainers:cassandra")
 
-  latestDepTestLibrary("org.apache.camel:camel-core:2.+")
-  latestDepTestLibrary("org.apache.camel:camel-spring-boot-starter:2.+")
-  latestDepTestLibrary("org.apache.camel:camel-jetty-starter:2.+")
-  latestDepTestLibrary("org.apache.camel:camel-http-starter:2.+")
-  latestDepTestLibrary("org.apache.camel:camel-jaxb-starter:2.+")
-  latestDepTestLibrary("org.apache.camel:camel-undertow:2.+")
-  latestDepTestLibrary("org.apache.camel:camel-aws:2.+")
-  latestDepTestLibrary("org.apache.camel:camel-cassandraql:2.+")
+  latestDepTestLibrary("org.apache.camel:camel-core:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.camel:camel-spring-boot-starter:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.camel:camel-jetty-starter:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.camel:camel-http-starter:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.camel:camel-jaxb-starter:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.camel:camel-undertow:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.camel:camel-aws:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.camel:camel-cassandraql:2.+") // documented limitation
 }
 
 tasks {
diff --git a/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts b/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts
@@ -18,6 +18,6 @@ dependencies {
   testImplementation(project(":instrumentation:apache-dubbo-2.7:testing"))
 
   testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")
-  latestDepTestLibrary("org.apache.dubbo:dubbo:2.+")
-  latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+")
+  latestDepTestLibrary("org.apache.dubbo:dubbo:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+") // documented limitation
 }
diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts b/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts
@@ -11,6 +11,6 @@ dependencies {
   testImplementation(project(":instrumentation:apache-dubbo-2.7:testing"))
 
   testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")
-  latestDepTestLibrary("org.apache.dubbo:dubbo:2.+")
-  latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+")
+  latestDepTestLibrary("org.apache.dubbo:dubbo:2.+") // documented limitation
+  latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+") // documented limitation
 }
diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/build.gradle.kts
@@ -13,5 +13,5 @@ muzzle {
 dependencies {
   library("commons-httpclient:commons-httpclient:2.0")
 
-  latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+")
+  latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+") // see apache-httpclient-4.0 module
 }
diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
 
   testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing"))
 
-  latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+")
+  latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+") // see apache-httpclient-5.0 module
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts
@@ -23,9 +23,9 @@ dependencies {
   testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
   testImplementation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
-  latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114")
-  latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114")
-  latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114")
+  latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114") // issue #5259
+  latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114") // issue #5259
+  latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114") // issue #5259
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts
@@ -12,9 +12,9 @@ dependencies {
 
   testImplementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
 
-  latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114")
-  latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114")
-  latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114")
+  latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114") // issue #5259
+  latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114") // issue #5259
+  latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114") // issue #5259
 }
 
 tasks {
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts
@@ -13,9 +13,9 @@ dependencies {
   testImplementation("org.assertj:assertj-core")
   testImplementation("org.mockito:mockito-core")
 
-  latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114")
-  latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114")
-  latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114")
+  latestDepTestLibrary("software.amazon.awssdk:kinesis:2.17.114") // issue #5259
+  latestDepTestLibrary("software.amazon.awssdk:aws-core:2.17.114") // issue #5259
+  latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:2.17.114") // issue #5259
 }
 
 tasks {
diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
   testLibrary("com.datastax.cassandra:cassandra-driver-core:3.2.0")
   testInstrumentation(project(":instrumentation:guava-10.0:javaagent"))
 
-  latestDepTestLibrary("com.datastax.cassandra:cassandra-driver-core:3.+")
+  latestDepTestLibrary("com.datastax.cassandra:cassandra-driver-core:3.+") // see cassandra-4.0 module
 }
 
 // Requires old Guava. Can't use enforcedPlatform since predates BOM
diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts
@@ -16,8 +16,6 @@ dependencies {
 
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
-
-  latestDepTestLibrary("com.datastax.oss:java-driver-core:4.+")
 }
 
 tasks {
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
   testImplementation("org.testcontainers:elasticsearch")
   testLibrary("org.elasticsearch.client:rest:5.0.0")
 
-  latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.3.+")
+  latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.3.+") // see elasticsearch-rest-6.4 module
 }
 
 tasks {
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
   testImplementation("org.testcontainers:elasticsearch")
   testLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.4.0")
 
-  latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.+")
+  latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.+") // see elasticsearch-rest-7.0 module
 }
 
 tasks {
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts
@@ -37,8 +37,11 @@ dependencies {
   testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
   testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
 
-  testImplementation("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
-  testImplementation("org.elasticsearch.client:transport:5.0.0")
+  testLibrary("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
+  testLibrary("org.elasticsearch.client:transport:5.0.0")
+
+  latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
+  latestDepTestLibrary("org.elasticsearch.client:transport:5.0.0")
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
@@ -48,8 +48,8 @@ dependencies {
 
   testLibrary("org.springframework.data:spring-data-elasticsearch:3.0.0.RELEASE")
 
-  latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.+")
-  latestDepTestLibrary("org.elasticsearch.client:transport:5.+")
+  latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.+") // see elasticsearch-transport-6.0 module
+  latestDepTestLibrary("org.elasticsearch.client:transport:5.+") // see elasticsearch-transport-6.0 module
   latestDepTestLibrary("org.springframework.data:spring-data-elasticsearch:3.0.+")
 }
 
diff --git a/instrumentation/grails-3.0/javaagent/build.gradle.kts b/instrumentation/grails-3.0/javaagent/build.gradle.kts
@@ -43,8 +43,4 @@ dependencies {
 
   testLibrary("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
   testLibrary("org.springframework.boot:spring-boot-starter-tomcat:$springBootVersion")
-
-  // spring boot 3 uses spring 6 which requires java 17
-  latestDepTestLibrary("org.springframework.boot:spring-boot-autoconfigure:2.+")
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-tomcat:2.+")
 }
diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-3.3/javaagent/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
   testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
   testImplementation("javax.activation:activation:1.1.1")
 
-  latestDepTestLibrary("org.hibernate:hibernate-core:3.+")
+  latestDepTestLibrary("org.hibernate:hibernate-core:3.+") // see hibernate-4.0 module
 }
 
 if (findProperty("testLatestDeps") as Boolean) {
diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/build.gradle.kts
@@ -26,10 +26,6 @@ dependencies {
   testImplementation("org.hsqldb:hsqldb:2.0.0")
   testImplementation("javax.xml.bind:jaxb-api:2.3.1")
   testImplementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")
-
-  // hibernate 6 is alpha so use 5 as latest version
-  latestDepTestLibrary("org.hibernate:hibernate-core:5.+")
-  latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+")
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/build.gradle.kts
@@ -14,6 +14,4 @@ dependencies {
   library("org.jboss.resteasy:resteasy-client:3.0.0.Final")
 
   implementation(project(":instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common:javaagent"))
-
-  latestDepTestLibrary("org.jboss.resteasy:resteasy-client:5+")
 }
diff --git a/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts
@@ -22,8 +22,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:jedis:jedis-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jedis:jedis-4.0:javaagent"))
 
-  // Jedis 3.0 has API changes that prevent instrumentation from applying
-  latestDepTestLibrary("redis.clients:jedis:2.+")
+  latestDepTestLibrary("redis.clients:jedis:2.+") // see jedis-3.0 module
 }
 
 tasks {
diff --git a/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts b/instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:jedis:jedis-1.4:javaagent"))
   testInstrumentation(project(":instrumentation:jedis:jedis-4.0:javaagent"))
 
-  latestDepTestLibrary("redis.clients:jedis:3.+")
+  latestDepTestLibrary("redis.clients:jedis:3.+") // see jedis-4.0 module
 }
 
 tasks {
diff --git a/instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts b/instrumentation/jetty/jetty-11.0/javaagent/build.gradle.kts
@@ -11,12 +11,12 @@ muzzle {
 }
 
 dependencies {
+  library("org.eclipse.jetty:jetty-server:11.0.0")
+
   implementation(project(":instrumentation:jetty:jetty-common:javaagent"))
   implementation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
   bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
-  library("org.eclipse.jetty:jetty-server:11.0.0")
-
   testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
 
   testLibrary("org.eclipse.jetty:jetty-servlet:11.0.0")
diff --git a/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts b/instrumentation/jetty/jetty-8.0/javaagent/build.gradle.kts
@@ -13,21 +13,17 @@ muzzle {
 }
 
 dependencies {
+  library("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
+
   implementation(project(":instrumentation:jetty:jetty-common:javaagent"))
   implementation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
-  library("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
-
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
   testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
 
   testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
-  testLibrary("org.eclipse.jetty:jetty-continuation: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.
-  latestDepTestLibrary("org.eclipse.jetty:jetty-server:9.+")
-  latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:9.+")
-  latestDepTestLibrary("org.eclipse.jetty:jetty-continuation:9.+")
+  latestDepTestLibrary("org.eclipse.jetty:jetty-server:10.+") // see jetty-11.0 module
+  latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:10.+") // see jetty-11.0 module
 }
diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/JettyContinuationHandlerTest.groovy b/instrumentation/jetty/jetty-8.0/javaagent/src/test/groovy/JettyContinuationHandlerTest.groovy
diff --git a/instrumentation/ktor-1.0/library/build.gradle.kts b/instrumentation/ktor-1.0/library/build.gradle.kts
@@ -18,10 +18,6 @@ dependencies {
   // Note, we do not have a :testing library yet because there doesn't seem to be a way to have the Kotlin classes
   // available for use from Spock. We will first need to migrate HttpServerTest to be usable outside of Spock.
   testLibrary("io.ktor:ktor-server-netty:1.0.0")
-
-  latestDepTestLibrary("io.ktor:ktor-server-core:1.+")
-
-  latestDepTestLibrary("io.ktor:ktor-server-netty:1.+")
 }
 
 tasks {
diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts
@@ -14,7 +14,7 @@ muzzle {
 dependencies {
   library("biz.paluch.redis:lettuce:4.0.Final")
 
-  latestDepTestLibrary("biz.paluch.redis:lettuce:4.+")
+  latestDepTestLibrary("biz.paluch.redis:lettuce:4.+") // see lettuce-5.0 module
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.0/javaagent/build.gradle.kts
@@ -12,12 +12,14 @@ muzzle {
 }
 
 dependencies {
-  compileOnly("io.lettuce:lettuce-core:5.0.0.RELEASE")
+  library("io.lettuce:lettuce-core:5.0.0.RELEASE")
 
   implementation(project(":instrumentation:lettuce:lettuce-common:library"))
 
   testImplementation("io.lettuce:lettuce-core:5.0.0.RELEASE")
   testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent"))
+
+  latestDepTestLibrary("io.lettuce:lettuce-core:5.0.+") // see lettuce-5.1 module
 }
 
 tasks.withType<Test>().configureEach {
diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.7/javaagent/build.gradle.kts
@@ -18,5 +18,5 @@ dependencies {
 
   testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
 
-  latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.15.+")
+  latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.15.+") // see log4j-context-data-2.16
 }
diff --git a/instrumentation/netty/netty-3.8/javaagent/build.gradle.kts b/instrumentation/netty/netty-3.8/javaagent/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
   testLibrary("io.netty:netty:3.8.0.Final")
   testLibrary("com.ning:async-http-client:1.8.0")
 
-  latestDepTestLibrary("io.netty:netty:3.10.+")
+  latestDepTestLibrary("io.netty:netty:3.+") // see netty-4.0 module
   latestDepTestLibrary("com.ning:async-http-client:1.9.+")
 }
 
diff --git a/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.0/javaagent/build.gradle.kts
diff --git a/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts
diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/build.gradle.kts b/instrumentation/okhttp/okhttp-2.2/javaagent/build.gradle.kts
diff --git a/instrumentation/play/play-2.4/javaagent/build.gradle.kts b/instrumentation/play/play-2.4/javaagent/build.gradle.kts
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts
diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts
diff --git a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts
diff --git a/instrumentation/servlet/servlet-2.2/javaagent/build.gradle.kts b/instrumentation/servlet/servlet-2.2/javaagent/build.gradle.kts
diff --git a/instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts b/instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts
diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts
diff --git a/instrumentation/twilio-6.6/javaagent/build.gradle.kts b/instrumentation/twilio-6.6/javaagent/build.gradle.kts
diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ dependencies {`
`18`	`18`	`testImplementation(project(":instrumentation:apache-dubbo-2.7:testing"))`
`19`	`19`
`20`	`20`	`testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")`
`21`		`- latestDepTestLibrary("org.apache.dubbo:dubbo:2.+")`
`22`		`- latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+")`
	`21`	`+ latestDepTestLibrary("org.apache.dubbo:dubbo:2.+") // documented limitation`
	`22`	`+ latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+") // documented limitation`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ dependencies {`
`11`	`11`	`testImplementation(project(":instrumentation:apache-dubbo-2.7:testing"))`
`12`	`12`
`13`	`13`	`testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")`
`14`		`- latestDepTestLibrary("org.apache.dubbo:dubbo:2.+")`
`15`		`- latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+")`
	`14`	`+ latestDepTestLibrary("org.apache.dubbo:dubbo:2.+") // documented limitation`
	`15`	`+ latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+") // documented limitation`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ muzzle {`
`13`	`13`	`dependencies {`
`14`	`14`	`library("commons-httpclient:commons-httpclient:2.0")`
`15`	`15`
`16`		`- latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+")`
	`16`	`+ latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+") // see apache-httpclient-4.0 module`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ dependencies {`
`11`	`11`
`12`	`12`	`testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing"))`
`13`	`13`
`14`		`- latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+")`
	`14`	`+ latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+") // see apache-httpclient-5.0 module`
`15`	`15`	`}`