Merge branch '6.2.x'

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

spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java

@@ -1787,6 +1787,9 @@ class ResolvableTypeTests {
 	public interface Consumer<T> {
 	}
 
+	public interface Consumer<T> {
+	}
+
 	public class Wildcard<T extends CharSequence> {
 	}
 
@@ -1796,7 +1799,6 @@ class ResolvableTypeTests {
 	public class WildcardConsumer<T extends CharSequence & Serializable> implements Consumer<Wildcard<T>> {
 	}
 
-
 	public class DoubleWildcard<T extends CharSequence & Serializable> {
 	}