diff options
-rw-r--r-- | NOTICE | 3 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.2 | 1 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.3 | 1 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.4 | 1 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.6 | 1 | ||||
-rw-r--r-- | dev/deps/spark-deps-hadoop-2.7 | 1 | ||||
-rw-r--r-- | pom.xml | 5 |
7 files changed, 5 insertions, 8 deletions
@@ -421,9 +421,6 @@ Copyright (c) 2011, Terrence Parr. This product includes/uses ASM (http://asm.ow2.org/), Copyright (c) 2000-2007 INRIA, France Telecom. -This product includes/uses org.json (http://www.json.org/java/index.html), -Copyright (c) 2002 JSON.org - This product includes/uses JLine (http://jline.sourceforge.net/), Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>. diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 99279a4ca8..6e749ac16c 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -103,7 +103,6 @@ jline-2.12.1.jar joda-time-2.9.3.jar jodd-core-3.5.2.jar jpam-1.1.jar -json-20090211.jar json4s-ast_2.11-3.2.11.jar json4s-core_2.11-3.2.11.jar json4s-jackson_2.11-3.2.11.jar diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3 index f094b4a7e1..515995a0a4 100644 --- a/dev/deps/spark-deps-hadoop-2.3 +++ b/dev/deps/spark-deps-hadoop-2.3 @@ -108,7 +108,6 @@ jline-2.12.1.jar joda-time-2.9.3.jar jodd-core-3.5.2.jar jpam-1.1.jar -json-20090211.jar json4s-ast_2.11-3.2.11.jar json4s-core_2.11-3.2.11.jar json4s-jackson_2.11-3.2.11.jar diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4 index 7f0ef98680..d2139fd952 100644 --- a/dev/deps/spark-deps-hadoop-2.4 +++ b/dev/deps/spark-deps-hadoop-2.4 @@ -108,7 +108,6 @@ jline-2.12.1.jar joda-time-2.9.3.jar jodd-core-3.5.2.jar jpam-1.1.jar -json-20090211.jar json4s-ast_2.11-3.2.11.jar json4s-core_2.11-3.2.11.jar json4s-jackson_2.11-3.2.11.jar diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6 index 4a27bf3dee..b5cecf72ec 100644 --- a/dev/deps/spark-deps-hadoop-2.6 +++ b/dev/deps/spark-deps-hadoop-2.6 @@ -116,7 +116,6 @@ jline-2.12.1.jar joda-time-2.9.3.jar jodd-core-3.5.2.jar jpam-1.1.jar -json-20090211.jar json4s-ast_2.11-3.2.11.jar json4s-core_2.11-3.2.11.jar json4s-jackson_2.11-3.2.11.jar diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index 151670a8e2..a5e03a78e7 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -116,7 +116,6 @@ jline-2.12.1.jar joda-time-2.9.3.jar jodd-core-3.5.2.jar jpam-1.1.jar -json-20090211.jar json4s-ast_2.11-3.2.11.jar json4s-core_2.11-3.2.11.jar json4s-jackson_2.11-3.2.11.jar @@ -1429,6 +1429,11 @@ <groupId>jline</groupId> <artifactId>jline</artifactId> </exclusion> + <!-- Cat X license now; see SPARK-18262 --> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |