Merge branch '2.7.x'

philwebb · philwebb · commit 2f78d52c3632 · 2022-09-08T19:52:40.000-07:00
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/test/java/smoketest/batch/SampleBatchApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/src/test/java/smoketest/batch/SampleBatchApplicationTests.java
@@ -34,9 +34,4 @@ void testDefaultSettings(CapturedOutput output) {
 		assertThat(output).contains("completed with the following parameters");
 	}
 
-	public static void main(String[] args) throws ClassNotFoundException {
-		System.getProperties().forEach((k, v) -> System.out.println(k + "=" + v));
-		Class.forName("org.springframework.boot.web.servlet.context.ServletWebServerApplicationContextFactory");
-	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,4 @@ void testDefaultSettings(CapturedOutput output) {`
`34`	`34`	`assertThat(output).contains("completed with the following parameters");`
`35`	`35`	`}`
`36`	`36`
`37`		`- public static void main(String[] args) throws ClassNotFoundException {`
`38`		`- System.getProperties().forEach((k, v) -> System.out.println(k + "=" + v));`
`39`		`- Class.forName("org.springframework.boot.web.servlet.context.ServletWebServerApplicationContextFactory");`
`40`		`- }`
`41`		`-`
`42`	`37`	`}`