Merge branch '2.7.x'

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java

@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -29,13 +28,19 @@ import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 /**
- * Auto-configuration classes are regular Spring {@link Configuration @Configuration}
+ * Indicates that a class provides configuration that can be automatically applied by
- * beans. Generally auto-configuration beans are {@link Conditional @Conditional} beans
+ * Spring Boot. Auto-configuration classes are regular
+ * {@link Configuration @Configuration} with the exception that
+ * {@literal Configuration#proxyBeanMethods() proxyBeanMethods} is always {@code false}.
+ * <p>
+ * Generally auto-configuration classes are marked as {@link Conditional @Conditional}
  * (most often using {@link ConditionalOnClass @ConditionalOnClass} and
  * {@link ConditionalOnMissingBean @ConditionalOnMissingBean} annotations).
  *
  * @author Moritz Halbritter
  * @see EnableAutoConfiguration
+ * @see AutoConfigureBefore
+ * @see AutoConfigureAfter
  * @see Conditional
  * @see ConditionalOnClass
  * @see ConditionalOnMissingBean
@@ -44,7 +49,6 @@ import org.springframework.context.annotation.Configuration;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Inherited
 @Configuration(proxyBeanMethods = false)
 public @interface AutoConfiguration {
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.