Update to Gradle 9.1.0

Updates to Gradle version 9.1.0 and updates the Shadow plugin to
version 9.2.2.

Signed-off-by: onobc <[email protected]>

Author: onobc

buildSrc/build.gradle

@@ -19,9 +19,6 @@ if (springVersion.contains("-")) {
 	}
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
 sourceSets {
 	main {
 		java { srcDirs = [] }

buildSrc/src/main/groovy/spring-pulsar.integration-test-conventions.gradle

@@ -14,6 +14,13 @@
  * the License.
  */
 
+sourceSets {
+	intTest {
+		compileClasspath += sourceSets.main.output + project.configurations.intTestCompileClasspath
+		runtimeClasspath += sourceSets.main.output + project.configurations.intTestRuntimeClasspath
+	}
+}
+
 configurations {
 	intTestImplementation {
 		extendsFrom testImplementation
@@ -31,13 +38,6 @@ configurations {
 	}
 }
 
-sourceSets {
-	intTest {
-		compileClasspath += sourceSets.main.output + project.configurations.intTestCompileClasspath
-		runtimeClasspath += sourceSets.main.output + project.configurations.intTestRuntimeClasspath
-	}
-}
-
 tasks.register('integrationTest', Test) {
 	description = 'Runs integration tests.'
 	group = 'verification'

gradle/build-libs.versions.toml

@@ -5,7 +5,7 @@ commons-compress = "1.26.2"
 groovy = "2.5.17"
 jackson = "2.19.1"
 javaformat = "0.0.47"
-jfrog = "4.31.9"
+jfrog = "6.0.1"
 maven = "3.6.3"
 nexus-publish = "1.3.0"
 nohttp = "0.0.11"

gradle/libs.versions.toml

@@ -33,7 +33,7 @@ antora-yml = "0.0.1"
 download = "5.6.0"
 grgit = "5.2.2"
 nohttp = "0.0.11"
-shadow = "8.1.1"
+shadow = "9.2.2"
 versions = "0.52.0"
 version-catalog-update = "0.8.5"
 protobuf-plugin = "0.9.5"
@@ -75,7 +75,7 @@ antora = { id = "org.antora", version.ref = "antora" }
 antora-yml = { id = "io.spring.antora.generate-antora-yml", version.ref = "antora-yml" }
 download = { id = "de.undercouch.download", version.ref = "download" }
 grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
 spring-dep-mgmt = { id = "io.spring.dependency-management", version.ref = "spring-dep-mgmt" }
 versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%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" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -15,12 +15,8 @@ jar {
 	archiveClassifier.set('original')
 }
 
-shadowJar {
-	archiveClassifier.set(null)
-	dependsOn(project.tasks.jar)
-	manifest {
-		inheritFrom project.tasks.jar.manifest
-	}
+tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
+	archiveClassifier = ''
 	from("${rootProject.projectDir}/src/dist") {
 		include 'notice.txt'
 		into 'META-INF'
@@ -33,22 +29,19 @@ shadowJar {
 	relocate 'com.github.benmanes.caffeine', 'org.springframework.pulsar.shade.com.github.benmanes.caffeine'
 	relocate 'com.google', 'org.springframework.pulsar.shade.com.google'
 	dependencies {
-		exclude(dependency {
+		exclude {
 			!['com.github.ben-manes.caffeine', 'com.google.errorprone'].contains(it.moduleGroup)
-		})
+		}
 	}
 }
 
-tasks.build.dependsOn tasks.shadowJar
-
 // disable module metadata - otherwise original jar will be used when published
 tasks.withType(GenerateModuleMetadata) {
 	enabled = false
 }
 
-// delay the maven publishing - instead add shadowJar to the publication
-components.java.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
-	skip()
+shadow {
+	addShadowVariantIntoJavaComponent = false
 }
 
 publishing {

spring-pulsar-cache-provider-caffeine/spring-pulsar-cache-provider-caffeine.gradle

@@ -4,7 +4,11 @@ plugins {
 
 group = 'org.springframework.pulsar.sample'
 description = 'Sample Signup Pulsar Function'
-sourceCompatibility = '1.8'
+
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 repositories { 
 	mavenCentral()