From e8c3157db577520029c16d18c0572d49a1671e3b Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 21 Nov 2022 20:53:37 +0100 Subject: [PATCH] Start building against Spring Framework 6.0.1 SNAPSHOTs See gh-33286 --- .../http/HttpMessageConvertersTests.java | 14 ++++++-------- .../spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java index 6d8f341d5902..7dc3da4c8c18 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java @@ -33,7 +33,6 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter; -import org.springframework.http.converter.xml.SourceHttpMessageConverter; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -55,9 +54,9 @@ void containsDefaults() { } assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, - ResourceRegionHttpMessageConverter.class, SourceHttpMessageConverter.class, - AllEncompassingFormHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class, - MappingJackson2CborHttpMessageConverter.class, MappingJackson2XmlHttpMessageConverter.class); + ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class, + MappingJackson2HttpMessageConverter.class, MappingJackson2CborHttpMessageConverter.class, + MappingJackson2XmlHttpMessageConverter.class); } @Test @@ -125,9 +124,8 @@ protected List> postProcessConverters(List> postProcessPartConverters( converterClasses.add(converter.getClass()); } assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class, - StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, SourceHttpMessageConverter.class, + StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 57f69c172c37..88a8041321ec 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1357,7 +1357,7 @@ bom { ] } } - library("Spring Framework", "6.0.0") { + library("Spring Framework", "6.0.1-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom"