From 2abe09ea1cd42b34c21f7c40a152ac4c2c9b406c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 5 Oct 2026 17:21:03 +0200 Subject: [PATCH] Upgrade to JSpecify 1.0.1, Tomcat 11.0.26, Jetty 12.1.14, EclipseLink 5.0.2, Hibernate ORM 7.2.25, Hibernate Validator 9.1.4, Caffeine 3.3, Mockito 5.24, Checkstyle 14.3 --- .../build/CheckstyleConventions.java | 2 +- framework-platform/framework-platform.gradle | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index cb218480280..be8783dd1c7 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -55,7 +55,7 @@ public class CheckstyleConventions { project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize() .set("checkstyleNohttp".equals(checkstyle.getName()) ? "1536m" : "1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("14.1.0"); + checkstyle.setToolVersion("14.3.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 eae81e60c93..2d103535491 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,18 +15,18 @@ dependencies { 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.13")) - api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.13")) + api(platform("org.eclipse.jetty:jetty-bom:12.1.14")) + api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.14")) 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")) - api(platform("org.mockito:mockito-bom:5.23.0")) + api(platform("org.mockito:mockito-bom:5.24.0")) api(platform("tools.jackson:jackson-bom:3.0.4")) constraints { api("com.fasterxml:aalto-xml:1.3.4") api("com.fasterxml.woodstox:woodstox-core:6.7.0") - api("com.github.ben-manes.caffeine:caffeine:3.2.4") + api("com.github.ben-manes.caffeine:caffeine:3.3.0") api("com.github.librepdf:openpdf:1.3.43") api("com.google.code.findbugs:findbugs:3.0.1") api("com.google.code.findbugs:jsr305:3.0.2") @@ -96,10 +96,10 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.6") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.4.2") api("org.apache.poi:poi-ooxml:5.5.1") - api("org.apache.tomcat.embed:tomcat-embed-core:11.0.25") - api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.25") - api("org.apache.tomcat:tomcat-util:11.0.25") - api("org.apache.tomcat:tomcat-websocket:11.0.25") + api("org.apache.tomcat.embed:tomcat-embed-core:11.0.26") + api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.26") + api("org.apache.tomcat:tomcat-util:11.0.26") + api("org.apache.tomcat:tomcat-websocket:11.0.26") api("org.aspectj:aspectjrt:1.9.25") api("org.aspectj:aspectjtools:1.9.25") api("org.aspectj:aspectjweaver:1.9.25") @@ -111,7 +111,7 @@ dependencies { 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.5") - api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.1") + api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.2") api("org.eclipse:yasson:3.0.4") api("org.ehcache:ehcache:3.10.8") api("org.ehcache:jcache:1.0.1") @@ -120,14 +120,14 @@ 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.24.Final") - api("org.hibernate.validator:hibernate-validator:9.1.3.Final") + api("org.hibernate.orm:hibernate-core:7.2.25.Final") + api("org.hibernate.validator:hibernate-validator:9.1.4.Final") api("org.hsqldb:hsqldb:2.7.4") api("org.htmlunit:htmlunit:4.21.0") api("org.javamoney:moneta:1.4.4") api("org.jboss.logging:jboss-logging:3.6.1.Final") api("org.jruby:jruby:10.0.2.0") - api("org.jspecify:jspecify:1.0.0") + api("org.jspecify:jspecify:1.0.1") api("org.junit.support:testng-engine:1.1.0") api("org.mozilla:rhino:1.7.15") api("org.ogce:xpp3:1.1.6")