From 2baf70768d96407c6c1c0deb205dce8169715f93 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Sat, 21 Dec 2024 15:49:31 +0100
Subject: [PATCH 1/2] Upgrade to AssertJ 3.27

---
 framework-platform/framework-platform.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
index 982626155c8..51228b9578a 100644
--- 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:2.21.1"))
-	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.8.1"))

From 99cb6ba0a79a04833c9bf2d3a2e4b3cc05905bbf Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Sat, 21 Dec 2024 16:02:15 +0100
Subject: [PATCH 2/2] Upgrade to Gradle 8.12

---
 build.gradle                             | 6 +++---
 framework-api/framework-api.gradle       | 4 ++--
 framework-docs/framework-docs.gradle     | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 3 +--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b19a9a88b3..2bc2520c9d4 100644
--- 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
index e8477518793..c8456268c14 100644
--- 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
index 9c63ab41298..5850c2f51d4 100644
--- 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2847c82004..cea7a793a84 100644
--- 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
index f5feea6d6b1..f3b75f3b0d4 100755
--- 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