You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/11/10 18:20:06 UTC
spark git commit: [SPARK-18262][BUILD][SQL] JSON.org license is now
CatX
Repository: spark
Updated Branches:
refs/heads/master 22a9d064e -> 16eaad9da
[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 <so...@cloudera.com>
Closes #15798 from srowen/SPARK-18262.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/16eaad9d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/16eaad9d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/16eaad9d
Branch: refs/heads/master
Commit: 16eaad9daed0b633e6a714b5704509aa7107d6e5
Parents: 22a9d06
Author: Sean Owen <so...@cloudera.com>
Authored: Thu Nov 10 10:20:03 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu Nov 10 10:20:03 2016 -0800
----------------------------------------------------------------------
NOTICE | 3 ---
dev/deps/spark-deps-hadoop-2.2 | 1 -
dev/deps/spark-deps-hadoop-2.3 | 1 -
dev/deps/spark-deps-hadoop-2.4 | 1 -
dev/deps/spark-deps-hadoop-2.6 | 1 -
dev/deps/spark-deps-hadoop-2.7 | 1 -
pom.xml | 5 +++++
7 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/16eaad9d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 69b513e..f4b64b5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -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 <mw...@cornell.edu>.
http://git-wip-us.apache.org/repos/asf/spark/blob/16eaad9d/dev/deps/spark-deps-hadoop-2.2
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 99279a4..6e749ac 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
http://git-wip-us.apache.org/repos/asf/spark/blob/16eaad9d/dev/deps/spark-deps-hadoop-2.3
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index f094b4a..515995a 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
http://git-wip-us.apache.org/repos/asf/spark/blob/16eaad9d/dev/deps/spark-deps-hadoop-2.4
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index 7f0ef98..d2139fd 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
http://git-wip-us.apache.org/repos/asf/spark/blob/16eaad9d/dev/deps/spark-deps-hadoop-2.6
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 4a27bf3..b5cecf7 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
http://git-wip-us.apache.org/repos/asf/spark/blob/16eaad9d/dev/deps/spark-deps-hadoop-2.7
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 151670a..a5e03a7 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
http://git-wip-us.apache.org/repos/asf/spark/blob/16eaad9d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 04d2eaa..8aa0a6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org