more pinning

Author: trask

.github/config/latest-dep-versions.json

@@ -43,7 +43,9 @@
     "com.github.etaty:rediscala_2.13#+": "1.9.0",
     "com.github.oshi:oshi-core#+": "6.12.0",
     "com.google.guava:guava#+": "33.6.0-jre",
+    "com.google.gwt:gwt-dev#+": "2.10.0",
     "com.google.gwt:gwt-servlet#+": "2.10.0",
+    "com.google.gwt:gwt-user#+": "2.10.0",
     "com.google.http-client:google-http-client#+": "2.1.0",
     "com.graphql-java:graphql-java#+": "25.0",
     "com.graphql-java:graphql-java#19.+": "19.11",
@@ -379,7 +381,9 @@
     "org.glassfish:javax.faces#2.+": "2.4.0",
     "org.grails:grails-plugin-url-mappings#+": "6.2.3",
     "org.grails:grails-web-url-mappings#+": "6.2.3",
+    "org.gwtproject:gwt-dev#+": "2.13.0",
     "org.gwtproject:gwt-servlet#+": "2.13.0",
+    "org.gwtproject:gwt-user#+": "2.13.0",
     "org.hibernate.orm:hibernate-core#+": "7.3.2.Final",
     "org.hibernate.reactive:hibernate-reactive-core#+": "4.3.3.Final",
     "org.hibernate.reactive:hibernate-reactive-core#1.+": "1.1.9.Final",

conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts

@@ -172,8 +172,11 @@ configurations {
       // affected by overrides intended for the main test suite.
       val applyOverrides = name.startsWith("test") || name.startsWith("latestDepTest")
       // Pinning of `latest.release`/`+` versions is applied broadly (case-insensitive "test"
-      // match) so that custom JvmTestSuite source sets are also reproducible.
-      val applyPinning = pinLatestDeps && name.contains("test", ignoreCase = true)
+      // match) so that custom JvmTestSuite source sets are also reproducible. Also include the
+      // main `compileClasspath` so that modules using `dependencySubstitution` to swap groups
+      // for the agent's compile classpath (e.g. gwt-2.0) get pinned versions in latest mode.
+      val applyPinning = pinLatestDeps &&
+        (name.contains("test", ignoreCase = true) || name == "compileClasspath")
       if (!applyOverrides && !applyPinning) return@configureEach
       resolutionStrategy.eachDependency {
         if (applyOverrides) {

conventions/src/main/kotlin/otel.resolve-latest-dep-versions.gradle.kts

@@ -78,7 +78,11 @@ tasks {
 
       subprojects {
         configurations
-          .filter { it.isCanBeResolved && it.name.contains("test", ignoreCase = true) && it.name.endsWith("RuntimeClasspath") }
+          .filter {
+            it.isCanBeResolved &&
+              ((it.name.contains("test", ignoreCase = true) && it.name.endsWith("RuntimeClasspath")) ||
+                it.name == "compileClasspath")
+          }
           .forEach { config ->
             config.incoming.resolutionResult.allDependencies.forEach { dep ->
               if (dep is org.gradle.api.artifacts.result.ResolvedDependencyResult) {

instrumentation/gwt-2.0/javaagent/build.gradle.kts

@@ -30,19 +30,26 @@ sourceSets {
   }
 }
 
+// GWT moved from `com.google.gwt` to `org.gwtproject` in 2.10.0. In latest-deps mode,
+// rewrite every `com.google.gwt:gwt-*` coordinate to the new group so the agent compiles
+// and tests against the modern artifacts. The version is left as `latest.release` and
+// gets pinned to a concrete release by the convention plugin's standard pinning hook.
+if (otelProps.testLatestDeps) {
+  configurations.configureEach {
+    resolutionStrategy.dependencySubstitution {
+      listOf("gwt-user", "gwt-dev", "gwt-servlet").forEach { artifact ->
+        substitute(module("com.google.gwt:$artifact"))
+          .using(module("org.gwtproject:$artifact:latest.release"))
+      }
+    }
+  }
+}
+
 dependencies {
   // these are needed for compileGwt task
-  if (otelProps.testLatestDeps) {
-    compileOnly("org.gwtproject:gwt-user:latest.release")
-    compileOnly("org.gwtproject:gwt-dev:latest.release")
-    compileOnly("org.gwtproject:gwt-servlet:latest.release")
-    testImplementation("org.gwtproject:gwt-servlet:latest.release")
-  } else {
-    compileOnly("com.google.gwt:gwt-user:2.0.0")
-    compileOnly("com.google.gwt:gwt-dev:2.0.0")
-    compileOnly("com.google.gwt:gwt-servlet:2.0.0")
-    testImplementation("com.google.gwt:gwt-servlet:2.0.0")
-  }
+  library("com.google.gwt:gwt-user:2.0.0")
+  library("com.google.gwt:gwt-dev:2.0.0")
+  library("com.google.gwt:gwt-servlet:2.0.0")
 
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))