Merge branch '1.5.x'

2017-06-02 17:58:18 +02:00
parent 90498a0b2f f11edd1eb3
commit 9624bf14c4
2 changed files with 2 additions and 0 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -94,6 +94,7 @@ public class DataSourceAutoConfiguration {
 		}
 	}

+	@Configuration
 	@Conditional(EmbeddedDatabaseCondition.class)
 	@ConditionalOnMissingBean({ DataSource.class, XADataSource.class })
 	@Import(EmbeddedDataSourceConfiguration.class)