Merge branch '1.5.x'

2016-11-18 17:30:03 -08:00
parent 9ec38dc8c1 1657120286
commit 20d7dd5747
34 changed files with 301 additions and 129 deletions
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -725,6 +725,11 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-junit-runners</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>