Upgrade Spring Projects to latest available Snapshot / Milestones

snicoll · philwebb · commit 3b2c5e86da8a · 2025-05-09T17:38:10.000-07:00
See gh-45487 See gh-45488 See gh-45489 See gh-45490 See gh-45491 See gh-45492
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ mavenVersion=3.9.4
 mockitoVersion=5.17.0
 nativeBuildToolsVersion=0.10.6
 snakeYamlVersion=2.4
-springFrameworkVersion=6.2.7-SNAPSHOT
+springFrameworkVersion=7.0.0-SNAPSHOT
 springFramework60xVersion=6.0.23
 tomcatVersion=11.0.6
 
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -2169,11 +2169,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")
 		}
 	}
-	library("Spring Data Bom", "2025.0.0-SNAPSHOT") {
-		prohibit {
-			versionRange "[2025.1.0-M1,)"
-			because "it exceeds our baseline"
-		}
+	library("Spring Data Bom", "2025.1.0-M2") {
 		considerSnapshots()
 		calendarName = "Spring Data Release"
 		group("org.springframework.data") {
@@ -2186,10 +2182,6 @@ bom {
 		}
 	}
 	library("Spring Framework", "${springFrameworkVersion}") {
-		prohibit {
-			versionRange "[7.0.0-M1,)"
-			because "it exceeds our baseline"
-		}
 		considerSnapshots()
 		group("org.springframework") {
 			bom("spring-framework-bom")
@@ -2225,11 +2217,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-graphql/releases/tag/v{version}")
 		}
 	}
-	library("Spring HATEOAS", "2.5.0-RC1") {
-		prohibit {
-			versionRange "[3.0.0-M1,)"
-			because "it exceeds our baseline"
-		}
+	library("Spring HATEOAS", "3.0.0-M2") {
 		considerSnapshots()
 		group("org.springframework.hateoas") {
 			modules = [
@@ -2261,7 +2249,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}")
 		}
 	}
-	library("Spring Kafka", "3.3.6-SNAPSHOT") {
+	library("Spring Kafka", "4.0.0-SNAPSHOT") {
 		considerSnapshots()
 		group("org.springframework.kafka") {
 			modules = [
@@ -2314,7 +2302,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-pulsar/releases/tag/v{version}")
 		}
 	}
-	library("Spring RESTDocs", "3.0.3") {
+	library("Spring RESTDocs", "4.0.0-SNAPSHOT") {
 		considerSnapshots()
 		group("org.springframework.restdocs") {
 			bom("spring-restdocs-bom")
@@ -2342,7 +2330,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-retry/releases/tag/v{version}")
 		}
 	}
-	library("Spring Security", "6.5.0-SNAPSHOT") {
+	library("Spring Security", "7.0.0-SNAPSHOT") {
 		considerSnapshots()
 		group("org.springframework.security") {
 			bom("spring-security-bom")

Original file line number	Diff line number	Diff line change
`@@ -2169,11 +2169,7 @@ bom {`
`2169`	`2169`	`releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")`
`2170`	`2170`	`}`
`2171`	`2171`	`}`
`2172`		`- library("Spring Data Bom", "2025.0.0-SNAPSHOT") {`
`2173`		`- prohibit {`
`2174`		`- versionRange "[2025.1.0-M1,)"`
`2175`		`- because "it exceeds our baseline"`
`2176`		`- }`
	`2172`	`+ library("Spring Data Bom", "2025.1.0-M2") {`
`2177`	`2173`	`considerSnapshots()`
`2178`	`2174`	`calendarName = "Spring Data Release"`
`2179`	`2175`	`group("org.springframework.data") {`
`@@ -2186,10 +2182,6 @@ bom {`
`2186`	`2182`	`}`
`2187`	`2183`	`}`
`2188`	`2184`	`library("Spring Framework", "${springFrameworkVersion}") {`
`2189`		`- prohibit {`
`2190`		`- versionRange "[7.0.0-M1,)"`
`2191`		`- because "it exceeds our baseline"`
`2192`		`- }`
`2193`	`2185`	`considerSnapshots()`
`2194`	`2186`	`group("org.springframework") {`
`2195`	`2187`	`bom("spring-framework-bom")`
`@@ -2225,11 +2217,7 @@ bom {`
`2225`	`2217`	`releaseNotes("https://github.com/spring-projects/spring-graphql/releases/tag/v{version}")`
`2226`	`2218`	`}`
`2227`	`2219`	`}`
`2228`		`- library("Spring HATEOAS", "2.5.0-RC1") {`
`2229`		`- prohibit {`
`2230`		`- versionRange "[3.0.0-M1,)"`
`2231`		`- because "it exceeds our baseline"`
`2232`		`- }`
	`2220`	`+ library("Spring HATEOAS", "3.0.0-M2") {`
`2233`	`2221`	`considerSnapshots()`
`2234`	`2222`	`group("org.springframework.hateoas") {`
`2235`	`2223`	`modules = [`
`@@ -2261,7 +2249,7 @@ bom {`
`2261`	`2249`	`releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}")`
`2262`	`2250`	`}`
`2263`	`2251`	`}`
`2264`		`- library("Spring Kafka", "3.3.6-SNAPSHOT") {`
	`2252`	`+ library("Spring Kafka", "4.0.0-SNAPSHOT") {`
`2265`	`2253`	`considerSnapshots()`
`2266`	`2254`	`group("org.springframework.kafka") {`
`2267`	`2255`	`modules = [`
`@@ -2314,7 +2302,7 @@ bom {`
`2314`	`2302`	`releaseNotes("https://github.com/spring-projects/spring-pulsar/releases/tag/v{version}")`
`2315`	`2303`	`}`
`2316`	`2304`	`}`
`2317`		`- library("Spring RESTDocs", "3.0.3") {`
	`2305`	`+ library("Spring RESTDocs", "4.0.0-SNAPSHOT") {`
`2318`	`2306`	`considerSnapshots()`
`2319`	`2307`	`group("org.springframework.restdocs") {`
`2320`	`2308`	`bom("spring-restdocs-bom")`
`@@ -2342,7 +2330,7 @@ bom {`
`2342`	`2330`	`releaseNotes("https://github.com/spring-projects/spring-retry/releases/tag/v{version}")`
`2343`	`2331`	`}`
`2344`	`2332`	`}`
`2345`		`- library("Spring Security", "6.5.0-SNAPSHOT") {`
	`2333`	`+ library("Spring Security", "7.0.0-SNAPSHOT") {`
`2346`	`2334`	`considerSnapshots()`
`2347`	`2335`	`group("org.springframework.security") {`
`2348`	`2336`	`bom("spring-security-bom")`