From ff3b6b09bd79bd20dbb0bb979c63ba7219051a51 Mon Sep 17 00:00:00 2001 From: Oleg Vyukov Date: Mon, 13 Mar 2017 19:09:26 +0300 Subject: [PATCH 1/2] Fix OptionalLiveReloadServer create bean Closes gh-8595 --- .../devtools/autoconfigure/LocalDevToolsAutoConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java index aac1f232535..3e7db4b8d1b 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java @@ -58,6 +58,7 @@ public class LocalDevToolsAutoConfiguration { /** * Local LiveReload configuration. */ + @Configuration @ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true) static class LiveReloadConfiguration { From f11edd1eb3df95b35c41bdea248653ec5995a706 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 2 Jun 2017 17:42:18 +0200 Subject: [PATCH 2/2] Add missing `@Configuration` on `EmbeddedDatabaseConfiguration` --- .../boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git 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 index acdc3732116..e9c8ab39be9 100644 --- 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)