From c32276d8fa3b2e6613c77848a18e64dc4aea0009 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 9 Oct 2017 15:50:49 +0200
Subject: [PATCH 1/2] Update .gitignore with changes on master

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b087abfe88..5370fe352d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ overridedb.*
 .DS_Store
 dump.rdb
 transaction-logs
+.flattened-pom.xml
+spring-boot-tests/

From 3e68c55db92a89e5681297c6216b5e4046fb6594 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 9 Oct 2017 15:51:47 +0200
Subject: [PATCH 2/2] Start build against Spring Framework snapshots for
 4.3.12.RELEASE

See gh-10561
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 1bf3ebe3bc..ea7ebe52b6 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -151,7 +151,7 @@
 		<snakeyaml.version>1.17</snakeyaml.version>
 		<solr.version>5.5.4</solr.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
-		<spring.version>4.3.11.RELEASE</spring.version>
+		<spring.version>4.3.12.BUILD-SNAPSHOT</spring.version>
 		<spring-amqp.version>1.7.4.RELEASE</spring-amqp.version>
 		<spring-cloud-connectors.version>1.2.4.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.8.RELEASE</spring-batch.version>