Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-11-18 17:30:03 -08:00
34 changed files with 301 additions and 129 deletions

View File

@@ -92,6 +92,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>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>