Merge branch '1.4.x' into 1.5.x

2016-12-28 14:48:05 -08:00
parent 8b7055719f 61c931943f
commit 97d7ffd8e8
4 changed files with 213 additions and 6 deletions
--- a/spring-boot-samples/spring-boot-sample-war/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-war/pom.xml
@@ -42,6 +42,13 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- Provided -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>