Merge branch '5.3.x'

# Conflicts:
#	build.gradle
#	spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
#	spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java

Author: jhoeller

build.gradle

@@ -30,7 +30,7 @@ configure(allprojects) { project ->
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.13.0"
 			mavenBom "io.netty:netty-bom:4.1.72.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.14"
-			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
+			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR11"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:11.0.7"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.10"
@@ -311,12 +311,12 @@ configure([rootProject] + javaProjects) { project ->
 		testImplementation("io.mockk:mockk")
 		testImplementation("org.assertj:assertj-core")
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
-		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
-		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")

spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java

@@ -124,7 +124,7 @@ public CachingConfigurerSupplier(Supplier<CachingConfigurer> supplier) {
 		public <T> Supplier<T> adapt(Function<CachingConfigurer, T> provider) {
 			return () -> {
 				CachingConfigurer cachingConfigurer = this.supplier.get();
-				return (cachingConfigurer != null) ? provider.apply(cachingConfigurer) : null;
+				return (cachingConfigurer != null ? provider.apply(cachingConfigurer) : null);
 			};
 		}
 

spring-core/src/main/java/org/springframework/core/type/classreading/SimpleAnnotationMetadata.java

@@ -161,6 +161,7 @@ public Set<MethodMetadata> getDeclaredMethods() {
 		return Collections.unmodifiableSet(this.declaredMethods);
 	}
 
+
 	@Override
 	public boolean equals(@Nullable Object obj) {
 		return ((this == obj) || ((obj instanceof SimpleAnnotationMetadata) &&