Merge branch '2.7.x' into 3.0.x

Closes gh-35319

buildSrc/build.gradle

@@ -10,19 +10,22 @@ repositories {
 	gradlePluginPortal()
 }
 
-sourceCompatibility = 17
+new File(new File("$projectDir").parentFile, "gradle.properties").withInputStream {
-targetCompatibility = 17
+	def properties = new Properties()
-
+	properties.load(it)
-ext {
+	ext.set("kotlinVersion", properties["kotlinVersion"])
-	def propertiesFile = new File(new File("$projectDir").parentFile, "gradle.properties")
+	ext.set("springFrameworkVersion", properties["springFrameworkVersion"])
-	propertiesFile.withInputStream {
+	if (properties["springFrameworkVersion"].contains("-")) {
-		def properties = new Properties()
+		repositories {
-		properties.load(it)
+			maven { url "https://repo.spring.io/milestone" }
-		set("kotlinVersion", properties["kotlinVersion"])
+			maven { url "https://repo.spring.io/snapshot" }
-		set("springFrameworkVersion", properties["springFrameworkVersion"])
+		}
 	}
 }
 
+sourceCompatibility = 17
+targetCompatibility = 17
+
 dependencies {
 	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"