Start building against Spring Data Bom 2025.1.0-RC1 snapshots

snicoll · snicoll · commit 43b06ca9b9dc · 2025-10-07T11:37:12.000+02:00
See gh-47394
diff --git a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/JacksonHttpMessageConvertersConfiguration.java b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/JacksonHttpMessageConvertersConfiguration.java
@@ -46,7 +46,7 @@ static class JacksonJsonHttpMessageConverterConfiguration {
 		@Bean
 		@ConditionalOnMissingBean(
 				ignoredType = { "org.springframework.hateoas.server.mvc.TypeConstrainedJacksonJsonHttpMessageConverter",
-						"org.springframework.data.rest.webmvc.alps.AlpsJackson3JsonHttpMessageConverter" })
+						"org.springframework.data.rest.webmvc.alps.AlpsJacksonJsonHttpMessageConverter" })
 		JacksonJsonHttpMessageConverter jacksonJsonHttpMessageConverter(JsonMapper jsonMapper) {
 			return new JacksonJsonHttpMessageConverter(jsonMapper);
 		}
diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle
@@ -2380,7 +2380,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")
 		}
 	}
-	library("Spring Data Bom", "2025.1.0-M6") {
+	library("Spring Data Bom", "2025.1.0-SNAPSHOT") {
 		considerSnapshots()
 		calendarName = "Spring Data Release"
 		group("org.springframework.data") {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static class JacksonJsonHttpMessageConverterConfiguration {`
`46`	`46`	`@Bean`
`47`	`47`	`@ConditionalOnMissingBean(`
`48`	`48`	`ignoredType = { "org.springframework.hateoas.server.mvc.TypeConstrainedJacksonJsonHttpMessageConverter",`
`49`		`- "org.springframework.data.rest.webmvc.alps.AlpsJackson3JsonHttpMessageConverter" })`
	`49`	`+ "org.springframework.data.rest.webmvc.alps.AlpsJacksonJsonHttpMessageConverter" })`
`50`	`50`	`JacksonJsonHttpMessageConverter jacksonJsonHttpMessageConverter(JsonMapper jsonMapper) {`
`51`	`51`	`return new JacksonJsonHttpMessageConverter(jsonMapper);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2380,7 +2380,7 @@ bom {`
`2380`	`2380`	`releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")`
`2381`	`2381`	`}`
`2382`	`2382`	`}`
`2383`		`- library("Spring Data Bom", "2025.1.0-M6") {`
	`2383`	`+ library("Spring Data Bom", "2025.1.0-SNAPSHOT") {`
`2384`	`2384`	`considerSnapshots()`
`2385`	`2385`	`calendarName = "Spring Data Release"`
`2386`	`2386`	`group("org.springframework.data") {`