Merge branch '6.2.x'

# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java

spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java

@@ -64,8 +64,7 @@ class ConfigurationBeanNameTests {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.setBeanNameGenerator(new AnnotationBeanNameGenerator() {
 			@Override
-			public String generateBeanName(
-					BeanDefinition definition, BeanDefinitionRegistry registry) {
+			public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 				return "custom-" + super.generateBeanName(definition, registry);
 			}
 		});
@@ -78,17 +77,22 @@ class ConfigurationBeanNameTests {
 		ctx.close();
 	}
 
+
 	@Configuration("outer")
 	@Import(C.class)
 	static class A {
+
 		@Component("nested")
 		static class B {
+
 			@Bean public String nestedBean() { return ""; }
 		}
 	}
 
+
 	@Configuration("imported")
 	static class C {
+
 		@Bean public String s() { return "s"; }
 	}
 

spring-context/src/test/java/org/springframework/context/annotation6/ComponentForScanning.java

@@ -20,4 +20,5 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class ComponentForScanning {
+
 }

spring-context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java

@@ -22,8 +22,10 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class ConfigForScanning {
+
 	@Bean
 	public TestBean testBean() {
 		return new TestBean();
 	}
+
 }