From 176bc2a1337d1987cc9a763be7a90cb8d4cdf9ad Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 11 Aug 2026 23:08:52 +0200 Subject: [PATCH 1/2] Upgrade to Groovy 5.0.8, Jetty 12.1.12, Netty 4.2.17, Hibernate ORM 7.2.24, Checkstyle 13.10 --- .../springframework/build/CheckstyleConventions.java | 2 +- framework-platform/framework-platform.gradle | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 95a12bf91de..645efed2fa3 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.20.2")) api(platform("io.micrometer:micrometer-bom:1.16.6")) - 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:2025.0.6")) 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.10.2")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0")) api(platform("org.junit:junit-bom:6.0.3")) @@ -120,7 +120,7 @@ dependencies { api("org.glassfish:jakarta.el:4.0.2") api("org.graalvm.sdk:graal-sdk:22.3.1") api("org.hamcrest:hamcrest:3.0") - api("org.hibernate.orm:hibernate-core:7.2.23.Final") + api("org.hibernate.orm:hibernate-core:7.2.24.Final") api("org.hibernate.validator:hibernate-validator:9.1.3.Final") api("org.hsqldb:hsqldb:2.7.4") api("org.htmlunit:htmlunit:4.21.0") From abd323d42856a83dd35030eb6504b5e30efd87a0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 11 Aug 2026 23:10:15 +0200 Subject: [PATCH 2/2] Polishing --- .../AbstractKotlinSerializationHttpMessageConverter.java | 1 + .../http/converter/ByteArrayHttpMessageConverter.java | 1 + .../http/converter/ObjectToStringHttpMessageConverter.java | 1 + .../converter/feed/AbstractWireFeedHttpMessageConverter.java | 1 + .../converter/json/AbstractJackson2HttpMessageConverter.java | 1 + .../http/converter/json/JsonbHttpMessageConverter.java | 4 +++- .../http/converter/xml/MarshallingHttpMessageConverter.java | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) 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 c49057a7ace..8013072c8ec 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 @@ -197,4 +197,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 62a8219bb45..568cbfe5345 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 @@ -573,4 +573,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 53300311cf2..4296b6f3b6a 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 @@ -41,7 +41,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 { @@ -114,4 +115,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 459436a4fcf..82ddf03d361 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 @@ -140,4 +140,5 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve protected boolean supportsRepeatableWrites(Object o) { return true; } + }