Merge branch '1.5.x'

2016-11-16 16:06:53 -08:00
parent 4edab86ba2 dcbfb51a1a
commit cb7c0b5031
22 changed files with 155 additions and 31 deletions
--- a/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml
@@ -42,6 +42,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>