Skip to content

Commit 8fa6ec3

Browse files
committed
Remove @ConditionalOnMissingBean check on deprecated class
Closes gh-20968
1 parent d648b98 commit 8fa6ec3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
2828
import org.springframework.context.annotation.Import;
2929
import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
3030
import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
31-
import org.springframework.data.jdbc.repository.config.JdbcConfiguration;
3231
import org.springframework.data.jdbc.repository.config.JdbcRepositoryConfigExtension;
3332
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
3433
import org.springframework.transaction.PlatformTransactionManager;
@@ -62,7 +61,7 @@ static class JdbcRepositoriesConfiguration {
6261
}
6362

6463
@Configuration
65-
@ConditionalOnMissingBean({ AbstractJdbcConfiguration.class, JdbcConfiguration.class })
64+
@ConditionalOnMissingBean(AbstractJdbcConfiguration.class)
6665
static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration {
6766

6867
}

0 commit comments

Comments
 (0)