Merge branch '2.1.x'

Closes gh-17079
2019-06-07 11:00:44 +01:00
parent 5b2de5c81d 24925c3dae
commit aef92b9295
2799 changed files with 28402 additions and 47836 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
@@ -74,8 +74,7 @@ class SampleProfileApplicationTests {

 	@Test
 	void testGoodbyeProfileFromCommandline(CapturedOutput capturedOutput) {
-		SampleProfileApplication
-				.main(new String[] { "--spring.profiles.active=goodbye" });
+		SampleProfileApplication.main(new String[] { "--spring.profiles.active=goodbye" });
 		assertThat(capturedOutput).contains("Goodbye Everyone");
 	}