Clean up latest dependency override comments (#18968)

trask · Copilot · laurit · web-flow · commit b6968e5901ca · 2026-06-12T16:15:26.000Z
Co-authored-by: Copilot Autofix powered by AI &lt;175728472+Copilot@users.noreply.github.com&gt;
Co-authored-by: Lauri Tulmin &lt;ltulmin@splunk.com&gt;
diff --git a/.github/scripts/check-latest-dep-test-overrides.sh b/.github/scripts/check-latest-dep-test-overrides.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
 # all missing version coverage should be documented in supported-libraries.md
+# (otherwise add one of the required annotations below)
 
 if grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \
     | grep -v -e :+\" -e :latest.release\" \
@@ -15,7 +16,7 @@ if grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \
   echo
   echo "Found an undocumented latestDepTestLibrary (see above)."
   echo
-  echo "See .gith/scripts/check-latest-dep-test-overrides.sh in this repository"
+  echo "See .github/scripts/check-latest-dep-test-overrides.sh in this repository"
   echo "and add one of the required comments."
   exit 1
 fi
diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts
@@ -2,6 +2,7 @@
 
 import io.opentelemetry.instrumentation.gradle.OtelPropsExtension
 import io.opentelemetry.javaagent.muzzle.AcceptableVersions
+import org.eclipse.aether.util.version.GenericVersionScheme
 
 plugins {
   `java-library`
@@ -17,8 +18,9 @@ val otelProps = the<OtelPropsExtension>()
  * - library: A dependency on the instrumented library. Results in the dependency being added to
  *     compileOnly and testImplementation. If the build is run with -PtestLatestDeps=true, the
  *     version when added to testImplementation will be overridden by `+`, the latest version
- *     possible. For simple libraries without different behavior between versions, it is possible
- *     to have a single dependency on library only.
+ *     possible, but never below the declared library version. For simple libraries without
+ *     different behavior between versions, it is possible to have a single dependency on library
+ *     only.
  *
  * - testLibrary: A dependency on a library for testing. This will usually be used to either
  *     a) use a different version of the library for compilation and testing and b) to add a helper
@@ -68,6 +70,30 @@ fun lookupPinnedVersion(group: String?, name: String, version: String?): String?
   )
 }
 
+val versionScheme = GenericVersionScheme()
+
+// Pinned latest-dep versions resolve "latest" to the latest stable release, which can be lower
+// than a module's declared test baseline when the newer supported line only has pre-releases.
+// This currently affects ActiveJ: the instrumentation supports 6.0-rc2 and later, but there
+// are no stable 6.x releases yet, so latest stable is still 5.5.
+fun pinnedVersionAtLeastDeclared(pinnedVersion: String?, declaredVersion: String?): String? {
+  if (pinnedVersion == null || declaredVersion == null || declaredVersion == "latest.release" ||
+    declaredVersion.contains("+") ||
+    declaredVersion.startsWith("[") ||
+    declaredVersion.startsWith("(")) {
+    return pinnedVersion
+  }
+  return try {
+    if (versionScheme.parseVersion(declaredVersion) > versionScheme.parseVersion(pinnedVersion)) {
+      declaredVersion
+    } else {
+      pinnedVersion
+    }
+  } catch (e: RuntimeException) {
+    pinnedVersion
+  }
+}
+
 @CacheableRule
 abstract class TestLatestDepsRule : ComponentMetadataRule {
   override fun execute(context: ComponentMetadataContext) {
@@ -105,8 +131,9 @@ configurations {
       if (otelProps.testLatestDeps) {
         val extDep = this as ExternalDependency
         val pinnedVersion = lookupPinnedVersion(extDep.group, extDep.name, "latest.release")
+        val resolvedVersion = pinnedVersionAtLeastDeclared(pinnedVersion, extDep.version)
         (dep as ExternalDependency).version {
-          require(pinnedVersion ?: "latest.release")
+          require(resolvedVersion ?: "latest.release")
         }
       }
       testImplementation.dependencies.add(dep)
diff --git a/docs/supported-libraries.md b/docs/supported-libraries.md
@@ -154,7 +154,7 @@ These are the supported libraries and frameworks:
 | [Spring Pulsar](https://spring.io/projects/spring-pulsar)                                                                                   | 1.0+                               |                                                                                                                                                                                                                                                                                                                                                                                         | [Messaging Spans]                                                                                                                                 |
 | [Spring RabbitMQ](https://spring.io/projects/spring-amqp)                                                                                   | 1.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [Messaging Spans]                                                                                                                                 |
 | [Spring RestTemplate](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/client/package-summary.html) | 3.1+                               | [opentelemetry-spring-web-3.1](../instrumentation/spring/spring-web/spring-web-3.1/library)                                                                                                                                                                                                                                                                                             | [HTTP Client Spans], [HTTP Client Metrics]                                                                                                        |
-| [Spring RMI](https://docs.spring.io/spring-framework/docs/4.0.x/javadoc-api/org/springframework/remoting/rmi/package-summary.html)          | 4.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [RPC Client Spans], [RPC Server Spans]                                                                                                            |
+| [Spring RMI](https://docs.spring.io/spring-framework/docs/4.0.x/javadoc-api/org/springframework/remoting/rmi/package-summary.html)          | 4.0 - 5.x                          | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [RPC Client Spans], [RPC Server Spans]                                                                                                            |
 | [Spring Scheduling](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/scheduling/package-summary.html)             | 3.1+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | none                                                                                                                                              |
 | [Spring Web MVC](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/servlet/mvc/package-summary.html)           | 3.1+                               | [opentelemetry-spring-webmvc-5.3](../instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library),<br>[opentelemetry-spring-webmvc-6.0](../instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library)                                                                                                                                                                           | [HTTP Server Spans], [HTTP Server Metrics], Provides `http.route` [2], Controller Spans [3]                                                       |
 | [Spring Web Services](https://spring.io/projects/spring-ws)                                                                                 | 2.0+ (not including 4.0+ yet)      | N/A                                                                                                                                                                                                                                                                                                                                                                                     | none                                                                                                                                              |
diff --git a/instrumentation/activej-http-6.0/javaagent/build.gradle.kts b/instrumentation/activej-http-6.0/javaagent/build.gradle.kts
@@ -13,7 +13,6 @@ muzzle {
 
 dependencies {
   library("io.activej:activej-http:6.0-rc2")
-  latestDepTestLibrary("io.activej:activej-http:6.+") // documented limitation, can be removed when there is a non rc version in 6.x series
 }
 
 otelJava {
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
@@ -8,8 +8,6 @@ dependencies {
   library("org.apache.httpcomponents:httpclient:4.3")
 
   testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing"))
-
-  latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+") // see apache-httpclient-5.0 module
 }
 
 tasks {
diff --git a/instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts b/instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts
@@ -26,7 +26,6 @@ dependencies {
     exclude("org.codehaus.groovy", "groovy")
   }
 
-  // the latest version of apache shenyu uses spring-boot 3.3
   latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.3.+") // related dependency
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
@@ -54,7 +54,6 @@ dependencies {
 
   testLibrary("org.springframework.data:spring-data-elasticsearch:3.0.0.RELEASE")
 
-  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.+") // see elasticsearch-transport-6.0 module
 }
diff --git a/instrumentation/grizzly-2.3/javaagent/build.gradle.kts b/instrumentation/grizzly-2.3/javaagent/build.gradle.kts
@@ -21,10 +21,6 @@ dependencies {
 
   // testLibrary("org.glassfish.grizzly:grizzly-http-server:2.3")
   testImplementation("org.glassfish.grizzly:grizzly-http-server:2.3")
-
-  // 5.0.0 depends on org.glassfish.grizzly:grizzly-bom:5.0.0-SNAPSHOT which is not available
-  latestDepTestLibrary("org.glassfish.grizzly:grizzly-http:4.+") // documented limitation
-  latestDepTestLibrary("org.glassfish.grizzly:grizzly-http-server:4.+") // documented limitation
 }
 
 tasks {
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
@@ -28,8 +28,8 @@ dependencies {
   testImplementation("javax.xml.bind:jaxb-api:2.3.1")
   testImplementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")
 
-  latestDepTestLibrary("org.hibernate:hibernate-core:5.+") // documented limitation
-  latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+") // documented limitation
+  latestDepTestLibrary("org.hibernate:hibernate-core:5.+") // see hibernate-6.0 module
+  latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+") // see hibernate-6.0 module
 }
 
 tasks {
diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:jsf:jsf-mojarra-1.2:javaagent"))
 
   // JSF 4+ requires CDI instead of BeanManager, the test should be upgraded first
-  latestDepTestLibrary("jakarta.el:jakarta.el-api:4.+") // documented limitation
+  latestDepTestLibrary("jakarta.el:jakarta.el-api:4.+") // related dependency
   latestDepTestLibrary("jakarta.faces:jakarta.faces-api:3.+") // documented limitation
   latestDepTestLibrary("org.glassfish:jakarta.faces:3.+") // documented limitation
 }
diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:jsf:jsf-myfaces-1.2:javaagent"))
 
   // JSF 4+ requires CDI instead of BeanManager, the test should be upgraded first
-  latestDepTestLibrary("jakarta.el:jakarta.el-api:4.+") // documented limitation
+  latestDepTestLibrary("jakarta.el:jakarta.el-api:4.+") // related dependency
   latestDepTestLibrary("org.apache.myfaces.core:myfaces-api:3.+") // documented limitation
   latestDepTestLibrary("org.apache.myfaces.core:myfaces-impl:3.+") // documented limitation
 }
diff --git a/instrumentation/jsp-2.3/javaagent/build.gradle.kts b/instrumentation/jsp-2.3/javaagent/build.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
 
   latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:9.+") // documented limitation
   latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:9.+") // documented limitation
-  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-logging-juli:9.+") // documented limitation
 }
 
 tasks {
diff --git a/instrumentation/netty/netty-3.8/javaagent/build.gradle.kts b/instrumentation/netty/netty-3.8/javaagent/build.gradle.kts
@@ -32,7 +32,6 @@ dependencies {
   testLibrary("com.ning:async-http-client:1.8.0")
 
   latestDepTestLibrary("io.netty:netty:3.+") // see netty-4.0 module
-  latestDepTestLibrary("com.ning:async-http-client:1.9.+") // see netty-4.0 module
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/build.gradle.kts b/instrumentation/okhttp/okhttp-2.2/javaagent/build.gradle.kts
@@ -21,8 +21,6 @@ dependencies {
   library("com.squareup.okhttp:okhttp:2.2.0")
 
   testInstrumentation(project(":instrumentation:okhttp:okhttp-3.0:javaagent"))
-
-  latestDepTestLibrary("com.squareup.okhttp:okhttp:2.+") // see okhttp-3.0 module
 }
 
 tasks {
diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/build.gradle.kts b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/build.gradle.kts
@@ -44,7 +44,6 @@ dependencies {
   testLibrary("com.typesafe.play:play-test_2.11:2.5.0")
 
   latestDepTestLibrary("com.typesafe.play:play-java_2.11:2.5.+") // see play-2.6 module
-  latestDepTestLibrary("com.typesafe.play:play-java-ws_2.11:2.5.+") // see play-2.6 module
   latestDepTestLibrary("com.typesafe.play:play-test_2.11:2.5.+") // see play-2.6 module
 }
 
diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
@@ -45,11 +45,6 @@ dependencies {
 
   testLibrary("com.typesafe.play:play-java_$scalaVersion:$playVersion")
   testLibrary("com.typesafe.play:play-test_$scalaVersion:$playVersion")
-
-  // later versions are tested with suites
-  latestDepTestLibrary("com.typesafe.play:play_$scalaVersion:2.7.+") // documented limitation
-  latestDepTestLibrary("com.typesafe.play:play-java_$scalaVersion:2.7.+") // documented limitation
-  latestDepTestLibrary("com.typesafe.play:play-test_$scalaVersion:2.7.+") // documented limitation
 }
 
 testing {
diff --git a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webflux-4.3/testing/build.gradle.kts b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webflux-4.3/testing/build.gradle.kts
@@ -16,8 +16,8 @@ dependencies {
   testLibrary("org.springframework.cloud:spring-cloud-starter-gateway-server-webflux:5.0.0")
   testLibrary("org.springframework.boot:spring-boot-starter-test:4.0.0")
 
-  // latest spring cloud release is not compatible with spring boot 4.1
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:4.0.+") // documented limitation
+  // latest Spring Cloud release is not compatible with Spring Boot 4.1
+  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:4.0.+") // related dependency
 }
 
 tasks.test {
diff --git a/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/build.gradle.kts b/instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/build.gradle.kts
@@ -25,8 +25,8 @@ dependencies {
   testLibrary("org.springframework.cloud:spring-cloud-starter-gateway-server-webmvc:5.0.0")
   testLibrary("org.springframework.boot:spring-boot-starter-test:4.0.0")
 
-  // latest spring cloud release is not compatible with spring boot 4.1
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:4.0.+") // documented limitation
+  // latest Spring Cloud release is not compatible with Spring Boot 4.1
+  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:4.0.+") // related dependency
 }
 
 tasks.test {
diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts b/instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts
@@ -20,9 +20,6 @@ dependencies {
   testImplementation("org.hsqldb:hsqldb:2.0.0")
   testImplementation("com.h2database:h2:1.4.197")
   testImplementation("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
-
-  // latest version of spring data is not yet compatible with spring 7 yet
-  latestDepTestLibrary("org.springframework:spring-test:6.+") // documented limitation
 }
 
 otelJava {
diff --git a/instrumentation/spring/spring-kafka-2.7/library/README.md b/instrumentation/spring/spring-kafka-2.7/library/README.md
@@ -32,28 +32,61 @@ implementation("io.opentelemetry.instrumentation:opentelemetry-spring-kafka-2.7:
 The instrumentation library provides interceptors that can be added to Spring Kafka message
 listener containers and producers to provide spans and context propagation.
 
+For Spring Boot 2.x and 3.x, instrument producers with:
+
 ```java
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.kafkaclients.v2_6.KafkaTelemetry;
-import io.opentelemetry.instrumentation.spring.kafka.v2_7.SpringKafkaTelemetry;
 import org.springframework.boot.autoconfigure.kafka.DefaultKafkaProducerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.config.ContainerCustomizer;
-import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 
 @Configuration
 public class KafkaInstrumentationConfig {
 
-  // Instrument Kafka producers
   @Bean
   public DefaultKafkaProducerFactoryCustomizer producerInstrumentation(
       OpenTelemetry openTelemetry) {
     KafkaTelemetry kafkaTelemetry = KafkaTelemetry.create(openTelemetry);
     return producerFactory -> producerFactory.addPostProcessor(kafkaTelemetry::wrap);
   }
+}
+```
+
+For Spring Boot 4.x, use the new package for the same customizer:
+
+```java
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.kafkaclients.v2_6.KafkaTelemetry;
+import org.springframework.boot.kafka.autoconfigure.DefaultKafkaProducerFactoryCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class KafkaInstrumentationConfig {
+
+  @Bean
+  public DefaultKafkaProducerFactoryCustomizer producerInstrumentation(
+      OpenTelemetry openTelemetry) {
+    KafkaTelemetry kafkaTelemetry = KafkaTelemetry.create(openTelemetry);
+    return producerFactory -> producerFactory.addPostProcessor(kafkaTelemetry::wrap);
+  }
+}
+```
+
+Instrument consumers with:
+
+```java
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.kafka.v2_7.SpringKafkaTelemetry;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.config.ContainerCustomizer;
+import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
+
+@Configuration
+public class KafkaInstrumentationConfig {
 
-  // Instrument Kafka consumers
   @Bean
   public ContainerCustomizer<String, String, ConcurrentMessageListenerContainer<String, String>>
       listenerCustomizer(OpenTelemetry openTelemetry) {
diff --git a/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts
@@ -21,11 +21,11 @@ dependencies {
   testLibrary("org.springframework.kafka:spring-kafka:2.7.1")
 
   testLibrary("org.springframework.boot:spring-boot-starter-test:2.5.3")
-  testLibrary("org.springframework.boot:spring-boot-starter:2.5.3")
-
-  // tests don't work with spring boot 4 yet
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
+  if (otelProps.testLatestDeps) {
+    testImplementation("org.springframework.boot:spring-boot-starter-kafka:latest.release")
+  } else {
+    testLibrary("org.springframework.boot:spring-boot-starter:2.5.3")
+  }
 }
 
 tasks.test {
diff --git a/instrumentation/spring/spring-kafka-2.7/library/src/test/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaNoReceiveTelemetryTest.java b/instrumentation/spring/spring-kafka-2.7/library/src/test/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaNoReceiveTelemetryTest.java
diff --git a/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts
diff --git a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/vertx-kafka-client-3.6-testing/build.gradle.kts b/instrumentation/vertx/vertx-kafka-client-3.6/vertx-kafka-client-3.6-testing/build.gradle.kts
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/vertx-kafka-client-4-testing/build.gradle.kts b/instrumentation/vertx/vertx-kafka-client-3.6/vertx-kafka-client-4-testing/build.gradle.kts
diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ muzzle {`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`library("io.activej:activej-http:6.0-rc2")`
`16`		`- latestDepTestLibrary("io.activej:activej-http:6.+") // documented limitation, can be removed when there is a non rc version in 6.x series`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`otelJava {`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ dependencies {`
`8`	`8`	`library("org.apache.httpcomponents:httpclient:4.3")`
`9`	`9`
`10`	`10`	`testImplementation(project(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing"))`
`11`		`-`
`12`		`- latestDepTestLibrary("org.apache.httpcomponents:httpclient:4.+") // see apache-httpclient-5.0 module`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ dependencies {`
`26`	`26`	`exclude("org.codehaus.groovy", "groovy")`
`27`	`27`	`}`
`28`	`28`
`29`		`- // the latest version of apache shenyu uses spring-boot 3.3`
`30`	`29`	`latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.3.+") // related dependency`
`31`	`30`
`32`	`31`	`testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ dependencies {`
`54`	`54`
`55`	`55`	`testLibrary("org.springframework.data:spring-data-elasticsearch:3.0.0.RELEASE")`
`56`	`56`
`57`		`- latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.+") // see elasticsearch-transport-6.0 module`
`58`	`57`	`latestDepTestLibrary("org.elasticsearch.client:transport:5.+") // see elasticsearch-transport-6.0 module`
`59`	`58`	`latestDepTestLibrary("org.springframework.data:spring-data-elasticsearch:3.0.+") // see elasticsearch-transport-6.0 module`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,6 @@ dependencies {`
`21`	`21`
`22`	`22`	`// testLibrary("org.glassfish.grizzly:grizzly-http-server:2.3")`
`23`	`23`	`testImplementation("org.glassfish.grizzly:grizzly-http-server:2.3")`
`24`		`-`
`25`		`- // 5.0.0 depends on org.glassfish.grizzly:grizzly-bom:5.0.0-SNAPSHOT which is not available`
`26`		`- latestDepTestLibrary("org.glassfish.grizzly:grizzly-http:4.+") // documented limitation`
`27`		`- latestDepTestLibrary("org.glassfish.grizzly:grizzly-http-server:4.+") // documented limitation`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ dependencies {`
`28`	`28`	`testImplementation("javax.xml.bind:jaxb-api:2.3.1")`
`29`	`29`	`testImplementation("org.glassfish.jaxb:jaxb-runtime:2.3.3")`
`30`	`30`
`31`		`- latestDepTestLibrary("org.hibernate:hibernate-core:5.+") // documented limitation`
`32`		`- latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+") // documented limitation`
	`31`	`+ latestDepTestLibrary("org.hibernate:hibernate-core:5.+") // see hibernate-6.0 module`
	`32`	`+ latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+") // see hibernate-6.0 module`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ dependencies {`
`32`	`32`	`testInstrumentation(project(":instrumentation:jsf:jsf-mojarra-1.2:javaagent"))`
`33`	`33`
`34`	`34`	`// JSF 4+ requires CDI instead of BeanManager, the test should be upgraded first`
`35`		`- latestDepTestLibrary("jakarta.el:jakarta.el-api:4.+") // documented limitation`
	`35`	`+ latestDepTestLibrary("jakarta.el:jakarta.el-api:4.+") // related dependency`
`36`	`36`	`latestDepTestLibrary("jakarta.faces:jakarta.faces-api:3.+") // documented limitation`
`37`	`37`	`latestDepTestLibrary("org.glassfish:jakarta.faces:3.+") // documented limitation`
`38`	`38`	`}`