Skip to content

Commit

Permalink
Merge pull request #18920 from wonwoo
Browse files Browse the repository at this point in the history
* pr/18920:
  Polish "Remove reference to ConfigurationPropertiesScan in javadoc"
  Remove reference to ConfigurationPropertiesScan in javadoc

Closes gh-18920
  • Loading branch information
snicoll committed Nov 8, 2019
2 parents 0490bff + 08067fb commit 84f682d
Showing 1 changed file with 3 additions and 5 deletions.
Expand Up @@ -25,7 +25,6 @@

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;
Expand All @@ -37,10 +36,9 @@
/**
* 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},
* {@code @EnableAutoConfiguration}, {@code @ComponentScan}.
* auto-configuration} and {@link ComponentScan component scanning}. This is a convenience
* annotation that is equivalent to declaring {@code @Configuration},
* {@code @EnableAutoConfiguration} and {@code @ComponentScan}.
*
* @author Phillip Webb
* @author Stephane Nicoll
Expand Down

0 comments on commit 84f682d

Please sign in to comment.