From e5303ab755a2dbf0dc3bf9f9c88534b47e404bfe Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 6 Dec 2019 00:19:31 +0000
Subject: [PATCH 1/3] Next development version (v2.1.12.BUILD-SNAPSHOT)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c50d2f88a19..8e730034cb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<name>Spring Boot Build</name>
 	<description>Spring Boot Build</description>
 	<properties>
-		<revision>2.1.11.BUILD-SNAPSHOT</revision>
+		<revision>2.1.12.BUILD-SNAPSHOT</revision>
 		<main.basedir>${basedir}</main.basedir>
 	</properties>
 	<!-- Most elements are in profiles so they are stripped out during maven-flatten -->

From f22d0c7d8e1c677b516300e543cc5128f12aff5d Mon Sep 17 00:00:00 2001
From: Jorge Cordoba <jcordoba@nearsoft.com>
Date: Fri, 6 Dec 2019 16:10:27 -0700
Subject: [PATCH 2/3] Add missing assertion to
 SampleTestApplicationWebIntegrationTests.test()

See gh-19326
---
 .../test/SampleTestApplicationWebIntegrationTests.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java
index 3c99f63c4dc..571a4c95f72 100644
--- a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java
+++ b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java
@@ -29,14 +29,17 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 
 /**
  * {@code @SpringBootTest} with a random port for {@link SampleTestApplication}.
  *
  * @author Phillip Webb
+ * @author Jorge Cordoba
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@@ -58,7 +61,8 @@ public class SampleTestApplicationWebIntegrationTests {
 
 	@Test
 	public void test() {
-		this.restTemplate.getForEntity("/{username}/vehicle", String.class, "sframework");
+		assertThat(this.restTemplate.getForEntity("/{username}/vehicle", String.class, "sframework")
+				.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 }

From cd085e0641c47490e771625202a648e4de0970fa Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 12 Dec 2019 16:46:28 +0100
Subject: [PATCH 3/3] Polish contribution

See gh-19326
---
 .../sample/test/SampleTestApplicationWebIntegrationTests.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java
index 571a4c95f72..39d7cd2240f 100644
--- a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java
+++ b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java
@@ -61,8 +61,8 @@ public class SampleTestApplicationWebIntegrationTests {
 
 	@Test
 	public void test() {
-		assertThat(this.restTemplate.getForEntity("/{username}/vehicle", String.class, "sframework")
-				.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(this.restTemplate.getForEntity("/{username}/vehicle", String.class, "sframework").getStatusCode())
+				.isEqualTo(HttpStatus.OK);
 	}
 
 }