Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-02-08 14:32:45 +01:00
commit aff50f6787

View File

@ -5195,7 +5195,7 @@ If you use the
the following provided libraries:
* http://junit.org[JUnit] -- The de-facto standard for unit testing Java applications.
* {spring-reference}/#integration-testing.html[Spring Test] & Spring Boot Test --
* {spring-reference}/#integration-testing[Spring Test] & Spring Boot Test --
Utilities and integration test support for Spring Boot applications.
* http://joel-costigliola.github.io/assertj/[AssertJ] -- A fluent assertion library.
* http://hamcrest.org/JavaHamcrest/[Hamcrest] -- A library of matcher objects (also known