Merge branch '4.0.x'

Closes gh-49016

Author: bclozel

module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/Jackson2HttpMessageConvertersConfiguration.java

@@ -17,7 +17,7 @@
 package org.springframework.boot.http.converter.autoconfigure;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import tools.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersAutoConfigurationTests.java

@@ -187,7 +187,7 @@ void jackson2CustomConverter() {
 	@Test
 	@Deprecated(since = "4.0.0", forRemoval = true)
 	@SuppressWarnings("removal")
-	void jackson2ServerAndClientConvertersShouldBeDifferent() {
+	void jackson2ServerAndClientJsonConvertersShouldBeDifferent() {
 		this.contextRunner.withUserConfiguration(Jackson2ObjectMapperConfig.class)
 			.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
 			.run((context) -> {
@@ -201,6 +201,23 @@ void jackson2ServerAndClientConvertersShouldBeDifferent() {
 			});
 	}
 
+	@Test
+	@Deprecated(since = "4.0.0", forRemoval = true)
+	@SuppressWarnings("removal")
+	void jackson2ServerAndClientXmlConvertersShouldBeDifferent() {
+		this.contextRunner.withUserConfiguration(Jackson2ObjectMapperConfig.class)
+			.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
+			.run((context) -> {
+				assertThat(context).hasSingleBean(
+						Jackson2HttpMessageConvertersConfiguration.Jackson2XmlMessageConvertersCustomizer.class);
+				HttpMessageConverter<?> serverConverter = findConverter(getServerConverters(context),
+						org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter.class);
+				HttpMessageConverter<?> clientConverter = findConverter(getClientConverters(context),
+						org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter.class);
+				assertThat(serverConverter).isNotEqualTo(clientConverter);
+			});
+	}
+
 	@Test
 	void gsonNotAvailable() {
 		this.contextRunner.run((context) -> {
@@ -579,8 +596,14 @@ JacksonJsonHttpMessageConverter customJacksonMessageConverter(JsonMapper jsonMap
 	}
 
 	@Configuration(proxyBeanMethods = false)
+	@SuppressWarnings("removal")
 	static class Jackson2ObjectMapperConfig {
 
+		@Bean
+		org.springframework.http.converter.json.Jackson2ObjectMapperBuilder objectMapperBuilder() {
+			return new org.springframework.http.converter.json.Jackson2ObjectMapperBuilder();
+		}
+
 		@Bean
 		ObjectMapper objectMapper() {
 			return new ObjectMapper();