Skip to content

S
spring-boot
Commit f11edd1e authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Add missing `@Configuration` on `EmbeddedDatabaseConfiguration`

parent 3921d873
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View file @ f11edd1e
...@@ -94,6 +94,7 @@ public class DataSourceAutoConfiguration { ...@@ -94,6 +94,7 @@ public class DataSourceAutoConfiguration {
} }
} }
@Configuration
@Conditional(EmbeddedDatabaseCondition.class) @Conditional(EmbeddedDatabaseCondition.class)
@ConditionalOnMissingBean({ DataSource.class, XADataSource.class }) @ConditionalOnMissingBean({ DataSource.class, XADataSource.class })
@Import(EmbeddedDataSourceConfiguration.class) @Import(EmbeddedDataSourceConfiguration.class)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment