From 93804eeb2453d20b0674f3407f62f4edd18a5519 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 14 Jun 2018 08:26:15 +0200
Subject: [PATCH 1/5] Upgrade to Spring Integration 4.3.17

Closes gh-13458
---
 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 25cf722e6d..b7ec191bca 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -157,7 +157,7 @@
 		<spring-batch.version>3.0.9.RELEASE</spring-batch.version>
 		<spring-data-releasetrain.version>Ingalls-SR13</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.23.0.RELEASE</spring-hateoas.version>
-		<spring-integration.version>4.3.16.RELEASE</spring-integration.version>
+		<spring-integration.version>4.3.17.RELEASE</spring-integration.version>
 		<spring-integration-java-dsl.version>1.2.3.RELEASE</spring-integration-java-dsl.version>
 		<spring-kafka.version>1.1.8.RELEASE</spring-kafka.version>
 		<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>

From 40ba15047b553f1e47197365fb1b0273de2bf8b9 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 14 Jun 2018 08:28:17 +0200
Subject: [PATCH 2/5] Upgrade to Spring Integration 5.0.6

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

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 54a0e89c05..792954196b 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -157,7 +157,7 @@
 		<spring-cloud-connectors.version>2.0.2.RELEASE</spring-cloud-connectors.version>
 		<spring-data-releasetrain.version>Kay-SR8</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.24.0.RELEASE</spring-hateoas.version>
-		<spring-integration.version>5.0.5.RELEASE</spring-integration.version>
+		<spring-integration.version>5.0.6.RELEASE</spring-integration.version>
 		<spring-kafka.version>2.1.6.RELEASE</spring-kafka.version>
 		<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>

From de6ce79d5f474dd4f255922ccf931e492dcf614d Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 14 Jun 2018 08:30:11 +0200
Subject: [PATCH 3/5] Upgrade to Spring Session Apple-SR3

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

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 792954196b..d82ee5cb71 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -164,7 +164,7 @@
 		<spring-restdocs.version>2.0.1.RELEASE</spring-restdocs.version>
 		<spring-retry.version>1.2.2.RELEASE</spring-retry.version>
 		<spring-security.version>5.0.6.RELEASE</spring-security.version>
-		<spring-session-bom.version>Apple-SR2</spring-session-bom.version>
+		<spring-session-bom.version>Apple-SR3</spring-session-bom.version>
 		<spring-ws.version>3.0.1.RELEASE</spring-ws.version>
 		<sqlite-jdbc.version>3.21.0.1</sqlite-jdbc.version>
 		<statsd-client.version>3.1.0</statsd-client.version>

From e9aa6dd29fcdf0ffb1e8d4e6160cf8a3dffea339 Mon Sep 17 00:00:00 2001
From: Vivien Tintillier <vtintillier.privatedev@gmail.com>
Date: Fri, 25 May 2018 17:11:22 +0200
Subject: [PATCH 4/5] Exclude JUnit from json-simple

See gh-13438
---
 spring-boot-dependencies/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 47a0a94362..9e72d32741 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -648,6 +648,13 @@
 				<groupId>com.googlecode.json-simple</groupId>
 				<artifactId>json-simple</artifactId>
 				<version>${simple-json.version}</version>
+				<exclusions>
+					<!-- Remove compile time dependency on junit, see https://github.com/fangyidong/json-simple/issues/91 -->
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.h2database</groupId>

From 6e5ae0c71dcbffda632ff9433f7f1e619dbe73b6 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 14 Jun 2018 08:33:28 +0200
Subject: [PATCH 5/5] Polish "Exclude JUnit from json-simple"

Closes gh-13438
---
 spring-boot-dependencies/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 9e72d32741..6818e55cd2 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -649,7 +649,6 @@
 				<artifactId>json-simple</artifactId>
 				<version>${simple-json.version}</version>
 				<exclusions>
-					<!-- Remove compile time dependency on junit, see https://github.com/fangyidong/json-simple/issues/91 -->
 					<exclusion>
 						<groupId>junit</groupId>
 						<artifactId>junit</artifactId>