Merge branch '6.2.x'

sbrannen · Dec 21, 2024 · bf06d74 · bf06d74
2 parents 5b8e436 + 99cb6ba
commit bf06d74
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,17 +25,17 @@ configure(allprojects) { project ->
 	repositories {
 		mavenCentral()
 		maven {
-			url "https://repo.spring.io/milestone"
+			url = "https://repo.spring.io/milestone"
 			content {
 				// Netty 5 optional support
 				includeGroup 'io.projectreactor.netty'
 			}
 		}
 		if (version.contains('-')) {
-			maven { url "https://repo.spring.io/milestone" }
+			maven { url = "https://repo.spring.io/milestone" }
 		}
 		if (version.endsWith('-SNAPSHOT')) {
-			maven { url "https://repo.spring.io/snapshot" }
+			maven { url = "https://repo.spring.io/snapshot" }
 		}
 	}
 	configurations.all {

diff --git a/framework-api/framework-api.gradle b/framework-api/framework-api.gradle
@@ -9,7 +9,7 @@ apply from: "${rootDir}/gradle/publications.gradle"
 
 repositories {
 	maven {
-		url "https://repo.spring.io/release"
+		url = "https://repo.spring.io/release"
 	}
 }
 
@@ -87,7 +87,7 @@ tasks.register('schemaZip', Zip) {
 	archiveClassifier.set("schema")
 	description = "Builds -${archiveClassifier} archive containing all " +
 			"XSDs for deployment at https://springframework.org/schema."
-	duplicatesStrategy DuplicatesStrategy.EXCLUDE
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 	moduleProjects.each { module ->
 		def Properties schemas = new Properties();
 

diff --git a/framework-docs/framework-docs.gradle b/framework-docs/framework-docs.gradle
@@ -37,7 +37,7 @@ javadoc {
 
 repositories {
 	maven {
-		url "https://repo.spring.io/release"
+		url = "https://repo.spring.io/release"
 	}
 }
 

diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
@@ -15,7 +15,7 @@ dependencies {
 	api(platform("io.rsocket:rsocket-bom:1.1.4"))
 	api(platform("org.apache.groovy:groovy-bom:4.0.24"))
 	api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3"))
-	api(platform("org.assertj:assertj-bom:3.26.3"))
+	api(platform("org.assertj:assertj-bom:3.27.0"))
 	api(platform("org.eclipse.jetty:jetty-bom:12.0.15"))
 	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"))

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.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ javadoc { @@
     repositories {
     	maven {
-    		url "https://repo.spring.io/release"
+    		url = "https://repo.spring.io/release"
     	}
     }
@@ Expand Down @@