Shorten latest dep version selection in suites

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -132,24 +132,16 @@ testing {
   suites {
     val s3PresignerTest by registering(JvmTestSuite::class) {
       dependencies {
-        if (latestDepTest) {
-          implementation("software.amazon.awssdk:s3:latest.release")
-        } else {
-          implementation("software.amazon.awssdk:s3:2.10.12")
-        }
+        val version = if (latestDepTest) "latest.release" else "2.10.12"
+        implementation("software.amazon.awssdk:s3:$version")
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
       }
     }
 
     val s3CrtTest by registering(JvmTestSuite::class) {
       dependencies {
-        if (latestDepTest) {
-          implementation("software.amazon.awssdk:s3:latest.release")
-          implementation("software.amazon.awssdk.crt:aws-crt:latest.release")
-        } else {
-          implementation("software.amazon.awssdk:s3:2.27.21")
-          implementation("software.amazon.awssdk.crt:aws-crt:0.30.11")
-        }
+        implementation("software.amazon.awssdk:s3:" + if (latestDepTest) "latest.release" else "2.27.21")
+        implementation("software.amazon.awssdk.crt:aws-crt:" + if (latestDepTest) "latest.release" else "0.30.11")
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:library"))
         implementation("org.testcontainers:localstack")
       }
@@ -158,12 +150,9 @@ testing {
     val testBedrockRuntime by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
-        if (findProperty("testLatestDeps") as Boolean) {
-          implementation("software.amazon.awssdk:bedrockruntime:latest.release")
-        } else {
-          // First release with Converse API
-          implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
-        }
+        // 2.25.63 is the first release with Converse API
+        val version = if (latestDepTest) "latest.release" else "2.25.63"
+        implementation("software.amazon.awssdk:bedrockruntime:$version")
       }
 
       targets {

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

@@ -29,48 +29,38 @@ dependencies {
   testLibrary("software.amazon.awssdk:ses:2.2.0")
 }
 
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+
 testing {
   suites {
     val testCoreOnly by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
         compileOnly("software.amazon.awssdk:sqs:2.2.0")
-        if (findProperty("testLatestDeps") as Boolean) {
-          implementation("software.amazon.awssdk:aws-core:latest.release")
-          implementation("software.amazon.awssdk:aws-json-protocol:latest.release")
-          implementation("software.amazon.awssdk:dynamodb:latest.release")
-          implementation("software.amazon.awssdk:lambda:latest.release")
-        } else {
-          implementation("software.amazon.awssdk:aws-core:2.2.0")
-          implementation("software.amazon.awssdk:aws-json-protocol:2.2.0")
-          implementation("software.amazon.awssdk:dynamodb:2.2.0")
-          implementation("software.amazon.awssdk:lambda:2.2.0")
-        }
+        val version = if (testLatestDeps) "latest.release" else "2.2.0"
+        implementation("software.amazon.awssdk:aws-core:$version")
+        implementation("software.amazon.awssdk:aws-json-protocol:$version")
+        implementation("software.amazon.awssdk:dynamodb:$version")
+        implementation("software.amazon.awssdk:lambda:$version")
       }
     }
 
     val testLambda by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
-        if (findProperty("testLatestDeps") as Boolean) {
-          implementation("software.amazon.awssdk:lambda:latest.release")
-        } else {
-          implementation("software.amazon.awssdk:lambda:2.17.0")
-        }
+        val version = if (testLatestDeps) "latest.release" else "2.17.0"
+        implementation("software.amazon.awssdk:lambda:$version")
       }
     }
 
     val testBedrockRuntime by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
-        if (findProperty("testLatestDeps") as Boolean) {
-          implementation("software.amazon.awssdk:bedrockruntime:latest.release")
-        } else {
-          implementation("software.amazon.awssdk:bedrockruntime:2.25.63")
-        }
+        val version = if (testLatestDeps) "latest.release" else "2.25.63"
+        implementation("software.amazon.awssdk:bedrockruntime:$version")
       }
     }
   }

instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts

@@ -39,11 +39,8 @@ testing {
     // extracted to the output directory are not available during tests
     val testAzure by registering(JvmTestSuite::class) {
       dependencies {
-        if (latestDepTest) {
-          implementation("com.azure:azure-core:1.35.0")
-        } else {
-          implementation("com.azure:azure-core:1.19.0")
-        }
+        val version = if (latestDepTest) "1.35.0" else "1.19.0"
+        implementation("com.azure:azure-core:$version")
       }
     }
   }

instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts

@@ -63,23 +63,17 @@ testing {
         implementation("javax.faces:jsf-api:1.2")
         implementation("com.sun.facelets:jsf-facelets:1.1.14")
 
-        if (latestDepTest) {
-          implementation("javax.faces:jsf-impl:1.+")
-        } else {
-          implementation("javax.faces:jsf-impl:1.2_04")
-        }
+        val version = if (latestDepTest) "1.+" else "1.2_04"
+        implementation("javax.faces:jsf-impl:$version")
       }
     }
 
     val mojarra2Test by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
 
-        if (latestDepTest) {
-          implementation("org.glassfish:jakarta.faces:2.+")
-        } else {
-          implementation("org.glassfish:javax.faces:2.2.0")
-        }
+        val version = if (latestDepTest) "2.+" else "2.2.0"
+        implementation("org.glassfish:javax.faces:$version")
       }
     }
   }

instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts

@@ -31,11 +31,8 @@ testing {
         implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
         implementation("com.sun.facelets:jsf-facelets:1.1.14")
 
-        if (latestDepTest) {
-          implementation("org.apache.myfaces.core:myfaces-impl:1.2.+")
-        } else {
-          implementation("org.apache.myfaces.core:myfaces-impl:1.2.2")
-        }
+        val version = if (latestDepTest) "1.2.+" else "1.2.2"
+        implementation("org.apache.myfaces.core:myfaces-impl:$version")
       }
     }
 
@@ -45,11 +42,8 @@ testing {
         implementation("javax.xml.bind:jaxb-api:2.2.11")
         implementation("com.sun.xml.bind:jaxb-impl:2.2.11")
 
-        if (latestDepTest) {
-          implementation("org.apache.myfaces.core:myfaces-impl:2.+")
-        } else {
-          implementation("org.apache.myfaces.core:myfaces-impl:2.2.0")
-        }
+        val version = if (latestDepTest) "2.+" else "2.2.0"
+        implementation("org.apache.myfaces.core:myfaces-impl:$version")
       }
     }
   }

instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts

@@ -41,17 +41,16 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
 }
 
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+
 testing {
   suites {
     val testInitialization by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":instrumentation:reactor:reactor-3.1:library"))
         implementation(project(":instrumentation-annotations"))
-        if (findProperty("testLatestDeps") as Boolean) {
-          implementation("io.projectreactor:reactor-test:latest.release")
-        } else {
-          implementation("io.projectreactor:reactor-test:3.1.0.RELEASE")
-        }
+        val version = if (testLatestDeps) "latest.release" else "3.1.0.RELEASE"
+        implementation("io.projectreactor:reactor-test:$version")
       }
     }
   }

instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts

@@ -40,15 +40,11 @@ testing {
         implementation(project(":instrumentation:spring:spring-kafka-2.7:testing"))
 
         // the "library" configuration is not recognized by the test suite plugin
-        if (latestDepTest) {
-          implementation("org.springframework.kafka:spring-kafka:latest.release")
-          implementation("org.springframework.boot:spring-boot-starter-test:latest.release")
-          implementation("org.springframework.boot:spring-boot-starter:latest.release")
-        } else {
-          implementation("org.springframework.kafka:spring-kafka:2.7.0")
-          implementation("org.springframework.boot:spring-boot-starter-test:2.5.3")
-          implementation("org.springframework.boot:spring-boot-starter:2.5.3")
-        }
+        val springKafkaVersion = if (latestDepTest) "latest.release" else "2.7.0"
+        val springBootVersion = if (latestDepTest) "latest.release" else "2.5.3"
+        implementation("org.springframework.kafka:spring-kafka:$springKafkaVersion")
+        implementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
+        implementation("org.springframework.boot:spring-boot-starter:$springBootVersion")
       }
 
       targets {