Merge branch '3.1.x'

Closes gh-37820

buildSrc/build.gradle

@@ -10,47 +10,55 @@ repositories {
 	gradlePluginPortal()
 }
 
-new File(new File("$projectDir").parentFile, "gradle.properties").withInputStream {
-	def properties = new Properties()
-	properties.load(it)
-	ext.set("kotlinVersion", properties["kotlinVersion"])
-}
-
-ext.set("springFrameworkVersion", "6.0.10")
-
 sourceCompatibility = 17
 targetCompatibility = 17
 
+def versions = [:]
+new File(projectDir.parentFile, "gradle.properties").withInputStream {
+	def properties = new Properties()
+	properties.load(it)
+	["assertj", "commonsCodec", "hamcrest", "jackson", "junitJupiter",
+		"kotlin", "maven"].each {
+		versions[it] = properties[it + "Version"]
+	}
+}
+versions["springFramework"] = "6.0.12"
+ext.set("versions", versions)
+if (versions.springFramework.contains("-")) {
+	repositories {
+		maven { url "https://repo.spring.io/milestone" }
+		maven { url "https://repo.spring.io/snapshot" }
+	}
+}
+
 dependencies {
 	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
 
-	implementation(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
+	implementation(platform("org.springframework:spring-framework-bom:${versions.springFramework}"))
 	implementation("com.diffplug.gradle:goomph:3.37.2")
-	implementation("com.fasterxml.jackson.core:jackson-databind:2.11.4")
+	implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
 	implementation("com.gradle:gradle-enterprise-gradle-plugin:3.12.1")
 	implementation("com.tngtech.archunit:archunit:1.0.0")
-	implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0")
-	implementation("commons-codec:commons-codec:1.13")
+	implementation("commons-codec:commons-codec:${versions.commonsCodec}")
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
-	implementation("org.apache.maven:maven-embedder:3.6.3")
+	implementation("org.apache.maven:maven-embedder:${versions.maven}")
 	implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.3.2")
-	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-	implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}")
+	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}")
+	implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${versions.kotlin}")
 	implementation("org.springframework:spring-context")
 	implementation("org.springframework:spring-core")
 	implementation("org.springframework:spring-web")
 
-	testImplementation("org.apache.logging.log4j:log4j-core:2.17.1")
-	testImplementation("org.assertj:assertj-core:3.11.1")
-	testImplementation("org.hamcrest:hamcrest:2.2")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
+	testImplementation("org.assertj:assertj-core:${versions.assertj}")
+	testImplementation("org.hamcrest:hamcrest:${versions.hamcrest}")
+	testImplementation("org.junit.jupiter:junit-jupiter:${versions.junitJupiter}")
 	testImplementation("org.springframework:spring-test")
 
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 checkstyle {
-	toolVersion = 8.11
+	toolVersion = "10.12.4"
 }
 
 gradlePlugin {
@@ -60,8 +68,8 @@ gradlePlugin {
 			implementationClass = "org.springframework.boot.build.processors.AnnotationProcessorPlugin"
 		}
 		architecturePlugin {
-		 	id = "org.springframework.boot.architecture"
-		 	implementationClass = "org.springframework.boot.build.architecture.ArchitecturePlugin"
+			id = "org.springframework.boot.architecture"
+			implementationClass = "org.springframework.boot.build.architecture.ArchitecturePlugin"
 		}
 		autoConfigurationPlugin {
 			id = "org.springframework.boot.auto-configuration"

gradle.properties

@@ -4,7 +4,13 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 
+assertjVersion=3.24.2
+commonsCodecVersion=1.16.0
+hamcrestVersion=2.2
+jacksonVersion=2.15.2
+junitJupiterVersion=5.10.0
 kotlinVersion=1.9.10
+mavenVersion=3.9.4
 nativeBuildToolsVersion=0.9.27
 springFrameworkVersion=6.1.0-SNAPSHOT
 tomcatVersion=10.1.13

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -92,7 +92,7 @@ bom {
 			]
 		}
 	}
-	library("AssertJ", "3.24.2") {
+	library("AssertJ", "${assertjVersion}") {
 		group("org.assertj") {
 			imports = [
 				"assertj-bom"
@@ -172,7 +172,7 @@ bom {
 			]
 		}
 	}
-	library("Commons Codec", "1.16.0") {
+	library("Commons Codec", "${commonsCodecVersion}") {
 		group("commons-codec") {
 			modules = [
 				"commons-codec"
@@ -359,7 +359,7 @@ bom {
 			]
 		}
 	}
-	library("Hamcrest", "2.2") {
+	library("Hamcrest", "${hamcrestVersion}") {
 		group("org.hamcrest") {
 			modules = [
 				"hamcrest",
@@ -478,7 +478,7 @@ bom {
 			]
 		}
 	}
-	library("Jackson Bom", "2.15.2") {
+	library("Jackson Bom", "${jacksonVersion}") {
 		group("com.fasterxml.jackson") {
 			imports = [
 				"jackson-bom"
@@ -745,7 +745,7 @@ bom {
 			]
 		}
 	}
-	library("JUnit Jupiter", "5.10.0") {
+	library("JUnit Jupiter", "${junitJupiterVersion}") {
 		group("org.junit") {
 			imports = [
 				"junit-bom"

spring-boot-project/spring-boot-parent/build.gradle

@@ -87,7 +87,7 @@ bom {
 			]
 		}
 	}
-	library("Maven", "3.9.4") {
+	library("Maven", "${mavenVersion}") {
 		group("org.apache.maven") {
 			modules = [
 				"maven-core",