From 77a38755b30eb7008accea76434559b5278d0f50 Mon Sep 17 00:00:00 2001 From: William Conti Date: Sat, 6 Jun 2026 10:10:44 -0400 Subject: [PATCH] feat(spring): add Spring Boot 4 / Spring Framework 7 support to spring-webflux-6.0 - Bump latestDepTest spring-webflux/spring-context/spring-test from 6.+ to 7.+ - Bump latestDepBootTest spring-boot-starter-* from 3.+ to 4.+ - Update testJvmConstraints minJavaVersion from VERSION_17 to VERSION_21 (SF7 requires Java 21) --- .../spring-webflux/spring-webflux-6.0/build.gradle | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle index 862078e6661..9aba16299f5 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/java.gradle" testJvmConstraints { - minJavaVersion = JavaVersion.VERSION_17 + minJavaVersion = JavaVersion.VERSION_21 } // test that webflux5 instrumentation works for webflux6 too @@ -36,17 +36,17 @@ dependencies { testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.1.3' testImplementation group: 'org.springframework', name: 'spring-test', version: '6.0.0' - latestDepTestImplementation group: 'org.springframework', name: 'spring-webflux', version: '6.+' - latestDepTestImplementation group: 'org.springframework', name: 'spring-context', version: '6.+' + latestDepTestImplementation group: 'org.springframework', name: 'spring-webflux', version: '7.+' + latestDepTestImplementation group: 'org.springframework', name: 'spring-context', version: '7.+' latestDepTestImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.+' - latestDepTestImplementation group: 'org.springframework', name: 'spring-test', version: '6.+' + latestDepTestImplementation group: 'org.springframework', name: 'spring-test', version: '7.+' bootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '3.0.0' bootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.0.0' bootTestImplementation project(':dd-java-agent:instrumentation:spring:spring-webflux:spring-webflux-5.0') - latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '3.+' - latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.+' + latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '4.+' + latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '4.+' latestDepBootTestImplementation project(':dd-java-agent:instrumentation:spring:spring-webflux:spring-webflux-5.0') iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '3.0.0' @@ -66,4 +66,3 @@ dependencies { latestDepBootTestImplementation(libs.spock.spring) iastTestImplementation(libs.spock.spring) } -