From 842afa4381a7eb4c2dc1b5cf5303f3097be9ee20 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Mon, 30 Sep 2024 12:02:42 +0100
Subject: [PATCH] Upgrade to Jackson 2.18.0

Closes gh-42480
---
 gradle.properties                                             | 2 +-
 .../autoconfigure/jackson/JacksonAutoConfigurationTests.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 68db301a46..6b87ac828c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ checkstyleToolVersion=10.12.4
 commonsCodecVersion=1.17.1
 graalVersion=22.3
 hamcrestVersion=2.2
-jacksonVersion=2.17.2
+jacksonVersion=2.18.0
 javaFormatVersion=0.0.43
 junitJupiterVersion=5.11.0
 kotlinVersion=1.9.25
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
index 3e8dcf01c8..f23b82867e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
@@ -49,6 +49,7 @@ import com.fasterxml.jackson.databind.cfg.EnumFeature;
 import com.fasterxml.jackson.databind.cfg.JsonNodeFeature;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
 import com.fasterxml.jackson.databind.util.StdDateFormat;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import org.assertj.core.api.InstanceOfAssertFactories;
@@ -318,7 +319,8 @@ class JacksonAutoConfigurationTests {
 		this.contextRunner.withUserConfiguration(ModuleConfig.class).run((context) -> {
 			ObjectMapper objectMapper = context.getBean(Jackson2ObjectMapperBuilder.class).build();
 			assertThat(context.getBean(CustomModule.class).getOwners()).contains(objectMapper);
-			assertThat(objectMapper.canSerialize(Baz.class)).isTrue();
+			assertThat(((DefaultSerializerProvider) objectMapper.getSerializerProviderInstance())
+				.hasSerializerFor(Baz.class, null)).isTrue();
 		});
 	}