Merge branch '2.2.x' into 2.3.x

Closes gh-22251
This commit is contained in:
Andy Wilkinson 2020-07-07 11:52:34 +01:00
commit b8bc219b25

View File

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