Merge branch '1.5.x'

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>

spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java

@@ -10,7 +10,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests that {code ResetMocksTestExecutionListener} and
+ * Tests that {@code ResetMocksTestExecutionListener} and
  * {@code MockitoTestExecutionListener} gracefully degrade when Mockito is not on the
  * classpath.
  *