root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-02-08 14:32:45 +01:00
parent 8a59e88a9d 05dbc15a9d
commit aff50f6787
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

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