Merge branch '7.0.x'

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

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();

framework-platform/framework-platform.gradle

@@ -9,14 +9,14 @@ javaPlatform {
 dependencies {
 	api(platform("com.fasterxml.jackson:jackson-bom:2.21.4"))
 	api(platform("io.micrometer:micrometer-bom:1.18.0-SNAPSHOT"))
-	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:2026.0.0-SNAPSHOT"))
 	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.11.0"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0"))
 	api(platform("org.junit:junit-bom:6.1.2"))

spring-web/src/main/java/org/springframework/http/converter/AbstractKotlinSerializationHttpMessageConverter.java

@@ -203,4 +203,5 @@ public abstract class AbstractKotlinSerializationHttpMessageConverter<T extends
 	protected boolean supportsRepeatableWrites(Object object) {
 		return true;
 	}
+
 }

spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java

@@ -77,4 +77,5 @@ public class ByteArrayHttpMessageConverter extends AbstractHttpMessageConverter<
 	protected boolean supportsRepeatableWrites(byte[] bytes) {
 		return true;
 	}
+
 }

spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java

@@ -146,4 +146,5 @@ public class ObjectToStringHttpMessageConverter extends AbstractHttpMessageConve
 	protected boolean supportsRepeatableWrites(Object o) {
 		return true;
 	}
+
 }

spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java

@@ -118,4 +118,5 @@ public abstract class AbstractWireFeedHttpMessageConverter<T extends WireFeed>
 	protected boolean supportsRepeatableWrites(T t) {
 		return true;
 	}
+
 }

spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java

@@ -579,4 +579,5 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
 	protected boolean supportsRepeatableWrites(Object o) {
 		return true;
 	}
+
 }

spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java

@@ -42,7 +42,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 {
 
@@ -120,4 +121,5 @@ public class JsonbHttpMessageConverter extends AbstractJsonHttpMessageConverter
 	protected boolean supportsRepeatableWrites(Object o) {
 		return true;
 	}
+
 }

spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java

@@ -146,4 +146,5 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve
 	protected boolean supportsRepeatableWrites(Object o) {
 		return true;
 	}
+
 }