Merge branch '1.5.x'

2017-01-23 23:44:43 -08:00
parent 3893383cbe b0e06c30a0
commit 8ffaa54e74
164 changed files with 3121 additions and 949 deletions
--- a/spring-boot-tools/spring-boot-configuration-processor/pom.xml
+++ b/spring-boot-tools/spring-boot-configuration-processor/pom.xml
@@ -24,6 +24,10 @@
 			<groupId>com.vaadin.external.google</groupId>
 			<artifactId>android-json</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-test-support</artifactId>
+		</dependency>
 		<!-- Test -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>