From 4ad23166eaa2c7c89025695b6916101532a333dd Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 6 Jul 2015 10:00:46 +0100
Subject: [PATCH] Use a Java 7-compatible version of org.json:json and remove
 duplicate

Closes gh-3412
---
 spring-boot-dependencies/pom.xml | 2 +-
 spring-boot-parent/pom.xml       | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 012e65d88b..574717df6a 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -99,7 +99,7 @@
 		<jmustache.version>1.10</jmustache.version>
 		<joda-time.version>2.8.1</joda-time.version>
 		<jolokia.version>1.3.1</jolokia.version>
-		<json.version>20141113</json.version>
+		<json.version>20140107</json.version>
 		<jooq.version>3.6.2</jooq.version>
 		<json-path.version>2.0.0</json-path.version>
 		<jstl.version>1.2</jstl.version>
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 5484552245..80ae502f80 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -20,7 +20,6 @@
 		<main.basedir>..</main.basedir>
 		<java.version>1.6</java.version>
 		<aether.version>1.0.2.v20150114</aether.version>
-		<json.version>20140107</json.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.version>3.1.1</maven.version>
@@ -195,11 +194,6 @@
 				<artifactId>gradle-plugins</artifactId>
 				<version>${gradle.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.json</groupId>
-				<artifactId>json</artifactId>
-				<version>${json.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok</artifactId>