Skip to content

Commit cd758cd

Browse files
wilkinsonawilkinsona
committed
Create spring-boot-jdbc module
1 parent ee4c0c3 commit cd758cd

File tree

222 files changed

+463
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+463
-546
lines changed

‎settings.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ include "spring-boot-project:spring-boot-devtools"
5252
include "spring-boot-project:spring-boot-docker-compose"
5353
include "spring-boot-project:spring-boot-docs"
5454
include "spring-boot-project:spring-boot-jackson"
55+
include "spring-boot-project:spring-boot-jdbc"
5556
include "spring-boot-project:spring-boot-jetty"
5657
include "spring-boot-project:spring-boot-jms"
5758
include "spring-boot-project:spring-boot-jsonb"

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies {
2121
optional(project(":spring-boot-project:spring-boot-amqp"))
2222
optional(project(":spring-boot-project:spring-boot-artemis"))
2323
optional(project(":spring-boot-project:spring-boot-jackson"))
24+
optional(project(":spring-boot-project:spring-boot-jdbc"))
2425
optional(project(":spring-boot-project:spring-boot-jetty"))
2526
optional(project(":spring-boot-project:spring-boot-jsonb"))
2627
optional(project(":spring-boot-project:spring-boot-mail"))

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
4141
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
4242
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
43-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4443
import org.springframework.boot.context.properties.EnableConfigurationProperties;
44+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
4545
import org.springframework.boot.jdbc.metadata.CompositeDataSourcePoolMetadataProvider;
4646
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadata;
4747
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
4242
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
4343
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
44-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4544
import org.springframework.boot.jdbc.DataSourceUnwrapper;
45+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
4646
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;
4747
import org.springframework.context.annotation.Bean;
4848
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointDocumentationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.springframework.boot.actuate.jdbc.DataSourceHealthIndicator;
4646
import org.springframework.boot.actuate.system.DiskSpaceHealthIndicator;
4747
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
48-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
48+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
4949
import org.springframework.context.annotation.Bean;
5050
import org.springframework.context.annotation.Configuration;
5151
import org.springframework.http.MediaType;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import org.springframework.boot.actuate.health.NamedContributor;
3333
import org.springframework.boot.actuate.jdbc.DataSourceHealthIndicator;
3434
import org.springframework.boot.autoconfigure.AutoConfigurations;
35-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
37-
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvidersConfiguration;
3835
import org.springframework.boot.context.properties.ConfigurationProperties;
3936
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4037
import org.springframework.boot.jdbc.DataSourceBuilder;
38+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
39+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
40+
import org.springframework.boot.jdbc.metadata.autoconfigure.DataSourcePoolMetadataProvidersConfiguration;
4141
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4242
import org.springframework.context.annotation.Bean;
4343
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointDocumentationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2525
import org.springframework.boot.actuate.liquibase.LiquibaseEndpoint;
26-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
2726
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
27+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
2828
import org.springframework.context.ApplicationContext;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/data/RepositoryMetricsAutoConfigurationIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
2828
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
3130
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
31+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
3232
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3333
import org.springframework.context.annotation.Bean;
3434
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
3333
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
3434
import org.springframework.boot.autoconfigure.AutoConfigurations;
35-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.jdbc.DataSourceInitializationAutoConfiguration;
3735
import org.springframework.boot.jdbc.DataSourceBuilder;
36+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
37+
import org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration;
3838
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;
3939
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4040
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
3636
import org.springframework.boot.autoconfigure.AutoConfigurations;
37-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
38-
import org.springframework.boot.autoconfigure.jdbc.DataSourceInitializationAutoConfiguration;
3937
import org.springframework.boot.autoconfigure.orm.jpa.EntityManagerFactoryBuilderCustomizer;
4038
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
39+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
40+
import org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration;
4141
import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
4242
import org.springframework.boot.test.context.FilteredClassLoader;
4343
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

‎spring-boot-project/spring-boot-actuator/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
dockerTestImplementation("org.testcontainers:testcontainers")
2525

2626
optional(project(":spring-boot-project:spring-boot-activemq"))
27+
optional(project(":spring-boot-project:spring-boot-jdbc"))
2728
optional(project(":spring-boot-project:spring-boot-jetty"))
2829
optional(project(":spring-boot-project:spring-boot-jsonb"))
2930
optional(project(":spring-boot-project:spring-boot-reactor-netty"))

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.boot.autoconfigure.AutoConfigurations;
2525
import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
27-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
27+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
2828
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2929
import org.springframework.boot.testsupport.classpath.resources.WithResource;
3030

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929

3030
import org.springframework.boot.actuate.liquibase.LiquibaseEndpoint.LiquibaseBeanDescriptor;
3131
import org.springframework.boot.autoconfigure.AutoConfigurations;
32-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
3332
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
3433
import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
34+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
3535
import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
3636
import org.springframework.boot.sql.init.DatabaseInitializationSettings;
3737
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetricsTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.api.Test;
2727

2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
29-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
29+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
3030
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;
3131
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3232
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-all/build.gradle

-9
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ dependencies {
1313
api("org.springframework:spring-core")
1414
api("org.springframework:spring-context")
1515
optional("ch.qos.logback:logback-classic")
16-
optional("com.clickhouse:clickhouse-jdbc")
1716
optional("com.fasterxml.jackson.core:jackson-databind")
1817
optional("com.h2database:h2")
1918
optional("com.google.code.gson:gson")
20-
optional("com.mchange:c3p0")
2119
optional("com.oracle.database.jdbc:ucp11")
2220
optional("com.oracle.database.jdbc:ojdbc11")
2321
optional("com.samskivert:jmustache")
@@ -87,31 +85,24 @@ dependencies {
8785
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
8886
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
8987
testImplementation("com.ibm.db2:jcc")
90-
testImplementation("com.microsoft.sqlserver:mssql-jdbc")
91-
testImplementation("com.mysql:mysql-connector-j")
9288
testImplementation("com.sun.xml.messaging.saaj:saaj-impl")
9389
testImplementation("io.projectreactor:reactor-test")
9490
testImplementation("io.r2dbc:r2dbc-h2")
9591
testImplementation("jakarta.inject:jakarta.inject-api")
9692
testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
97-
testImplementation("net.sourceforge.jtds:jtds")
9893
testImplementation("org.apache.derby:derby")
9994
testImplementation("org.apache.derby:derbytools")
10095
testImplementation("org.codehaus.janino:janino")
10196
testImplementation("org.eclipse.jetty:jetty-client")
10297
testImplementation("org.eclipse.jetty.http2:jetty-http2-client")
10398
testImplementation("org.eclipse.jetty.http2:jetty-http2-client-transport")
104-
testImplementation("org.firebirdsql.jdbc:jaybird") {
105-
exclude group: "javax.resource", module: "connector-api"
106-
}
10799
testImplementation("org.hsqldb:hsqldb")
108100
testImplementation("org.mariadb.jdbc:mariadb-java-client") {
109101
exclude group: "org.slf4j", module: "jcl-over-slf4j"
110102
}
111103
testImplementation("org.springframework:spring-context-support")
112104
testImplementation("org.springframework.data:spring-data-redis")
113105
testImplementation("org.springframework.data:spring-data-r2dbc")
114-
testImplementation("org.xerial:sqlite-jdbc")
115106

116107
testRuntimeOnly("org.testcontainers:jdbc") {
117108
exclude group: "javax.annotation", module: "javax.annotation-api"

‎spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring.factories

-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ org.springframework.boot.liquibase.LiquibaseChangelogMissingFailureAnalyzer
1313
# Database Initializer Detectors
1414
org.springframework.boot.sql.init.dependency.DatabaseInitializerDetector=\
1515
org.springframework.boot.flyway.FlywayDatabaseInitializerDetector,\
16-
org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializerDetector,\
1716
org.springframework.boot.liquibase.LiquibaseDatabaseInitializerDetector,\
1817
org.springframework.boot.orm.jpa.JpaDatabaseInitializerDetector,\
1918
org.springframework.boot.r2dbc.init.R2dbcScriptDatabaseInitializerDetector
2019

2120
# Depends On Database Initialization Detectors
2221
org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializationDetector=\
23-
org.springframework.boot.jdbc.SpringJdbcDependsOnDatabaseInitializationDetector,\
2422
org.springframework.boot.jooq.JooqDependsOnDatabaseInitializationDetector,\
2523
org.springframework.boot.orm.jpa.JpaDependsOnDatabaseInitializationDetector

‎spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
org.springframework.aot.hint.RuntimeHintsRegistrar=\
2-
org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints,\
3-
org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints
2+
org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints

‎spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzerTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -18,12 +18,12 @@
1818

1919
import javax.sql.DataSource;
2020

21+
import com.zaxxer.hikari.HikariDataSource;
2122
import liquibase.integration.spring.SpringLiquibase;
2223
import org.junit.jupiter.api.Test;
2324

2425
import org.springframework.beans.factory.BeanCreationException;
2526
import org.springframework.boot.diagnostics.FailureAnalysis;
26-
import org.springframework.boot.jdbc.DataSourceBuilder;
2727
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
2828
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2929
import org.springframework.context.annotation.Bean;
@@ -70,7 +70,10 @@ static class LiquibaseConfiguration {
7070

7171
@Bean
7272
DataSource dataSource() {
73-
return DataSourceBuilder.create().url("jdbc:hsqldb:mem:test").username("sa").build();
73+
HikariDataSource dataSource = new HikariDataSource();
74+
dataSource.setJdbcUrl("jdbc:hsqldb:mem:test");
75+
dataSource.setUsername("sa");
76+
return dataSource;
7477
}
7578

7679
@Bean

‎spring-boot-project/spring-boot-autoconfigure-all/build.gradle

+1-4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ dependencies {
4545
optional(project(":spring-boot-project:spring-boot-activemq"))
4646
optional(project(":spring-boot-project:spring-boot-artemis"))
4747
optional(project(":spring-boot-project:spring-boot-jackson"))
48+
optional(project(":spring-boot-project:spring-boot-jdbc"))
4849
optional(project(":spring-boot-project:spring-boot-jsonb"))
4950
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
5051
optional(project(":spring-boot-project:spring-boot-tomcat"))
@@ -276,10 +277,6 @@ dependencies {
276277

277278
tasks.named("checkSpringConfigurationMetadata").configure {
278279
exclusions = [
279-
"spring.datasource.dbcp2.*",
280-
"spring.datasource.hikari.*",
281-
"spring.datasource.oracleucp.*",
282-
"spring.datasource.tomcat.*",
283280
"spring.groovy.template.configuration.*"
284281
]
285282
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2828
import org.springframework.boot.autoconfigure.domain.EntityScanner;
29-
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
3129
import org.springframework.boot.context.properties.EnableConfigurationProperties;
30+
import org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration;
31+
import org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration;
3232
import org.springframework.context.ApplicationContext;
3333
import org.springframework.context.annotation.Bean;
3434
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
import org.springframework.boot.autoconfigure.flyway.FlywayProperties.Oracle;
5656
import org.springframework.boot.autoconfigure.flyway.FlywayProperties.Postgresql;
5757
import org.springframework.boot.autoconfigure.flyway.FlywayProperties.Sqlserver;
58-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
59-
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
60-
import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
6158
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
6259
import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
6360
import org.springframework.boot.context.properties.EnableConfigurationProperties;
6461
import org.springframework.boot.context.properties.PropertyMapper;
6562
import org.springframework.boot.jdbc.DataSourceBuilder;
6663
import org.springframework.boot.jdbc.DatabaseDriver;
64+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
65+
import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
66+
import org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration;
6767
import org.springframework.boot.sql.init.dependency.DatabaseInitializationDependencyConfigurer;
6868
import org.springframework.context.annotation.Bean;
6969
import org.springframework.context.annotation.Conditional;

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
3535
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
3636
import org.springframework.boot.autoconfigure.h2.H2ConsoleProperties.Settings;
37-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
3837
import org.springframework.boot.context.properties.EnableConfigurationProperties;
38+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
3939
import org.springframework.boot.web.servlet.ServletRegistrationBean;
4040
import org.springframework.context.annotation.Bean;
4141
import org.springframework.core.log.LogMessage;

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
3737
import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
3838
import org.springframework.boot.autoconfigure.condition.SearchStrategy;
39-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4039
import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
4140
import org.springframework.boot.autoconfigure.jmx.JmxProperties;
4241
import org.springframework.boot.autoconfigure.rsocket.RSocketMessagingAutoConfiguration;
@@ -89,8 +88,8 @@
8988
* @author Yanming Zhou
9089
* @since 1.1.0
9190
*/
92-
@AutoConfiguration(after = { DataSourceAutoConfiguration.class, JmxAutoConfiguration.class,
93-
TaskSchedulingAutoConfiguration.class })
91+
@AutoConfiguration(after = { JmxAutoConfiguration.class, TaskSchedulingAutoConfiguration.class },
92+
afterName = "org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration")
9493
@ConditionalOnClass(EnableIntegration.class)
9594
@EnableConfigurationProperties({ IntegrationProperties.class, JmxProperties.class })
9695
public class IntegrationAutoConfiguration {

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
5151
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
5252
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
53-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
5453
import org.springframework.boot.context.properties.EnableConfigurationProperties;
54+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
5555
import org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration;
5656
import org.springframework.context.annotation.Bean;
5757
import org.springframework.core.annotation.Order;

0 commit comments

Comments
 (0)