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-profile/src/test/java/sample/profile/SampleProfileApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-profile/src/test/java/sample/profile/SampleProfileApplicationTests.java
@@ -78,8 +78,7 @@ public class SampleProfileApplicationTests {

 	@Test
 	public void testGoodbyeProfileFromCommandline() throws Exception {
-		SampleProfileApplication
-				.main(new String[] { "--spring.profiles.active=goodbye" });
+		SampleProfileApplication.main(new String[] { "--spring.profiles.active=goodbye" });
 		String output = this.outputCapture.toString();
 		assertThat(output).contains("Goodbye Everyone");
 	}