Skip to content

Commit 8ebc22c

Browse files
committed
Move to Spring Framework 7.0.0-SNAPSHOT
* Fix `ConfigurableCompositeMessageConverter` according to SF requirements
1 parent a4f96cc commit 8ebc22c

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ ext {
106106
springKafkaVersion = '4.0.0-SNAPSHOT'
107107
springRetryVersion = '2.0.12'
108108
springSecurityVersion = '7.0.0-SNAPSHOT'
109-
springVersion = '7.0.0-M8'
109+
springVersion = '7.0.0-SNAPSHOT'
110110
springWsVersion = '5.0.0-SNAPSHOT'
111111
testcontainersVersion = '1.21.3'
112112
tomcatVersion = '11.0.10'

spring-integration-core/src/main/java/org/springframework/integration/support/converter/ConfigurableCompositeMessageConverter.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@
2222
import java.util.stream.Collectors;
2323
import java.util.stream.Stream;
2424

25-
import tools.jackson.databind.ObjectMapper;
26-
2725
import org.springframework.beans.BeansException;
2826
import org.springframework.beans.factory.BeanFactory;
2927
import org.springframework.beans.factory.BeanFactoryAware;
3028
import org.springframework.beans.factory.InitializingBean;
3129
import org.springframework.core.convert.ConversionService;
3230
import org.springframework.core.convert.support.DefaultConversionService;
33-
import org.springframework.integration.support.json.JacksonJsonObjectMapper;
3431
import org.springframework.integration.support.json.JacksonPresent;
3532
import org.springframework.integration.support.utils.IntegrationUtils;
3633
import org.springframework.messaging.converter.ByteArrayMessageConverter;
@@ -114,8 +111,7 @@ private static Collection<MessageConverter> initDefaults() {
114111
List<MessageConverter> converters = new LinkedList<>();
115112

116113
if (JacksonPresent.isJackson3Present()) {
117-
ObjectMapper objectMapper = new JacksonJsonObjectMapper().getObjectMapper();
118-
JacksonJsonMessageConverter jsonMessageConverter = new JacksonJsonMessageConverter(objectMapper);
114+
JacksonJsonMessageConverter jsonMessageConverter = new JacksonJsonMessageConverter();
119115
jsonMessageConverter.setStrictContentTypeMatch(true);
120116
converters.add(jsonMessageConverter);
121117
}

0 commit comments

Comments
 (0)