Skip to content

S
spring-boot
Commit b8bc219b authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.2.x' into 2.3.x 

Closes gh-22251
parents da319f5f 4e79bb1c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java
View file @ b8bc219b
...@@ -59,7 +59,7 @@ public class JdbcRepositoriesAutoConfiguration { ...@@ -59,7 +59,7 @@ public class JdbcRepositoriesAutoConfiguration {
} }
@Configuration @Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(AbstractJdbcConfiguration.class) @ConditionalOnMissingBean(AbstractJdbcConfiguration.class)
static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration { static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration {
......
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