Merge branch '2.2.x' into 2.3.x

wilkinsona · wilkinsona · commit b8bc219b25b8 · 2020-07-07T11:52:34.000+01:00
Closes gh-22251
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java
@@ -59,7 +59,7 @@ static class JdbcRepositoriesConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingBean(AbstractJdbcConfiguration.class)
 	static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration {
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static class JdbcRepositoriesConfiguration {`
`59`	`59`
`60`	`60`	`}`
`61`	`61`
`62`		`- @Configuration`
	`62`	`+ @Configuration(proxyBeanMethods = false)`
`63`	`63`	`@ConditionalOnMissingBean(AbstractJdbcConfiguration.class)`
`64`	`64`	`static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration {`
`65`	`65`