diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index 0cab73b5e26..e916cefbd74 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -50,7 +50,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("13.9.0"); + checkstyle.setToolVersion("13.10.0"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 1976abe1936..49a155ba7e4 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,14 +9,14 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.21.4")) api(platform("io.micrometer:micrometer-bom:1.18.0-SNAPSHOT")) - api(platform("io.netty:netty-bom:4.2.15.Final")) + api(platform("io.netty:netty-bom:4.2.17.Final")) api(platform("io.projectreactor:reactor-bom:2026.0.0-SNAPSHOT")) api(platform("io.rsocket:rsocket-bom:1.1.5")) - api(platform("org.apache.groovy:groovy-bom:5.0.7")) + api(platform("org.apache.groovy:groovy-bom:5.0.8")) api(platform("org.apache.logging.log4j:log4j-bom:2.26.1")) api(platform("org.assertj:assertj-bom:3.27.7")) - api(platform("org.eclipse.jetty:jetty-bom:12.1.11")) - api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.11")) + api(platform("org.eclipse.jetty:jetty-bom:12.1.12")) + api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.12")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.11.0")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0")) api(platform("org.junit:junit-bom:6.1.2")) diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractKotlinSerializationHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractKotlinSerializationHttpMessageConverter.java index c0c18525b70..a51a5b8e326 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/AbstractKotlinSerializationHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractKotlinSerializationHttpMessageConverter.java @@ -203,4 +203,5 @@ public abstract class AbstractKotlinSerializationHttpMessageConverter protected boolean supportsRepeatableWrites(T t) { return true; } + } diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java index 22b07ac1928..6f545772293 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java @@ -579,4 +579,5 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener protected boolean supportsRepeatableWrites(Object o) { return true; } + } diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java index 5cc7e5ae98f..8dbe8484bc4 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java @@ -42,7 +42,8 @@ import org.springframework.util.Assert; * @since 5.0 * @see jakarta.json.bind.Jsonb * @see jakarta.json.bind.JsonbBuilder - * @see #setJsonb + * @see #JsonbHttpMessageConverter(Jsonb) + * @see #JsonbHttpMessageConverter(JsonbConfig) */ public class JsonbHttpMessageConverter extends AbstractJsonHttpMessageConverter { @@ -120,4 +121,5 @@ public class JsonbHttpMessageConverter extends AbstractJsonHttpMessageConverter protected boolean supportsRepeatableWrites(Object o) { return true; } + } diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java index 0c383e5b958..0aebaaa4ff0 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java @@ -146,4 +146,5 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve protected boolean supportsRepeatableWrites(Object o) { return true; } + }