Merge branch '6.2.x'

# Conflicts: # framework-platform/framework-platform.gradle
spring-projects · Jan 15, 2025 · 38a41b6 · 38a41b6
2 parents b8c51a2 + 7d84427
commit 38a41b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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("10.20.2");
+			checkstyle.setToolVersion("10.21.1");
 			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
@@ -9,7 +9,7 @@ javaPlatform {
 dependencies {
 	api(platform("com.fasterxml.jackson:jackson-bom:2.18.2"))
 	api(platform("io.micrometer:micrometer-bom:1.14.3"))
-	api(platform("io.netty:netty-bom:4.1.115.Final"))
+	api(platform("io.netty:netty-bom:4.1.117.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
 	api(platform("io.projectreactor:reactor-bom:2024.0.2"))
 	api(platform("io.rsocket:rsocket-bom:1.1.4"))
@@ -31,7 +31,7 @@ dependencies {
 		api("com.google.code.findbugs:findbugs:3.0.1")
 		api("com.google.code.findbugs:jsr305:3.0.2")
 		api("com.google.code.gson:gson:2.11.0")
-		api("com.google.protobuf:protobuf-java-util:4.28.3")
+		api("com.google.protobuf:protobuf-java-util:4.29.3")
 		api("com.h2database:h2:2.3.232")
 		api("com.jayway.jsonpath:json-path:2.9.0")
 		api("com.networknt:json-schema-validator:1.5.3")

diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
@@ -1787,6 +1787,9 @@ public class MyCollectionSuperclassType extends MySuperclassType<Collection<Stri
 	public interface Consumer<T> {
 	}
 
+	public interface Consumer<T> {
+	}
+
 	public class Wildcard<T extends CharSequence> {
 	}
 
@@ -1796,7 +1799,6 @@ public class WildcardFixed extends Wildcard<String> {
 	public class WildcardConsumer<T extends CharSequence & Serializable> implements Consumer<Wildcard<T>> {
 	}
 
-
 	public class DoubleWildcard<T extends CharSequence & Serializable> {
 	}