Merge branch '1.5.x'

1ff1402d · Phillip Webb · 389f2e0f · 221feac3 · 1ff1402d
Commit 1ff1402d authored Nov 04, 2016 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

LocalDevToolsAutoConfigurationTests.java ...ls/autoconfigure/LocalDevToolsAutoConfigurationTests.java +2 -0

No files found.
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
@@ -289,6 +289,7 @@ public class LocalDevToolsAutoConfigurationTests {
 	@Configuration
 	@Import({ EmbeddedServletContainerAutoConfiguration.class,
 			LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class })
+	@EnableConfigurationProperties(ServerProperties.class)
 	public static class ConfigWithMockLiveReload {

 		@Bean
@@ -301,6 +302,7 @@ public class LocalDevToolsAutoConfigurationTests {
 	@Configuration
 	@Import({ EmbeddedServletContainerAutoConfiguration.class,
 			LocalDevToolsAutoConfiguration.class, ResourceProperties.class })
+	@EnableConfigurationProperties(ServerProperties.class)
 	public static class WebResourcesConfig {

 	}