Merge branch '2.7.x'

philwebb · philwebb · commit c524f8c665d7 · 2022-08-25T11:49:12.000-07:00
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClass.java
@@ -39,7 +39,7 @@
  * potentially processed method references which will fail if the class is not present. To
  * handle this scenario, a separate {@code @Configuration} class should be used to isolate
  * the condition. For example: <pre class="code">
- * &#064;Configuration(proxyBeanMethods = false)
+ * &#064;AutoConfiguration
  * public class MyAutoConfiguration {
  *
  * 	&#64;Configuration(proxyBeanMethods = false)

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`* potentially processed method references which will fail if the class is not present. To`
`40`	`40`	`* handle this scenario, a separate {@code @Configuration} class should be used to isolate`
`41`	`41`	`* the condition. For example: <pre class="code">`
`42`		`- * @Configuration(proxyBeanMethods = false)`
	`42`	`+ * @AutoConfiguration`
`43`	`43`	`* public class MyAutoConfiguration {`
`44`	`44`	`*`
`45`	`45`	`* @Configuration(proxyBeanMethods = false)`