From 92b00255a1e5bbee096cffb74cfedab17990b256 Mon Sep 17 00:00:00 2001 From: wonwoo Date: Fri, 8 Nov 2019 00:26:38 +0900 Subject: [PATCH 1/2] Remove reference to ConfigurationPropertiesScan in javadoc See gh-18920 --- .../boot/autoconfigure/SpringBootApplication.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java index b341032d68..2d5bf95897 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java @@ -37,9 +37,8 @@ import org.springframework.data.repository.Repository; /** * Indicates a {@link Configuration configuration} class that declares one or more * {@link Bean @Bean} methods and also triggers {@link EnableAutoConfiguration - * auto-configuration}, {@link ComponentScan component scanning}, and - * {@link ConfigurationPropertiesScan configuration properties scanning}. This is a - * convenience annotation that is equivalent to declaring {@code @Configuration}, + * auto-configuration} and {@link ComponentScan component scanning}. This is a convenience + * annotation that is equivalent to declaring {@code @Configuration}, * {@code @EnableAutoConfiguration}, {@code @ComponentScan}. * * @author Phillip Webb From 08067fb816149bd879642ed8142945825a7284fa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 8 Nov 2019 11:10:14 +0100 Subject: [PATCH 2/2] Polish "Remove reference to ConfigurationPropertiesScan in javadoc" See gh-18920 --- .../boot/autoconfigure/SpringBootApplication.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java index 2d5bf95897..2f7c10f0dc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/SpringBootApplication.java @@ -25,7 +25,6 @@ import java.lang.annotation.Target; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.context.TypeExcludeFilter; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; @@ -39,7 +38,7 @@ import org.springframework.data.repository.Repository; * {@link Bean @Bean} methods and also triggers {@link EnableAutoConfiguration * auto-configuration} and {@link ComponentScan component scanning}. This is a convenience * annotation that is equivalent to declaring {@code @Configuration}, - * {@code @EnableAutoConfiguration}, {@code @ComponentScan}. + * {@code @EnableAutoConfiguration} and {@code @ComponentScan}. * * @author Phillip Webb * @author Stephane Nicoll