Skip to content

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

Merge branch '1.5.x'

parents 90498a0b f11edd1e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View file @ 9624bf14
...@@ -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)
......
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
View file @ 9624bf14
...@@ -58,6 +58,7 @@ public class LocalDevToolsAutoConfiguration { ...@@ -58,6 +58,7 @@ public class LocalDevToolsAutoConfiguration {
/** /**
* Local LiveReload configuration. * Local LiveReload configuration.
*/ */
@Configuration
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true) @ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
static class LiveReloadConfiguration { static class LiveReloadConfiguration {
......
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