Skip to content

Commit ca33752

Browse files
committed
Upgrade to Jackson 2.14.0-rc3
This commit upgrades Jackson to 2.14.0-rc3, which resolves two outstanding issues Spring Framework had with rc2. This commit reverts the changes made due to those issues, see FasterXML/jackson-core#824, and FasterXML/jackson-module-kotlin#582. Closes gh-29405
1 parent bf3b7b8 commit ca33752

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

buildSrc/src/main/java/org/springframework/build/CompilerConventions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class CompilerConventions {
4141

4242
static {
4343
List<String> commonCompilerArgs = Arrays.asList(
44-
"-Xlint:serial", "-Xlint:cast", "-Xlint:-classfile", "-Xlint:dep-ann",
44+
"-Xlint:serial", "-Xlint:cast", "-Xlint:classfile", "-Xlint:dep-ann",
4545
"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
4646
"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options",
4747
"-parameters"

framework-platform/framework-platform.gradle

+1-1
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.14.0-rc2"))
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.14.0-rc3"))
1111
api(platform("io.micrometer:micrometer-bom:1.10.0-RC1"))
1212
api(platform("io.netty:netty-bom:4.1.84.Final"))
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,7 @@ void wellKnownModules() throws JsonProcessingException, UnsupportedEncodingExcep
289289

290290
// Kotlin module
291291
IntRange range = new IntRange(1, 3);
292-
// temporarily change the assertion, see https://github.com/FasterXML/jackson-module-kotlin/issues/582
293-
assertThat(new String(objectMapper.writeValueAsBytes(range), "UTF-8")).isEqualTo("{\"start\":1,\"end\":3,\"endExclusive\":4}");
292+
assertThat(new String(objectMapper.writeValueAsBytes(range), "UTF-8")).isEqualTo("{\"start\":1,\"end\":3}");
294293
}
295294

296295
@Test // gh-22576

0 commit comments

Comments
 (0)