aboutsummaryrefslogtreecommitdiff
path: root/NOTICE
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2016-11-10 10:20:03 -0800
committerReynold Xin <rxin@databricks.com>2016-11-10 10:20:03 -0800
commit16eaad9daed0b633e6a714b5704509aa7107d6e5 (patch)
tree95fe58e0fe1e5407a47995923518d9853fb50975 /NOTICE
parent22a9d064e95af71f757113f1869f754cc862df35 (diff)
downloadspark-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 'NOTICE')
-rw-r--r--NOTICE3
1 files changed, 0 insertions, 3 deletions
diff --git a/NOTICE b/NOTICE
index 69b513ea3b..f4b64b5c3f 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 <mwp1@cornell.edu>.