Merge branch '7.0.x'

# Conflicts:
#	framework-platform/framework-platform.gradle

Author: jhoeller

buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

@@ -50,7 +50,7 @@ public void apply(Project project) {
 			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.4.0");
+			checkstyle.setToolVersion("13.4.2");
 			checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 			String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 			DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

framework-platform/framework-platform.gradle

@@ -12,11 +12,11 @@ dependencies {
 	api(platform("io.netty:netty-bom:4.2.13.Final"))
 	api(platform("io.projectreactor:reactor-bom:2025.0.5"))
 	api(platform("io.rsocket:rsocket-bom:1.1.5"))
-	api(platform("org.apache.groovy:groovy-bom:5.0.5"))
-	api(platform("org.apache.logging.log4j:log4j-bom:2.25.4"))
+	api(platform("org.apache.groovy:groovy-bom:5.0.6"))
+	api(platform("org.apache.logging.log4j:log4j-bom:2.26.0"))
 	api(platform("org.assertj:assertj-bom:3.27.7"))
-	api(platform("org.eclipse.jetty:jetty-bom:12.1.7"))
-	api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.7"))
+	api(platform("org.eclipse.jetty:jetty-bom:12.1.9"))
+	api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.9"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0"))
 	api(platform("org.junit:junit-bom:6.0.3"))
@@ -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.20")
-		api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.20")
-		api("org.apache.tomcat:tomcat-util:11.0.20")
-		api("org.apache.tomcat:tomcat-websocket:11.0.20")
+		api("org.apache.tomcat.embed:tomcat-embed-core:11.0.22")
+		api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.22")
+		api("org.apache.tomcat:tomcat-util:11.0.22")
+		api("org.apache.tomcat:tomcat-websocket:11.0.22")
 		api("org.aspectj:aspectjrt:1.9.25")
 		api("org.aspectj:aspectjtools:1.9.25")
 		api("org.aspectj:aspectjweaver:1.9.25")
@@ -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.3.3.Final")
+		api("org.hibernate.orm:hibernate-core:7.3.4.Final")
 		api("org.hibernate.validator:hibernate-validator:9.1.0.Final")
 		api("org.hsqldb:hsqldb:2.7.4")
 		api("org.htmlunit:htmlunit:4.21.0")