Merge branch '2.0.x' into 2.1.x

Closes gh-17078
2019-06-07 10:50:34 +01:00
parent 857b96b77d c6c139d980
commit 24925c3dae
2691 changed files with 27746 additions and 46049 deletions
--- a/spring-boot-samples/spring-boot-sample-batch/src/test/java/sample/batch/SampleBatchApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-batch/src/test/java/sample/batch/SampleBatchApplicationTests.java
@@ -31,8 +31,7 @@ public class SampleBatchApplicationTests {

 	@Test
 	public void testDefaultSettings() {
-		assertThat(SpringApplication
-				.exit(SpringApplication.run(SampleBatchApplication.class))).isEqualTo(0);
+		assertThat(SpringApplication.exit(SpringApplication.run(SampleBatchApplication.class))).isEqualTo(0);
 		String output = this.outputCapture.toString();
 		assertThat(output).contains("completed with the following parameters");
 	}