diff --git a/buildSrc/src/main/java/org/springframework/build/CompilerConventions.java b/buildSrc/src/main/java/org/springframework/build/CompilerConventions.java index cc27631751e..dda5eaee0d7 100644 --- a/buildSrc/src/main/java/org/springframework/build/CompilerConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CompilerConventions.java @@ -41,7 +41,7 @@ public class CompilerConventions { static { List 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:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options", "-parameters" diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index c42e2d251bb..ee52a8f1f57 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -7,7 +7,7 @@ javaPlatform { } 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.netty:netty-bom:4.1.84.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java index 3c42a78ed88..1f489ab00d0 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java @@ -289,8 +289,7 @@ class Jackson2ObjectMapperBuilderTests { // Kotlin module 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,\"endExclusive\":4}"); + assertThat(new String(objectMapper.writeValueAsBytes(range), "UTF-8")).isEqualTo("{\"start\":1,\"end\":3}"); } @Test // gh-22576