Merge branch '2.1.x'

2019-04-02 15:58:59 -07:00
parent 04517495af eff2f92c48
commit 6bb5311984
36 changed files with 92 additions and 65 deletions
--- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java
@@ -64,8 +64,8 @@ public class NonAutoConfigurationSampleTomcatApplicationTests {
 			DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
 			HttpMessageConvertersAutoConfiguration.class,
 			PropertyPlaceholderAutoConfiguration.class })
-	@ComponentScan(basePackageClasses = { SampleController.class,
-			HelloWorldService.class })
+	@ComponentScan(
+			basePackageClasses = { SampleController.class, HelloWorldService.class })
 	public static class NonAutoConfigurationSampleTomcatApplication {

 		public static void main(String[] args) {