Skip to content

Commit 1af95a0

Browse files
committed
Upgrade to Jackson 3.0.0-rc8 and 2.20.0-rc1
Closes gh-35295
1 parent 8ec0c21 commit 1af95a0

File tree

8 files changed

+13
-11
lines changed

8 files changed

+13
-11
lines changed

framework-platform/framework-platform.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api(platform("com.fasterxml.jackson:jackson-bom:2.19.2"))
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.20.0-rc1"))
1111
api(platform("io.micrometer:micrometer-bom:1.16.0-M2"))
1212
api(platform("io.netty:netty-bom:4.2.3.Final"))
1313
api(platform("io.projectreactor:reactor-bom:2025.0.0-M6"))
@@ -21,7 +21,7 @@ dependencies {
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))
2222
api(platform("org.junit:junit-bom:5.13.4"))
2323
api(platform("org.mockito:mockito-bom:5.18.0"))
24-
api(platform("tools.jackson:jackson-bom:3.0.0-rc6"))
24+
api(platform("tools.jackson:jackson-bom:3.0.0-rc8"))
2525

2626
constraints {
2727
api("com.fasterxml:aalto-xml:1.3.2")

spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import com.fasterxml.jackson.databind.MapperFeature;
5353
import com.fasterxml.jackson.databind.Module;
5454
import com.fasterxml.jackson.databind.ObjectMapper;
55+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
5556
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
5657
import com.fasterxml.jackson.databind.SerializationFeature;
5758
import com.fasterxml.jackson.databind.SerializerProvider;
@@ -375,7 +376,7 @@ void modulesWithConsumerAfterModulesToInstall() {
375376

376377
@Test
377378
void propertyNamingStrategy() {
378-
PropertyNamingStrategy strategy = new PropertyNamingStrategy.SnakeCaseStrategy();
379+
PropertyNamingStrategy strategy = new PropertyNamingStrategies.SnakeCaseStrategy();
379380
ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().propertyNamingStrategy(strategy).build();
380381
assertThat(objectMapper.getSerializationConfig().getPropertyNamingStrategy()).isSameAs(strategy);
381382
assertThat(objectMapper.getDeserializationConfig().getPropertyNamingStrategy()).isSameAs(strategy);

spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.fasterxml.jackson.databind.MapperFeature;
4040
import com.fasterxml.jackson.databind.Module;
4141
import com.fasterxml.jackson.databind.ObjectMapper;
42+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
4243
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
4344
import com.fasterxml.jackson.databind.SerializationFeature;
4445
import com.fasterxml.jackson.databind.SerializerProvider;
@@ -222,7 +223,7 @@ private static DeserializerFactoryConfig getDeserializerFactoryConfig(ObjectMapp
222223

223224
@Test
224225
void propertyNamingStrategy() {
225-
PropertyNamingStrategy strategy = new PropertyNamingStrategy.SnakeCaseStrategy();
226+
PropertyNamingStrategy strategy = new PropertyNamingStrategies.SnakeCaseStrategy();
226227
this.factory.setPropertyNamingStrategy(strategy);
227228
this.factory.afterPropertiesSet();
228229

spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void noStaticResource() {
123123
assertThat(response.getBodyAsString().block()).isEqualTo("""
124124
{\
125125
"detail":"No static resource non-existing.",\
126-
"instance":"\\/resources\\/non-existing",\
126+
"instance":"/resources/non-existing",\
127127
"status":404,\
128128
"title":"Not Found"}\
129129
""");

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void globalExceptionHandlerWithHandlerNotFound() throws Exception {
123123
.satisfies(ex -> {
124124
assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
125125
assertThat(ex.getResponseBodyAsString()).isEqualTo("{" +
126-
"\"instance\":\"\\/no-such-handler\"," +
126+
"\"instance\":\"/no-such-handler\"," +
127127
"\"status\":404," +
128128
"\"title\":\"Not Found\"}");
129129
});
@@ -139,7 +139,7 @@ void globalExceptionHandlerWithMissingRequestParameter() throws Exception {
139139
assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
140140
assertThat(ex.getResponseBodyAsString()).isEqualTo("{" +
141141
"\"detail\":\"Required query parameter 'q' is not present.\"," +
142-
"\"instance\":\"\\/missing-request-parameter\"," +
142+
"\"instance\":\"/missing-request-parameter\"," +
143143
"\"status\":400," +
144144
"\"title\":\"Bad Request\"}");
145145
});

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private void testProblemDetailMediaType(MockServerWebExchange exchange, MediaTyp
151151
assertResponseBody(exchange,"""
152152
{\
153153
"status":400,\
154-
"instance":"\\/path",\
154+
"instance":"/path",\
155155
"title":"Bad Request"\
156156
}""");
157157
}

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void handleErrorResponse() {
242242
assertThat(exchange.getResponse().getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_PROBLEM_JSON);
243243
assertResponseBody(exchange,"""
244244
{\
245-
"instance":"\\/path",\
245+
"instance":"/path",\
246246
"status":400,\
247247
"title":"Bad Request"\
248248
}""");
@@ -262,7 +262,7 @@ void handleProblemDetail() {
262262
assertThat(exchange.getResponse().getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_PROBLEM_JSON);
263263
assertResponseBody(exchange,"""
264264
{\
265-
"instance":"\\/path",\
265+
"instance":"/path",\
266266
"status":400,\
267267
"title":"Bad Request"\
268268
}""");

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void testNoResourceFoundException() throws Exception {
142142
assertThat(response.getContentAsString()).isEqualTo("""
143143
{\
144144
"detail":"No static resource non-existing.",\
145-
"instance":"\\/cp\\/non-existing",\
145+
"instance":"/cp/non-existing",\
146146
"status":404,\
147147
"title":"Not Found"\
148148
}\

0 commit comments

Comments
 (0)