Update to Gradle 8.1.1 (#3046)

buildSrc/build.gradle.kts

@@ -42,5 +42,6 @@ dependencies {
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.1")
 
-  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.2.0.RELEASE")
+  // earlier versions aren't compatible with Gradle 8.1.1
+  implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")
 }

buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts

@@ -154,7 +154,7 @@ dependencyCheck {
 
 if (!path.startsWith(":smoke-tests")) {
   configurations.configureEach {
-    if (name.toLowerCase().endsWith("runtimeclasspath")) {
+    if (name.lowercase().endsWith("runtimeclasspath")) {
       resolutionStrategy.activateDependencyLocking()
     }
   }

buildSrc/src/main/kotlin/ai.sdk-version-file.gradle.kts

@@ -4,20 +4,19 @@ plugins {
 
 val sdkVersionDir = "${buildDir}/generated/resources/sdk-version"
 
-sourceSets {
-  main {
-    resources {
-      srcDir(sdkVersionDir)
+tasks {
+  register("generateVersionResource") {
+    inputs.property("project.version", project.version.toString())
+    outputs.dir(sdkVersionDir)
+
+    doLast {
+      File(sdkVersionDir, "ai.sdk-version.properties").writeText("version=${project.version}")
     }
   }
 }
 
-tasks {
-  val generateVersionProperties by registering(WriteProperties::class) {
-    outputFile = File(sdkVersionDir, "ai.sdk-version.properties")
-    property("version", project.version)
-  }
-  processResources {
-    dependsOn(generateVersionProperties)
+sourceSets {
+  main {
+    output.dir(sdkVersionDir, "builtBy" to "generateVersionResource")
   }
 }

buildSrc/src/main/kotlin/ai.smoke-test-jar.gradle.kts

@@ -7,5 +7,5 @@ plugins {
 
 val aiSmokeTest = extensions.getByType(AiSmokeTestExtension::class)
 
-aiSmokeTest.testAppArtifactDir.set(tasks.jar.get().destinationDirectory.get())
-aiSmokeTest.testAppArtifactFilename.set(tasks.jar.get().archiveFileName.get())
+aiSmokeTest.testAppArtifactDir.set(tasks.getByName<Jar>("bootJar").destinationDirectory.get())
+aiSmokeTest.testAppArtifactFilename.set(tasks.getByName<Jar>("bootJar").archiveFileName.get())

buildSrc/src/main/kotlin/ai.smoke-test-war.gradle.kts

@@ -13,7 +13,7 @@ tasks.war {
 
 val aiSmokeTest = extensions.getByType(AiSmokeTestExtension::class)
 
-aiSmokeTest.testAppArtifactDir.set(tasks.war.get().destinationDirectory.get())
+aiSmokeTest.testAppArtifactDir.set(tasks.getByName<War>("war").destinationDirectory.get())
 aiSmokeTest.testAppArtifactFilename.set(project.name + ".war")
 
 dependencies {

buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts

@@ -2,8 +2,7 @@ import com.microsoft.applicationinsights.gradle.AiSmokeTestExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
-  `java-library`
-
+  java
   id("ai.spotless-conventions")
 }
 

dependencyManagement/build.gradle.kts

@@ -121,7 +121,7 @@ dependencies {
 }
 
 fun isNonStable(version: String): Boolean {
-  val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+  val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
   val regex = "^[0-9,.v-]+(-r)?$".toRegex()
   val isGuava = version.endsWith("-jre")
   val isStable = stableKeyword || regex.matches(version) || isGuava

etw/etw-testapp/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("ai.java-conventions")
-  id("org.springframework.boot" version "2.1.7.RELEASE")
+  id("org.springframework.boot" version "2.5.12")
   id("war")
 }
 
@@ -10,7 +10,7 @@ dependencies {
   // compileOnly(project(path:":agent:agent", configuration:"devtest"))
   compileOnly(project(path: ":agent:agent"))
 
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   implementation("org.apache.commons:commons-lang3:3.12.0")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

smoke-tests/apps/ActuatorMetrics/build.gradle.kts

@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
-  implementation("org.springframework.boot:spring-boot-starter-actuator:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-actuator:2.5.12")
 }

smoke-tests/apps/AzureSdk/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     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

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.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

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.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

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.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/CustomDimensions/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/CustomInstrumentation/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
 }

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.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
 }

smoke-tests/apps/DotInJmxMetric/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/HttpHeaders/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/HttpServer4xx/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/InheritedAttributes/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
 
   implementation(project(":classic-sdk:web"))
 }

smoke-tests/apps/JMS/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
-  implementation("org.springframework.boot:spring-boot-starter-activemq:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
+  implementation("org.springframework.boot:spring-boot-starter-activemq:2.5.12")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
 }

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.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
 }

smoke-tests/apps/JettyNativeHandler/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter:2.5.12")
 
   // jetty 10 is compiled against Java 11
   implementation("org.eclipse.jetty:jetty-server:9.4.49.v20220914")

smoke-tests/apps/Kafka/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
   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")

smoke-tests/apps/Micrometer/build.gradle.kts

@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
   implementation("io.micrometer:micrometer-core:1.4.1")
 }

smoke-tests/apps/NonDaemonThreads/build.gradle.kts

@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
   implementation("com.squareup.okhttp3:okhttp:3.12.1")
 }

smoke-tests/apps/OpenTelemetryApiSupport/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   implementation("io.opentelemetry:opentelemetry-api:1.0.0")

smoke-tests/apps/OpenTelemetryMetric/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   implementation("io.opentelemetry:opentelemetry-api:1.12.0")

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.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
 

smoke-tests/apps/SpringBootAuto/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/SpringScheduling/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/SystemExit/build.gradle.kts

@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
   implementation("io.opentelemetry:opentelemetry-api:1.12.0")
 }

smoke-tests/apps/TelemetryProcessors/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE") {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
     exclude("org.springframework.boot", "spring-boot-starter-tomcat")
   }
   // this dependency is needed to make wildfly happy

smoke-tests/apps/VerifyShading/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
 }

smoke-tests/apps/WebFlux/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-webflux:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-webflux:2.5.12")
 }

smoke-tests/apps/gRPC/build.gradle.kts

@@ -31,7 +31,7 @@ protobuf {
 }
 
 dependencies {
-  implementation("org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE")
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
 
   implementation("io.grpc:grpc-core:$grpcVersion")
   implementation("io.grpc:grpc-netty:$grpcVersion")