Merge branch '6.2.x'

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

Author: jhoeller

framework-platform/framework-platform.gradle

@@ -30,7 +30,7 @@ dependencies {
 		api("com.github.librepdf:openpdf:1.3.43")
 		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.13.0")
+		api("com.google.code.gson:gson:2.13.1")
 		api("com.google.protobuf:protobuf-java-util:4.30.2")
 		api("com.h2database:h2:2.3.232")
 		api("com.jayway.jsonpath:json-path:2.9.0")

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java

@@ -131,6 +131,7 @@ final class ConfigurationClass {
 	 * @param metadata the metadata for the underlying class to represent
 	 * @param beanName name of the {@code @Configuration} class bean
 	 * @param scanned whether the underlying class has been registered through a scan
+	 * @since 6.2
 	 */
 	ConfigurationClass(AnnotationMetadata metadata, String beanName, boolean scanned) {
 		Assert.notNull(beanName, "Bean name must not be null");

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java

@@ -195,14 +195,14 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 		AnnotationAttributes bean = AnnotationConfigUtils.attributesFor(metadata, Bean.class);
 		Assert.state(bean != null, "No @Bean annotation attributes");
 
-		// Consider name and any aliases
+		// Consider name and any aliases.
 		String[] explicitNames = bean.getStringArray("name");
 		String beanName;
 		String localBeanName;
 		if (explicitNames.length > 0 && StringUtils.hasText(explicitNames[0])) {
 			beanName = explicitNames[0];
 			localBeanName = beanName;
-			// Register aliases even when overridden below
+			// Register aliases even when overridden below.
 			for (int i = 1; i < explicitNames.length; i++) {
 				this.registry.registerAlias(beanName, explicitNames[i]);
 			}

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

@@ -64,8 +64,7 @@ void registerOuterConfig_withBeanNameGenerator() {
 		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 @@ public String generateBeanName(
 		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 @@
 
 @Component
 public class ComponentForScanning {
+
 }

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

@@ -22,8 +22,10 @@
 
 @Configuration
 public class ConfigForScanning {
+
 	@Bean
 	public TestBean testBean() {
 		return new TestBean();
 	}
+
 }