:fix more deprecations

trask · trask · commit 7231b18b99ac · 2025-07-19T15:40:45.000Z
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -44,6 +44,6 @@ dependencies {
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
 
-  // earlier versions aren't compatible with Gradle 8.1.1
-  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")
+  // updated to latest 2.x version for better Gradle 9.0 compatibility
+  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.18")
 }
diff --git a/etw/etw-testapp/build.gradle.kts b/etw/etw-testapp/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("ai.java-conventions")
-  id("org.springframework.boot" version "2.5.12")
+  id("org.springframework.boot" version "2.7.18")
   id("war")
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ version=3.7.3
 
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+# org.gradle.configuration-cache=true
 
 org.gradle.priority=low
 
diff --git a/smoke-tests/apps/ActuatorMetrics/build.gradle.kts b/smoke-tests/apps/ActuatorMetrics/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
-  implementation("org.springframework.boot:spring-boot-starter-actuator:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
+  implementation("org.springframework.boot:spring-boot-starter-actuator:2.7.18")
 }
diff --git a/smoke-tests/apps/AzureFunctions/build.gradle.kts b/smoke-tests/apps/AzureFunctions/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 }
diff --git a/smoke-tests/apps/AzureSdk/build.gradle.kts b/smoke-tests/apps/AzureSdk/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // want to test with one of the earliest version supported, and not managed version used in agent
diff --git a/smoke-tests/apps/ClassicSdkWebInterop2x/build.gradle.kts b/smoke-tests/apps/ClassicSdkWebInterop2x/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     // and duplicate class files produces lots of warning messages on jetty
     exclude("com.microsoft.azure", "applicationinsights-core")
   }
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/ClassicSdkWebInterop3x/build.gradle.kts b/smoke-tests/apps/ClassicSdkWebInterop3x/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation(project(":classic-sdk:web"))
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/ClassicSdkWebInterop3xUsingOld3xAgent/build.gradle.kts b/smoke-tests/apps/ClassicSdkWebInterop3xUsingOld3xAgent/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation(project(":classic-sdk:web"))
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/CustomDimensions/build.gradle.kts b/smoke-tests/apps/CustomDimensions/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/CustomInstrumentation/build.gradle.kts b/smoke-tests/apps/CustomInstrumentation/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 }
diff --git a/smoke-tests/apps/DiagnosticExtension/build.gradle.kts b/smoke-tests/apps/DiagnosticExtension/build.gradle.kts
@@ -7,5 +7,5 @@ dependencies {
   implementation(project(":agent:agent-profiler:agent-alerting-api"))
   implementation(project(":smoke-tests:apps:DiagnosticExtension:MockExtension"))
   testImplementation(project(":smoke-tests:framework"))
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 }
diff --git a/smoke-tests/apps/HttpHeaders/build.gradle.kts b/smoke-tests/apps/HttpHeaders/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/HttpServer/build.gradle.kts b/smoke-tests/apps/HttpServer/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/HttpServer4xx/build.gradle.kts b/smoke-tests/apps/HttpServer4xx/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/InheritedAttributes/build.gradle.kts b/smoke-tests/apps/InheritedAttributes/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 
   implementation(project(":classic-sdk:web"))
 }
diff --git a/smoke-tests/apps/JMS/build.gradle.kts b/smoke-tests/apps/JMS/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
-  implementation("org.springframework.boot:spring-boot-starter-activemq:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
+  implementation("org.springframework.boot:spring-boot-starter-activemq:2.7.18")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
 }
diff --git a/smoke-tests/apps/JavaProfiler/build.gradle.kts b/smoke-tests/apps/JavaProfiler/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
   testImplementation(project(":smoke-tests:framework"))
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 }
diff --git a/smoke-tests/apps/JettyNativeHandler/build.gradle.kts b/smoke-tests/apps/JettyNativeHandler/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter:2.7.18")
 
   // jetty 10 is compiled against Java 11
   implementation("org.eclipse.jetty:jetty-server:9.4.49.v20220914")
diff --git a/smoke-tests/apps/JmxMetric/build.gradle.kts b/smoke-tests/apps/JmxMetric/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/Kafka/build.gradle.kts b/smoke-tests/apps/Kafka/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
   implementation("org.springframework.kafka:spring-kafka:2.3.1.RELEASE")
   implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
diff --git a/smoke-tests/apps/Micrometer/build.gradle.kts b/smoke-tests/apps/Micrometer/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
   implementation("io.micrometer:micrometer-core:1.4.1")
 }
diff --git a/smoke-tests/apps/NonDaemonThreads/build.gradle.kts b/smoke-tests/apps/NonDaemonThreads/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
   implementation("com.squareup.okhttp3:okhttp:3.12.1")
 }
diff --git a/smoke-tests/apps/OpenTelemetryApiLogBridge/build.gradle.kts b/smoke-tests/apps/OpenTelemetryApiLogBridge/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   implementation("io.opentelemetry:opentelemetry-api:1.27.0")
diff --git a/smoke-tests/apps/OpenTelemetryApiSupport/build.gradle.kts b/smoke-tests/apps/OpenTelemetryApiSupport/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   implementation("io.opentelemetry:opentelemetry-api:1.0.0")
diff --git a/smoke-tests/apps/OpenTelemetryMetric/build.gradle.kts b/smoke-tests/apps/OpenTelemetryMetric/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   implementation("io.opentelemetry:opentelemetry-api:1.12.0")
diff --git a/smoke-tests/apps/OtlpMetrics/build.gradle.kts b/smoke-tests/apps/OtlpMetrics/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("spring-boot-starter-tomcat")
   }
   implementation("io.opentelemetry:opentelemetry-api:1.30.0")
diff --git a/smoke-tests/apps/PreferForwardedUrlScheme/build.gradle.kts b/smoke-tests/apps/PreferForwardedUrlScheme/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 }
diff --git a/smoke-tests/apps/SpringBoot/build.gradle.kts b/smoke-tests/apps/SpringBoot/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 dependencies {
   implementation("com.microsoft.azure:applicationinsights-spring-boot-starter:2.6.4")
 
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
 
diff --git a/smoke-tests/apps/SpringBootAuto/build.gradle.kts b/smoke-tests/apps/SpringBootAuto/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/SpringScheduling/build.gradle.kts b/smoke-tests/apps/SpringScheduling/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/SystemExit/build.gradle.kts b/smoke-tests/apps/SystemExit/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
   implementation("io.opentelemetry:opentelemetry-api:1.12.0")
 }
diff --git a/smoke-tests/apps/TelemetryProcessors/build.gradle.kts b/smoke-tests/apps/TelemetryProcessors/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy
diff --git a/smoke-tests/apps/VerifyAgentJar/build.gradle.kts b/smoke-tests/apps/VerifyAgentJar/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 }
diff --git a/smoke-tests/apps/WebFlux/build.gradle.kts b/smoke-tests/apps/WebFlux/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-webflux:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-webflux:2.7.18")
 }
diff --git a/smoke-tests/apps/gRPC/build.gradle.kts b/smoke-tests/apps/gRPC/build.gradle.kts
@@ -2,7 +2,7 @@ import com.google.protobuf.gradle.*
 
 plugins {
   id("ai.smoke-test-jar")
-  id("com.google.protobuf") version "0.8.19"
+  id("com.google.protobuf") version "0.9.5"
 }
 
 val grpcVersion = "1.26.0" // first version with support for arm64
@@ -28,7 +28,7 @@ protobuf {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")
 
   implementation("io.grpc:grpc-core:$grpcVersion")
   implementation("io.grpc:grpc-netty:$grpcVersion")

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ dependencies {`
`44`	`44`	`implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")`
`45`	`45`	`implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")`
`46`	`46`
`47`		`- // earlier versions aren't compatible with Gradle 8.1.1`
`48`		`- implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")`
	`47`	`+ // updated to latest 2.x version for better Gradle 9.0 compatibility`
	`48`	`+ implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.18")`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("ai.java-conventions")`
`3`		`- id("org.springframework.boot" version "2.5.12")`
	`3`	`+ id("org.springframework.boot" version "2.7.18")`
`4`	`4`	`id("war")`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")`
`7`		`- implementation("org.springframework.boot:spring-boot-starter-actuator:2.5.12")`
	`6`	`+ implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")`
	`7`	`+ implementation("org.springframework.boot:spring-boot-starter-actuator:2.7.18")`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")`
	`6`	`+ implementation("org.springframework.boot:spring-boot-starter-web:2.7.18")`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {`
	`6`	`+ implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {`
`7`	`7`	`exclude("org.springframework.boot", "spring-boot-starter-tomcat")`
`8`	`8`	`}`
`9`	`9`	`// want to test with one of the earliest version supported, and not managed version used in agent`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ dependencies {`
`8`	`8`	`// and duplicate class files produces lots of warning messages on jetty`
`9`	`9`	`exclude("com.microsoft.azure", "applicationinsights-core")`
`10`	`10`	`}`
`11`		`- implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {`
	`11`	`+ implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {`
`12`	`12`	`exclude("org.springframework.boot", "spring-boot-starter-tomcat")`
`13`	`13`	`}`
`14`	`14`	`// this dependency is needed to make wildfly happy`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`
`5`	`5`	`dependencies {`
`6`	`6`	`implementation(project(":classic-sdk:web"))`
`7`		`- implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {`
	`7`	`+ implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") {`
`8`	`8`	`exclude("org.springframework.boot", "spring-boot-starter-tomcat")`
`9`	`9`	`}`
`10`	`10`	`// this dependency is needed to make wildfly happy`