Merge pull request #35180 from aasaru

wilkinsona · wilkinsona · commit c768307d7900 · 2023-05-02T11:57:41.000+01:00
* gh-35180: Correct list of annotations equivalent to @SpringBootApplication Closes gh-35180
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
@@ -40,7 +40,7 @@
  * Indicates a {@link Configuration configuration} class that declares one or more
  * {@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},
+ * annotation that is equivalent to declaring {@code @SpringBootConfiguration},
  * {@code @EnableAutoConfiguration} and {@code @ComponentScan}.
  *
  * @author Phillip Webb

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`* Indicates a {@link Configuration configuration} class that declares one or more`
`41`	`41`	`* {@link Bean @Bean} methods and also triggers {@link EnableAutoConfiguration`
`42`	`42`	`* auto-configuration} and {@link ComponentScan component scanning}. This is a convenience`
`43`		`- * annotation that is equivalent to declaring {@code @Configuration},`
	`43`	`+ * annotation that is equivalent to declaring {@code @SpringBootConfiguration},`
`44`	`44`	`* {@code @EnableAutoConfiguration} and {@code @ComponentScan}.`
`45`	`45`	`*`
`46`	`46`	`* @author Phillip Webb`