Merge branch '7.0.x'

# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/BeanRegistryAdapter.java
#	spring-context/src/main/java/org/springframework/context/annotation/Import.java

spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java

@@ -796,7 +796,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(beanFactory, getBeanFactoryPostProcessors());
 
 		// Detect a LoadTimeWeaver and prepare for weaving, if found in the meantime
-		// (for example, through an @Bean method registered by ConfigurationClassPostProcessor)
+		// (for example, through a @Bean method registered by ConfigurationClassPostProcessor)
 		if (!NativeDetector.inNativeImage() && beanFactory.getTempClassLoader() == null &&
 				beanFactory.containsBean(LOAD_TIME_WEAVER_BEAN_NAME)) {
 			beanFactory.addBeanPostProcessor(new LoadTimeWeaverAwareProcessor(beanFactory));

spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/BarRegistrar.java

@@ -28,4 +28,5 @@ public class BarRegistrar implements BeanRegistrar {
 	}
 
 	public record Bar() {}
+
 }

spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/FooRegistrar.java

@@ -28,4 +28,5 @@ public class FooRegistrar implements BeanRegistrar {
 	}
 
 	public record Foo() {}
+
 }

spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/GenericBeanRegistrar.java

@@ -32,4 +32,5 @@ public class GenericBeanRegistrar implements BeanRegistrar {
 	}
 
 	public record Foo() {}
+
 }

spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/ImportAwareBeanRegistrar.java

@@ -45,4 +45,5 @@ public class ImportAwareBeanRegistrar implements BeanRegistrar, ImportAware {
 	}
 
 	public record ClassNameHolder(@Nullable String className) {}
+
 }

spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/factory/SampleBeanRegistrar.java

@@ -41,7 +41,9 @@ public class SampleBeanRegistrar implements BeanRegistrar {
 	}
 
 	public record Foo() {}
+
 	public record Bar(Foo foo) {}
+
 	public record Baz(String message) {}
 
 	public static class Init {
@@ -53,4 +55,5 @@ public class SampleBeanRegistrar implements BeanRegistrar {
 			initialized = true;
 		}
 	}
+
 }