Skip to content

Commit 94536b0

Browse files
committed
Upgrade to Jackson 2.21.2
The Jackson team have ended support for Jackson 2.19.x (and 2.20.x). In response to this, this commit upgrades to Jackson 2.21.2. 2.21.x is designated as an LTS release so future minor upgrades should not be necessary. Closes gh-49365
1 parent 5cf51ba commit 94536b0

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ checkstyleToolVersion=10.12.4
1111
commonsCodecVersion=1.18.0
1212
graalVersion=22.3
1313
hamcrestVersion=3.0
14-
jacksonVersion=2.19.4
14+
jacksonVersion=2.21.2
1515
javaFormatVersion=0.0.47
1616
junitJupiterVersion=5.12.2
1717
kotlinVersion=1.9.25

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,19 @@ protected void configureJsonMapper(JsonMapper.Builder builder) {
180180
builder.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
181181
builder.configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, false);
182182
builder.configure(MapperFeature.USE_STD_BEAN_NAMING, true);
183-
builder.serializationInclusion(Include.NON_NULL);
183+
configureInclusion(builder);
184184
applyConfigurationPropertiesFilter(builder);
185185
applySerializationModifier(builder);
186186
builder.addModule(new JavaTimeModule());
187187
builder.addModule(new ConfigurationPropertiesModule());
188188
}
189189

190+
@SuppressWarnings("deprecation")
191+
private void configureInclusion(JsonMapper.Builder builder) {
192+
// Avoid using defaultPropertyInclusion to retain compatibility with Jackson 2.19.
193+
builder.serializationInclusion(Include.NON_NULL);
194+
}
195+
190196
private void applyConfigurationPropertiesFilter(JsonMapper.Builder builder) {
191197
builder.annotationIntrospector(new ConfigurationPropertiesAnnotationIntrospector());
192198
builder

0 commit comments

Comments
 (0)