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

 	@Test
 	public void testDefaultSettings() {
-		assertThat(this.template.queryForObject("SELECT COUNT(*) from PERSON",
-				Integer.class)).isEqualTo(1);
+		assertThat(this.template.queryForObject("SELECT COUNT(*) from PERSON", Integer.class)).isEqualTo(1);
 	}

 }