Upgrade Gradle from 8.14 to 9.1.0

daschl · daschl · commit 6375d625d138 · 2025-10-02T15:03:55.000+02:00
This commit contains the necessary modifications to migrate to a new major gradle
version, it contains the following fixes and enhancements:

 - Update gradle wrapper distribution to 9.1.0
 - Update shadow plugin from com.github.johnrengelman.shadow to com.gradleup.shadow 8.3.9
 - Remove deprecated CLASSPATH handling from gradlew scripts
 - Modernize Gradle configuration syntax (enabled=false, group/description assignments)
 - Refactor dependency locking configuration
 - Add required test runtime dependencies (junit-platform-launcher, XmlParser)
 - Fix task dependencies for Jersey modules and protobuf generation
 - Update SpotBugs task configuration for Gradle 9 compatibility
diff --git a/build.gradle b/build.gradle
@@ -89,8 +89,8 @@ if (JavaVersion.current().isJava11Compatible()) {
 }
 
 task validateLocalDocSite(type: Exec) {
-  group 'Documentation'
-  description 'Generate and validate servicetalk.io site documentation'
+  group = 'Documentation'
+  description = 'Generate and validate servicetalk.io site documentation'
   workingDir 'docs/generation'
   commandLine './gradlew', 'clean', 'validateLocalSite'
 }
@@ -119,20 +119,10 @@ subprojects {
     lockMode = LockMode.STRICT
   }
 
-  configurations {
-    annotationProcessor {
-      resolutionStrategy.activateDependencyLocking()
-    }
-    compileClasspath {
-      resolutionStrategy.activateDependencyLocking()
-    }
-    runtimeClasspath {
-      resolutionStrategy.activateDependencyLocking()
-    }
-    jmhCompileClasspath {
-      resolutionStrategy.activateDependencyLocking()
-    }
-    jmhRuntimeClasspath {
+  def lockableConfigs = ["annotationProcessor", "compileClasspath", "runtimeClasspath", "jmhCompileClasspath",
+                         "jmhRuntimeClasspath"]
+  configurations.configureEach {
+    if (lockableConfigs.contains(it.name)) {
       resolutionStrategy.activateDependencyLocking()
     }
   }
diff --git a/docs/generation/gradle/wrapper/gradle-wrapper.jar b/docs/generation/gradle/wrapper/gradle-wrapper.jar
diff --git a/docs/generation/gradle/wrapper/gradle-wrapper.properties b/docs/generation/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/docs/generation/gradlew b/docs/generation/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/docs/generation/gradlew.bat b/docs/generation/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/gradle.properties b/gradle.properties
@@ -84,7 +84,7 @@ protobufGradlePluginVersion=0.9.5
 protobufVersion=3.25.5
 protoGoogleCommonProtosVersion=2.29.0
 javaPoetVersion=1.13.0
-shadowPluginVersion=8.1.1
+shadowPluginVersion=8.3.9
 
 # resilience4j - jdk8 compat
 resilience4jVersion=1.7.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/servicetalk-benchmarks/build.gradle b/servicetalk-benchmarks/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id "com.github.johnrengelman.shadow" version "$shadowPluginVersion"
+  id "com.gradleup.shadow" version "$shadowPluginVersion"
   id "me.champeau.jmh" version "$jmhPluginVersion"
 }
 
diff --git a/servicetalk-data-jackson-jersey3-jakarta10/build.gradle b/servicetalk-data-jackson-jersey3-jakarta10/build.gradle
@@ -37,15 +37,15 @@ compileTestJava {
 }
 
 tasks.withType(Checkstyle).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(Pmd).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).all {
-  enabled false
+  enabled = false
 }
 
 task cleanSources(type: Delete) {
diff --git a/servicetalk-data-jackson-jersey3-jakarta9/build.gradle b/servicetalk-data-jackson-jersey3-jakarta9/build.gradle
@@ -37,15 +37,15 @@ compileTestJava {
 }
 
 tasks.withType(Checkstyle).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(Pmd).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).all {
-  enabled false
+  enabled = false
 }
 
 task cleanSources(type: Delete) {
diff --git a/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle b/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle
@@ -44,15 +44,15 @@ compileTestJava {
 }
 
 tasks.withType(Checkstyle).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(Pmd).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).all {
-  enabled false
+  enabled = false
 }
 
 task cleanSources(type: Delete) {
@@ -73,6 +73,7 @@ task copySourcesForJersey3(type: Copy) {
 tasks.processResources.dependsOn(copySourcesForJersey3)
 tasks.sourcesJar.dependsOn(copySourcesForJersey3)
 tasks.compileJava.dependsOn(copySourcesForJersey3)
+tasks.generateProto.dependsOn(copySourcesForJersey3)
 tasks.generateTestProto.dependsOn(copySourcesForJersey3)
 tasks.processTestResources.dependsOn(copySourcesForJersey3)
 tasks.compileTestJava.dependsOn(copySourcesForJersey3)
diff --git a/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle b/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle
@@ -44,15 +44,15 @@ compileTestJava {
 }
 
 tasks.withType(Checkstyle).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(Pmd).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).all {
-  enabled false
+  enabled = false
 }
 
 task cleanSources(type: Delete) {
@@ -73,6 +73,7 @@ task copySourcesForJersey3(type: Copy) {
 tasks.processResources.dependsOn(copySourcesForJersey3)
 tasks.sourcesJar.dependsOn(copySourcesForJersey3)
 tasks.compileJava.dependsOn(copySourcesForJersey3)
+tasks.generateProto.dependsOn(copySourcesForJersey3)
 tasks.generateTestProto.dependsOn(copySourcesForJersey3)
 tasks.processTestResources.dependsOn(copySourcesForJersey3)
 tasks.compileTestJava.dependsOn(copySourcesForJersey3)
diff --git a/servicetalk-gradle-plugin-internal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ProjectUtils.groovy b/servicetalk-gradle-plugin-internal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ProjectUtils.groovy
@@ -30,6 +30,8 @@ import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.javadoc.Javadoc
 
+import groovy.xml.XmlParser
+
 import java.lang.reflect.Field
 
 final class ProjectUtils {
diff --git a/servicetalk-gradle-plugin-internal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ServiceTalkLibraryPlugin.groovy b/servicetalk-gradle-plugin-internal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ServiceTalkLibraryPlugin.groovy
@@ -216,7 +216,7 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin {
 
         idea {
           module {
-            testSourceDirs += fixturesDir
+            testSources.from(fixturesDir)
           }
         }
       }
@@ -259,6 +259,7 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin {
 
       dependencies {
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit5Version")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
       }
     }
   }
@@ -301,8 +302,8 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin {
       }
 
       // This task defaults to XML reporting for CI, but humans like HTML
-      tasks.withType(SpotBugsTask) {
-        reports {
+      tasks.withType(SpotBugsTask).configureEach {
+        reports.configure {
           xml.enabled = project.ext.isCiBuild
           html.enabled = !project.ext.isCiBuild
         }
diff --git a/servicetalk-grpc-protoc/build.gradle b/servicetalk-grpc-protoc/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-  id "com.github.johnrengelman.shadow" version "$shadowPluginVersion"
+  id "com.gradleup.shadow" version "$shadowPluginVersion"
   id "com.google.protobuf" version "$protobufGradlePluginVersion"
 }
 
diff --git a/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle b/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle
@@ -37,15 +37,15 @@ compileTestJava {
 }
 
 tasks.withType(Checkstyle).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(Pmd).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).all {
-  enabled false
+  enabled = false
 }
 
 task cleanSources(type: Delete) {
@@ -63,6 +63,7 @@ task copySourcesForJersey3(type: Copy) {
 tasks.processResources.dependsOn(copySourcesForJersey3)
 tasks.sourcesJar.dependsOn(copySourcesForJersey3)
 tasks.compileJava.dependsOn(copySourcesForJersey3)
+tasks.processTestResources.dependsOn(copySourcesForJersey3)
 afterEvaluate {
   if (tasks.findByName("projectHealth")) {
     tasks.withType(com.autonomousapps.tasks.CodeSourceExploderTask) {
diff --git a/servicetalk-http-router-jersey3-jakarta10/build.gradle b/servicetalk-http-router-jersey3-jakarta10/build.gradle
@@ -37,15 +37,15 @@ compileTestJava {
 }
 
 tasks.withType(Checkstyle).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(Pmd).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).all {
-  enabled false
+  enabled = false
 }
 
 task cleanSources(type: Delete) {
@@ -70,6 +70,7 @@ tasks.sourcesJar.dependsOn(copySourcesForJersey3)
 tasks.compileJava.dependsOn(copySourcesForJersey3)
 tasks.processTestResources.dependsOn(copySourcesForJersey3)
 tasks.compileTestJava.dependsOn(copySourcesForJersey3)
+tasks.processTestFixturesResources.dependsOn(copySourcesForJersey3)
 afterEvaluate {
   if (tasks.findByName("projectHealth")) {
     tasks.withType(com.autonomousapps.tasks.CodeSourceExploderTask) {
diff --git a/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle b/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle
@@ -37,15 +37,15 @@ compileTestJava {
 }
 
 tasks.withType(Checkstyle).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(Pmd).all {
-  enabled false
+  enabled = false
 }
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask).all {
-  enabled false
+  enabled = false
 }
 
 task cleanSources(type: Delete) {
@@ -63,6 +63,7 @@ task copySourcesForJersey3(type: Copy) {
 tasks.processResources.dependsOn(copySourcesForJersey3)
 tasks.sourcesJar.dependsOn(copySourcesForJersey3)
 tasks.compileJava.dependsOn(copySourcesForJersey3)
+tasks.processTestResources.dependsOn(copySourcesForJersey3)
 afterEvaluate {
   if (tasks.findByName("projectHealth")) {
     tasks.withType(com.autonomousapps.tasks.CodeSourceExploderTask) {
diff --git a/servicetalk-http-router-jersey3-jakarta9/build.gradle b/servicetalk-http-router-jersey3-jakarta9/build.gradle
diff --git a/servicetalk-http-security-jersey3-jakarta10/build.gradle b/servicetalk-http-security-jersey3-jakarta10/build.gradle
diff --git a/servicetalk-http-security-jersey3-jakarta9/build.gradle b/servicetalk-http-security-jersey3-jakarta9/build.gradle
