diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index b38cba76cf8..1fdfb947696 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("11.0.1"); + checkstyle.setToolVersion("12.0.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 40bdace390e..333d86e2598 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,8 +15,8 @@ dependencies { api(platform("org.apache.groovy:groovy-bom:5.0.1")) api(platform("org.apache.logging.log4j:log4j-bom:2.25.1")) api(platform("org.assertj:assertj-bom:3.27.6")) - api(platform("org.eclipse.jetty:jetty-bom:12.1.1")) - api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.1")) + api(platform("org.eclipse.jetty:jetty-bom:12.1.2")) + api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.2")) 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.0")) @@ -97,10 +97,10 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.5") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.5") api("org.apache.poi:poi-ooxml:5.2.5") - api("org.apache.tomcat.embed:tomcat-embed-core:11.0.11") - api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.11") - api("org.apache.tomcat:tomcat-util:11.0.11") - api("org.apache.tomcat:tomcat-websocket:11.0.11") + api("org.apache.tomcat.embed:tomcat-embed-core:11.0.12") + api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.12") + api("org.apache.tomcat:tomcat-util:11.0.12") + api("org.apache.tomcat:tomcat-websocket:11.0.12") api("org.aspectj:aspectjrt:1.9.24") api("org.aspectj:aspectjtools:1.9.24") api("org.aspectj:aspectjweaver:1.9.24") @@ -111,8 +111,8 @@ 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.0.12") - api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B10") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.0") + 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") api("org.ehcache:jcache:1.0.1") @@ -121,7 +121,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.1.2.Final") + api("org.hibernate.orm:hibernate-core:7.2.0.CR1") api("org.hibernate.validator:hibernate-validator:9.0.1.Final") api("org.hsqldb:hsqldb:2.7.4") api("org.htmlunit:htmlunit:4.17.0")