From db1f4891e3e9869e4ff3f897f65b3ec160ca58b8 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 22 Jun 2015 10:38:10 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20rely=20on=20org.json:json=20bei?=
 =?UTF-8?q?ng=20pulled=20in=20transitively?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, spring-boot required org.json:json to be on the compile
classpath, but it was only there by virtue of it being a transitive
dependency of another of spring-boot’s dependency. This commit makes
it clear that spring-boot has an (optional) dependency on org.json:json
by having an explicit dependency declaration for it. Additionally, the
name of the version property and the alphabetical ordering in
spring-boot-dependencies have been corrected.

Closes gh-3290
---
 spring-boot-dependencies/pom.xml | 12 ++++++------
 spring-boot/pom.xml              |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index e9a064f2152..aed5eca35c0 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -85,7 +85,6 @@
 		<infinispan.version>7.2.2.Final</infinispan.version>
 		<jackson.version>2.5.4</jackson.version>
 		<janino.version>2.7.8</janino.version>
-		<jason.version>20141113</jason.version>
 		<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
 		<javax-cache.version>1.0.0</javax-cache.version>
 		<javax-mail.version>1.5.3</javax-mail.version>
@@ -100,6 +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-path.version>2.0.0</json-path.version>
 		<jstl.version>1.2</jstl.version>
 		<junit.version>4.12</junit.version>
@@ -1467,11 +1467,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<dependency>
-				<groupId>org.json</groupId>
-				<artifactId>json</artifactId>
-				<version>${json.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.javassist</groupId>
 				<artifactId>javassist</artifactId>
@@ -1487,6 +1482,11 @@
 				<artifactId>jolokia-core</artifactId>
 				<version>${jolokia.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.json</groupId>
+				<artifactId>json</artifactId>
+				<version>${json.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.liquibase</groupId>
 				<artifactId>liquibase-core</artifactId>
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 9a212b45f04..1dc613bc28f 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -169,6 +169,11 @@
 			<artifactId>hibernate-validator</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>