Merge branch '1.5.x'

2016-10-11 23:42:14 -07:00
parent 264d8442da d818a09ed8
commit 01900c8342
25 changed files with 130 additions and 118 deletions
--- a/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/test/java/sample/web/thymeleaf3/MessageControllerWebTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/test/java/sample/web/thymeleaf3/MessageControllerWebTests.java
@@ -23,7 +23,6 @@ import org.hamcrest.TypeSafeMatcher;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import sample.web.thymeleaf3.SampleWebThymeleaf3Application;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;