From 43b06ca9b9dc18e46dc17a077e086331b74e48f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 3 Oct 2025 15:00:58 +0200 Subject: [PATCH] Start building against Spring Data Bom 2025.1.0-RC1 snapshots See gh-47394 --- .../JacksonHttpMessageConvertersConfiguration.java | 2 +- platform/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index d86d1327599..0856daf2269 100644 --- 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 @@ class JacksonHttpMessageConvertersConfiguration { @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 index 0301ec21c15..20fceb10085 100644 --- 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") {