diff options
| author | Sean Owen <sowen@cloudera.com> | 2016-11-10 10:20:03 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-11-10 10:20:03 -0800 |
| commit | 16eaad9daed0b633e6a714b5704509aa7107d6e5 (patch) | |
| tree | 95fe58e0fe1e5407a47995923518d9853fb50975 /dev | |
| parent | 22a9d064e95af71f757113f1869f754cc862df35 (diff) | |
| download | spark-16eaad9daed0b633e6a714b5704509aa7107d6e5.tar.gz spark-16eaad9daed0b633e6a714b5704509aa7107d6e5.tar.bz2 spark-16eaad9daed0b633e6a714b5704509aa7107d6e5.zip | |
[SPARK-18262][BUILD][SQL] JSON.org license is now CatX
## What changes were proposed in this pull request?
Try excluding org.json:json from hive-exec dep as it's Cat X now. It may be the case that it's not used by the part of Hive Spark uses anyway.
## How was this patch tested?
Existing tests
Author: Sean Owen <sowen@cloudera.com>
Closes #15798 from srowen/SPARK-18262.
Diffstat (limited to 'dev')
| -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 |
5 files changed, 0 insertions, 5 deletions
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 |