Browse Source

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
https://github.com/FasterXML/jackson-core/issues/824, and
https://github.com/FasterXML/jackson-module-kotlin/issues/582.

Closes gh-29405
pull/29414/head
Arjen Poutsma 3 years ago
parent
commit
ca33752267
  1. 2
      buildSrc/src/main/java/org/springframework/build/CompilerConventions.java
  2. 2
      framework-platform/framework-platform.gradle
  3. 3
      spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java

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

@ -41,7 +41,7 @@ public class CompilerConventions {
static { static {
List<String> commonCompilerArgs = Arrays.asList( List<String> commonCompilerArgs = Arrays.asList(
"-Xlint:serial", "-Xlint:cast", "-Xlint:-classfile", "-Xlint:dep-ann", "-Xlint:serial", "-Xlint:cast", "-Xlint:classfile", "-Xlint:dep-ann",
"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options", "-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options",
"-parameters" "-parameters"

2
framework-platform/framework-platform.gradle

@ -7,7 +7,7 @@ javaPlatform {
} }
dependencies { dependencies {
api(platform("com.fasterxml.jackson:jackson-bom:2.14.0-rc2")) api(platform("com.fasterxml.jackson:jackson-bom:2.14.0-rc3"))
api(platform("io.micrometer:micrometer-bom:1.10.0-RC1")) api(platform("io.micrometer:micrometer-bom:1.10.0-RC1"))
api(platform("io.netty:netty-bom:4.1.84.Final")) api(platform("io.netty:netty-bom:4.1.84.Final"))
api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))

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

@ -289,8 +289,7 @@ class Jackson2ObjectMapperBuilderTests {
// Kotlin module // Kotlin module
IntRange range = new IntRange(1, 3); IntRange range = new IntRange(1, 3);
// temporarily change the assertion, see https://github.com/FasterXML/jackson-module-kotlin/issues/582 assertThat(new String(objectMapper.writeValueAsBytes(range), "UTF-8")).isEqualTo("{\"start\":1,\"end\":3}");
assertThat(new String(objectMapper.writeValueAsBytes(range), "UTF-8")).isEqualTo("{\"start\":1,\"end\":3,\"endExclusive\":4}");
} }
@Test // gh-22576 @Test // gh-22576

Loading…
Cancel
Save