Drop support for org.json:json-based JSON parsing

Closes gh-8710
spring-projects · May 4, 2017 · 11c3c4c · 11c3c4c
1 parent 05cf41b
commit 11c3c4c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 137 deletions.
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
@@ -117,7 +117,6 @@
 		<joda-time.version>2.9.9</joda-time.version>
 		<jolokia.version>1.3.6</jolokia.version>
 		<jooq.version>3.9.1</jooq.version>
-		<json.version>20140107</json.version>
 		<jsonassert.version>1.5.0</jsonassert.version>
 		<json-path.version>2.2.0</json-path.version>
 		<jstl.version>1.2</jstl.version>
@@ -1787,11 +1786,6 @@
 				<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.jooq</groupId>
 				<artifactId>jooq</artifactId>

diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
@@ -463,11 +463,6 @@
 			<artifactId>infinispan-spring4-embedded</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.jolokia</groupId>
 			<artifactId>jolokia-core</artifactId>

diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
@@ -174,11 +174,6 @@
 			<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>

diff --git a/spring-boot/src/main/java/org/springframework/boot/json/JsonJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonJsonParser.java
diff --git a/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
  * @see GsonJsonParser
  * @see YamlJsonParser
  * @see JsonSimpleJsonParser
- * @see JsonJsonParser
  * @see BasicJsonParser
  */
 public abstract class JsonParserFactory {
@@ -50,9 +49,6 @@ public static JsonParser getJsonParser() {
 		if (ClassUtils.isPresent("org.json.simple.JSONObject", null)) {
 			return new JsonSimpleJsonParser();
 		}
-		if (ClassUtils.isPresent("org.json.JSONObject", null)) {
-			return new JsonJsonParser();
-		}
 		return new BasicJsonParser();
 	}
 

diff --git a/spring-boot/src/test/java/org/springframework/boot/json/JsonJsonParserTests.java b/spring-boot/src/test/java/org/springframework/boot/json/JsonJsonParserTests.java