Merge branch '3.0.x'

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.12-librca
+java=17.0.15-librca

build.gradle

@@ -10,7 +10,7 @@ allprojects {
 	repositories {
 		mavenCentral()
 		maven {
-			url "https://repo.spring.io/milestone"
+			url = "https://repo.spring.io/milestone"
 			content {
 				includeGroup "io.micrometer"
 				includeGroup "io.projectreactor"
@@ -18,7 +18,7 @@ allprojects {
 			}
 		}
 		if (version.endsWith('-SNAPSHOT')) {
-			maven { url "https://repo.spring.io/snapshot" }
+			maven { url = "https://repo.spring.io/snapshot" }
 		}
 	}
 }
@@ -70,7 +70,7 @@ subprojects { subproject ->
 
 		test {
 			testLogging {
-				exceptionFormat "full"
+				exceptionFormat = "full"
 			}
 		}
 

docs/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id "org.asciidoctor.jvm.convert" version "3.3.2"
+	id "org.asciidoctor.jvm.convert" version "4.0.4"
 	id "java-library"
 }
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,8 +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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || 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
@@ -115,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.
@@ -206,7 +205,7 @@ 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.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 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.bat

@@ -70,11 +70,11 @@ 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

settings.gradle

@@ -2,7 +2,7 @@ pluginManagement {
 	repositories {
 		mavenCentral()
 		gradlePluginPortal()
-		maven { url 'https://repo.spring.io/snapshot' }
+		maven { url = 'https://repo.spring.io/snapshot' }
 	}
 	resolutionStrategy {
 		eachPlugin {
@@ -14,7 +14,7 @@ pluginManagement {
 }
 
 plugins {
-	id "io.spring.develocity.conventions" version "0.0.21"
+	id "io.spring.develocity.conventions" version "0.0.23"
 }
 
 rootProject.name = "spring-restdocs"

spring-restdocs-core/build.gradle

@@ -1,5 +1,4 @@
 plugins {
-	id "io.spring.compatibility-test" version "0.0.3"
 	id "java-library"
 	id "java-test-fixtures"
 	id "maven-publish"
@@ -19,7 +18,7 @@ task jmustacheRepackJar(type: Jar) { repackJar ->
 	repackJar.archiveVersion = jmustacheVersion
 
 	doLast() {
-		project.ant {
+		ant {
 			taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask",
 				classpath: configurations.jarjar.asPath
 			jarjar(destfile: repackJar.archiveFile.get()) {

spring-restdocs-mockmvc/build.gradle

@@ -1,5 +1,4 @@
 plugins {
-	id "io.spring.compatibility-test" version "0.0.3"
 	id "java-library"
 	id "maven-publish"
 	id "optional-dependencies"

spring-restdocs-restassured/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id "io.spring.compatibility-test" version "0.0.3"
+	id "io.spring.compatibility-test" version "0.0.4"
 	id "java-library"
 	id "maven-publish"
 }

spring-restdocs-webtestclient/build.gradle

@@ -1,5 +1,4 @@
 plugins {
-	id "io.spring.compatibility-test" version "0.0.3"
 	id "java-library"
 	id "maven-publish"
 }