From 14790493f4360542ff6e2531c2407d8b67cff0a3 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 5 Dec 2025 17:03:57 +0100 Subject: [PATCH] Upgrade to Log4J 2.25.2, Groovy 5.0.3, Jetty 12.1.5, Jetty Reactive HttpClient 4.1.4, Checkstyle 12.2 --- .../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 3b3f46bcae6..42e85e62b05 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("12.1.2"); + checkstyle.setToolVersion("12.2.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 34b195e23f3..cccf7b90b18 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -12,11 +12,11 @@ dependencies { api(platform("io.netty:netty-bom:4.2.7.Final")) api(platform("io.projectreactor:reactor-bom:2025.0.0")) api(platform("io.rsocket:rsocket-bom:1.1.5")) - api(platform("org.apache.groovy:groovy-bom:5.0.2")) - api(platform("org.apache.logging.log4j:log4j-bom:2.25.1")) + api(platform("org.apache.groovy:groovy-bom:5.0.3")) + api(platform("org.apache.logging.log4j:log4j-bom:2.25.2")) api(platform("org.assertj:assertj-bom:3.27.6")) - api(platform("org.eclipse.jetty:jetty-bom:12.1.4")) - api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.4")) + api(platform("org.eclipse.jetty:jetty-bom:12.1.5")) + api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.5")) 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.1")) @@ -111,7 +111,7 @@ dependencies { api("org.dom4j:dom4j:2.2.0") api("org.easymock:easymock:5.6.0") api("org.eclipse.angus:angus-mail:2.0.3") - api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.0") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.4") api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B11") api("org.eclipse:yasson:3.0.4") api("org.ehcache:ehcache:3.10.8")