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

spring-boot-samples/spring-boot-sample-jetty/src/main/java/sample/jetty/web/SampleController.java

@@ -16,13 +16,13 @@
 
 package sample.jetty.web;
 
+import sample.jetty.service.HelloWorldService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import sample.jetty.service.HelloWorldService;
-
 @Controller
 public class SampleController {
 

spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java

@@ -22,6 +22,7 @@ import java.util.zip.GZIPInputStream;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;