Merge branch '2.3.x'

Closes gh-22252
This commit is contained in:
Andy Wilkinson 2020-07-07 11:52:50 +01:00
commit 247fd59422

View File

@ -59,7 +59,7 @@ public class JdbcRepositoriesAutoConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(AbstractJdbcConfiguration.class)
static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration {