Skip to content

Commit 5e76671

Browse files
committed
Remove remaining code that was deprecated in 2.5
Closes gh-30442
1 parent 631b876 commit 5e76671

12 files changed

+86
-948
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,11 @@
5252
* @author Kazuki Shimizu
5353
* @since 1.0.0
5454
*/
55-
@SuppressWarnings("deprecation")
5655
@AutoConfiguration(before = SqlInitializationAutoConfiguration.class)
5756
@ConditionalOnClass({ DataSource.class, EmbeddedDatabaseType.class })
5857
@ConditionalOnMissingBean(type = "io.r2dbc.spi.ConnectionFactory")
5958
@EnableConfigurationProperties(DataSourceProperties.class)
60-
@Import({ DataSourcePoolMetadataProvidersConfiguration.class,
61-
DataSourceInitializationConfiguration.InitializationSpecificCredentialsDataSourceInitializationConfiguration.class,
62-
DataSourceInitializationConfiguration.SharedCredentialsDataSourceInitializationConfiguration.class })
59+
@Import(DataSourcePoolMetadataProvidersConfiguration.class)
6360
public class DataSourceAutoConfiguration {
6461

6562
@Configuration(proxyBeanMethods = false)

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

Lines changed: 0 additions & 200 deletions
This file was deleted.

0 commit comments

Comments
 (0)