Merge branch '1.5.x'

2016-10-20 21:03:28 +01:00
parent 8832df3303 570b292df7
commit 3eb9397c9d
8 changed files with 89 additions and 36 deletions
--- a/spring-boot-devtools/pom.xml
+++ b/spring-boot-devtools/pom.xml
@@ -117,6 +117,11 @@
 			<artifactId>tomcat-embed-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.websocket</groupId>
 			<artifactId>websocket-client</artifactId>