Skip to content

Commit 59d13ad

Browse files
wilkinsonawilkinsona
committed
Merge branch '3.0.x'
2 parents 1d34bcb + ddbfacb commit 59d13ad

File tree

12 files changed

+16
-20
lines changed

12 files changed

+16
-20
lines changed

‎.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=17.0.12-librca
3+
java=17.0.15-librca

‎build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ allprojects {
1010
repositories {
1111
mavenCentral()
1212
maven {
13-
url "https://repo.spring.io/milestone"
13+
url = "https://repo.spring.io/milestone"
1414
content {
1515
includeGroup "io.micrometer"
1616
includeGroup "io.projectreactor"
1717
includeGroup "org.springframework"
1818
}
1919
}
2020
if (version.endsWith('-SNAPSHOT')) {
21-
maven { url "https://repo.spring.io/snapshot" }
21+
maven { url = "https://repo.spring.io/snapshot" }
2222
}
2323
}
2424
}
@@ -70,7 +70,7 @@ subprojects { subproject ->
7070

7171
test {
7272
testLogging {
73-
exceptionFormat "full"
73+
exceptionFormat = "full"
7474
}
7575
}
7676

‎docs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "org.asciidoctor.jvm.convert" version "3.3.2"
2+
id "org.asciidoctor.jvm.convert" version "4.0.4"
33
id "java-library"
44
}
55

‎gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

‎gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%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" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

‎settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pluginManagement {
22
repositories {
33
mavenCentral()
44
gradlePluginPortal()
5-
maven { url 'https://repo.spring.io/snapshot' }
5+
maven { url = 'https://repo.spring.io/snapshot' }
66
}
77
resolutionStrategy {
88
eachPlugin {
@@ -14,7 +14,7 @@ pluginManagement {
1414
}
1515

1616
plugins {
17-
id "io.spring.develocity.conventions" version "0.0.21"
17+
id "io.spring.develocity.conventions" version "0.0.23"
1818
}
1919

2020
rootProject.name = "spring-restdocs"

‎spring-restdocs-core/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id "io.spring.compatibility-test" version "0.0.3"
32
id "java-library"
43
id "java-test-fixtures"
54
id "maven-publish"
@@ -19,7 +18,7 @@ task jmustacheRepackJar(type: Jar) { repackJar ->
1918
repackJar.archiveVersion = jmustacheVersion
2019

2120
doLast() {
22-
project.ant {
21+
ant {
2322
taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask",
2423
classpath: configurations.jarjar.asPath
2524
jarjar(destfile: repackJar.archiveFile.get()) {

‎spring-restdocs-mockmvc/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id "io.spring.compatibility-test" version "0.0.3"
32
id "java-library"
43
id "maven-publish"
54
id "optional-dependencies"

‎spring-restdocs-restassured/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "io.spring.compatibility-test" version "0.0.3"
2+
id "io.spring.compatibility-test" version "0.0.4"
33
id "java-library"
44
id "maven-publish"
55
}

‎spring-restdocs-webtestclient/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id "io.spring.compatibility-test" version "0.0.3"
32
id "java-library"
43
id "maven-publish"
54
}

0 commit comments

Comments
 (0)