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

spring-boot-samples/spring-boot-sample-xml/src/main/java/sample/xml/SampleSpringXmlApplication.java

@@ -16,12 +16,12 @@
 
 package sample.xml;
 
+import sample.xml.service.HelloWorldService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 
-import sample.xml.service.HelloWorldService;
-
 public class SampleSpringXmlApplication implements CommandLineRunner {
 
 	@Autowired

spring-boot-samples/spring-boot-sample-xml/src/test/java/sample/xml/SampleSpringXmlApplicationTests.java

@@ -18,6 +18,7 @@ package sample.xml;
 
 import org.junit.Rule;
 import org.junit.Test;
+
 import org.springframework.boot.test.OutputCapture;
 
 import static org.junit.Assert.assertTrue;