Fix spring 7 testLatestDeps

Author: jaydeluca

instrumentation/spring/spring-data/spring-data-3.0/testing/build.gradle.kts

@@ -2,6 +2,8 @@ plugins {
   id("otel.javaagent-testing")
 }
 
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+
 dependencies {
   testInstrumentation(project(":instrumentation:jdbc:javaagent"))
   testInstrumentation(project(":instrumentation:r2dbc-1.0:javaagent"))
@@ -20,6 +22,15 @@ dependencies {
   testImplementation("org.hsqldb:hsqldb:2.0.0")
   testImplementation("com.h2database:h2:1.4.197")
   testImplementation("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
+
+  if (testLatestDeps) {
+    // Exclude Spring Framework 7.0+ until compatible version available
+    testImplementation("org.springframework:spring-core") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+  }
 }
 
 otelJava {

instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts

@@ -14,6 +14,8 @@ muzzle {
   }
 }
 
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+
 dependencies {
   implementation(project(":instrumentation:spring:spring-security-config-6.0:library"))
 
@@ -23,11 +25,25 @@ dependencies {
 
   testLibrary("org.springframework:spring-test:6.0.0")
   testLibrary("org.springframework:spring-context:6.0.0")
-  // can't use testLibrary for now because 6.2.0-M1 is latest and its POM referes to a missing
+  // can't use testLibrary for now because 6.2.0-M1 is latest and its POM refers to a missing
   // parent POM, switch back to testLibrary when a new version is released
   // testLibrary("jakarta.servlet:jakarta.servlet-api:6.0.0")
   testImplementation("jakarta.servlet:jakarta.servlet-api:6.0.0")
   latestDepTestLibrary("jakarta.servlet:jakarta.servlet-api:6.1.0") // documented limitation
+
+  if (testLatestDeps) {
+    // Exclude Spring Framework 7.0+ until compatible version available
+    testImplementation("org.springframework:spring-context") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+    testImplementation("org.springframework:spring-test") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+  }
 }
 
 otelJava {

instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts

@@ -2,6 +2,8 @@ plugins {
   id("otel.library-instrumentation")
 }
 
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+
 dependencies {
   library("org.springframework.security:spring-security-config:6.0.0")
   library("org.springframework.security:spring-security-web:6.0.0")
@@ -17,6 +19,30 @@ dependencies {
   implementation(project(":instrumentation:reactor:reactor-3.1:library"))
 
   testLibrary("org.springframework:spring-test:6.0.0")
+
+  if (testLatestDeps) {
+    // Exclude Spring Framework 7.0+ until compatible version available
+    testImplementation("org.springframework:spring-core") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+    testImplementation("org.springframework:spring-context") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+    testImplementation("org.springframework:spring-web") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+    testImplementation("org.springframework:spring-test") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+  }
 }
 
 otelJava {

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts

@@ -23,6 +23,15 @@ if (latestDepTest) {
   otelJava {
     minJavaVersionSupported.set(JavaVersion.VERSION_17)
   }
+
+  // Exclude Spring Framework 7.0+ until compatible version available
+  dependencies {
+    testImplementation("org.springframework:spring-webflux") {
+      version {
+        strictly("[6.0,7.0[")
+      }
+    }
+  }
 }
 
 if (!latestDepTest) {