spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'local12x/1.2.x'

Browse Source
This commit is contained in:
Phillip Webb
2015-10-19 12:56:55 -07:00
parent 5080e2d71f a79131f8d2
commit 1e4d974ec0
573 changed files with 791 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-samples/spring-boot-sample-velocity/src/test/java/sample/velocity/SampleVelocityApplicationTests.java
+1
View File
@@ -19,6 +19,7 @@ package sample.velocity;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.OutputCapture;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;