Commit 84f682de authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #18920 from wonwoo

* pr/18920:
  Polish "Remove reference to ConfigurationPropertiesScan in javadoc"
  Remove reference to ConfigurationPropertiesScan in javadoc

Closes gh-18920
parents 0490bff3 08067fb8
...@@ -25,7 +25,6 @@ import java.lang.annotation.Target; ...@@ -25,7 +25,6 @@ import java.lang.annotation.Target;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.context.TypeExcludeFilter; import org.springframework.boot.context.TypeExcludeFilter;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.ComponentScan.Filter;
...@@ -37,10 +36,9 @@ import org.springframework.data.repository.Repository; ...@@ -37,10 +36,9 @@ import org.springframework.data.repository.Repository;
/** /**
* Indicates a {@link Configuration configuration} class that declares one or more * Indicates a {@link Configuration configuration} class that declares one or more
* {@link Bean @Bean} methods and also triggers {@link EnableAutoConfiguration * {@link Bean @Bean} methods and also triggers {@link EnableAutoConfiguration
* auto-configuration}, {@link ComponentScan component scanning}, and * auto-configuration} and {@link ComponentScan component scanning}. This is a convenience
* {@link ConfigurationPropertiesScan configuration properties scanning}. This is a * annotation that is equivalent to declaring {@code @Configuration},
* convenience annotation that is equivalent to declaring {@code @Configuration}, * {@code @EnableAutoConfiguration} and {@code @ComponentScan}.
* {@code @EnableAutoConfiguration}, {@code @ComponentScan}.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Stephane Nicoll * @author Stephane Nicoll
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment