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 1/2] 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 2/2] 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>