Merge branch '3.2.x'

Closes gh-40931

gradle.properties

@@ -15,6 +15,7 @@ kotlinVersion=1.9.24
 mavenVersion=3.9.4
 nativeBuildToolsVersion=0.10.2
 springFrameworkVersion=6.1.8
+springFramework60xVersion=6.0.21
 tomcatVersion=10.1.24
 snakeYamlVersion=2.2
 

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle

@@ -17,7 +17,7 @@ configurations.all {
 			// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
 			// multi-version jar files with bytecode in META-INF/versions/21
 			if (dependency.requested.group.equals("org.springframework")) {
-				dependency.useVersion("6.0.10")
+				dependency.useVersion("$springFramework60xVersion")
 			}
 		}
 	}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@@ -53,7 +53,7 @@ configurations {
 				// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
 				// multi-version jar files with bytecode in META-INF/versions/21
 				if (dependency.requested.group.equals("org.springframework")) {
-					dependency.useVersion("6.0.10")
+					dependency.useVersion("$springFramework60xVersion")
 				}
 			}
 		}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle

@@ -27,7 +27,7 @@ configurations {
 				// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
 				// multi-version jar files with bytecode in META-INF/versions/21
 				if (dependency.requested.group.equals("org.springframework")) {
-					dependency.useVersion("6.0.10")
+					dependency.useVersion("$springFramework60xVersion")
 				}
 			}
 		}

spring-boot-system-tests/spring-boot-image-tests/build.gradle

@@ -22,7 +22,7 @@ configurations {
 				// Downgrade Spring Framework as Gradle cannot cope with 6.1.0-M1's
 				// multi-version jar files with bytecode in META-INF/versions/21
 				if (dependency.requested.group.equals("org.springframework")) {
-					dependency.useVersion("6.0.10")
+					dependency.useVersion("$springFramework60xVersion")
 				}
 			}
 		}