Skip to content

Commit e8c3157

Browse files
committed
Start building against Spring Framework 6.0.1 SNAPSHOTs
See gh-33286
1 parent 12b4578 commit e8c3157

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
3434
import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
3535
import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
36-
import org.springframework.http.converter.xml.SourceHttpMessageConverter;
3736

3837
import static org.assertj.core.api.Assertions.assertThat;
3938
import static org.mockito.Mockito.mock;
@@ -55,9 +54,9 @@ void containsDefaults() {
5554
}
5655
assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class,
5756
StringHttpMessageConverter.class, ResourceHttpMessageConverter.class,
58-
ResourceRegionHttpMessageConverter.class, SourceHttpMessageConverter.class,
59-
AllEncompassingFormHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class,
60-
MappingJackson2CborHttpMessageConverter.class, MappingJackson2XmlHttpMessageConverter.class);
57+
ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class,
58+
MappingJackson2HttpMessageConverter.class, MappingJackson2CborHttpMessageConverter.class,
59+
MappingJackson2XmlHttpMessageConverter.class);
6160
}
6261

6362
@Test
@@ -125,9 +124,8 @@ protected List<HttpMessageConverter<?>> postProcessConverters(List<HttpMessageCo
125124
}
126125
assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class,
127126
StringHttpMessageConverter.class, ResourceHttpMessageConverter.class,
128-
ResourceRegionHttpMessageConverter.class, SourceHttpMessageConverter.class,
129-
AllEncompassingFormHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class,
130-
MappingJackson2CborHttpMessageConverter.class);
127+
ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class,
128+
MappingJackson2HttpMessageConverter.class, MappingJackson2CborHttpMessageConverter.class);
131129
}
132130

133131
@Test
@@ -147,7 +145,7 @@ protected List<HttpMessageConverter<?>> postProcessPartConverters(
147145
converterClasses.add(converter.getClass());
148146
}
149147
assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class,
150-
StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, SourceHttpMessageConverter.class,
148+
StringHttpMessageConverter.class, ResourceHttpMessageConverter.class,
151149
MappingJackson2HttpMessageConverter.class);
152150
}
153151

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ bom {
13571357
]
13581358
}
13591359
}
1360-
library("Spring Framework", "6.0.0") {
1360+
library("Spring Framework", "6.0.1-SNAPSHOT") {
13611361
group("org.springframework") {
13621362
imports = [
13631363
"spring-framework-bom"

0 commit comments

Comments
 (0)