Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 16eaad9

Browse files
srowenrxin
authored andcommitted
[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 apache#15798 from srowen/SPARK-18262.
1 parent 22a9d06 commit 16eaad9

File tree

7 files changed

+5
-8
lines changed

7 files changed

+5
-8
lines changed

NOTICE

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,6 @@ Copyright (c) 2011, Terrence Parr.
421421
This product includes/uses ASM (http://asm.ow2.org/),
422422
Copyright (c) 2000-2007 INRIA, France Telecom.
423423

424-
This product includes/uses org.json (http://www.json.org/java/index.html),
425-
Copyright (c) 2002 JSON.org
426-
427424
This product includes/uses JLine (http://jline.sourceforge.net/),
428425
Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>.
429426

dev/deps/spark-deps-hadoop-2.2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ jline-2.12.1.jar
103103
joda-time-2.9.3.jar
104104
jodd-core-3.5.2.jar
105105
jpam-1.1.jar
106-
json-20090211.jar
107106
json4s-ast_2.11-3.2.11.jar
108107
json4s-core_2.11-3.2.11.jar
109108
json4s-jackson_2.11-3.2.11.jar

dev/deps/spark-deps-hadoop-2.3

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ jline-2.12.1.jar
108108
joda-time-2.9.3.jar
109109
jodd-core-3.5.2.jar
110110
jpam-1.1.jar
111-
json-20090211.jar
112111
json4s-ast_2.11-3.2.11.jar
113112
json4s-core_2.11-3.2.11.jar
114113
json4s-jackson_2.11-3.2.11.jar

dev/deps/spark-deps-hadoop-2.4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ jline-2.12.1.jar
108108
joda-time-2.9.3.jar
109109
jodd-core-3.5.2.jar
110110
jpam-1.1.jar
111-
json-20090211.jar
112111
json4s-ast_2.11-3.2.11.jar
113112
json4s-core_2.11-3.2.11.jar
114113
json4s-jackson_2.11-3.2.11.jar

dev/deps/spark-deps-hadoop-2.6

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ jline-2.12.1.jar
116116
joda-time-2.9.3.jar
117117
jodd-core-3.5.2.jar
118118
jpam-1.1.jar
119-
json-20090211.jar
120119
json4s-ast_2.11-3.2.11.jar
121120
json4s-core_2.11-3.2.11.jar
122121
json4s-jackson_2.11-3.2.11.jar

dev/deps/spark-deps-hadoop-2.7

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ jline-2.12.1.jar
116116
joda-time-2.9.3.jar
117117
jodd-core-3.5.2.jar
118118
jpam-1.1.jar
119-
json-20090211.jar
120119
json4s-ast_2.11-3.2.11.jar
121120
json4s-core_2.11-3.2.11.jar
122121
json4s-jackson_2.11-3.2.11.jar

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,6 +1429,11 @@
14291429
<groupId>jline</groupId>
14301430
<artifactId>jline</artifactId>
14311431
</exclusion>
1432+
<!-- Cat X license now; see SPARK-18262 -->
1433+
<exclusion>
1434+
<groupId>org.json</groupId>
1435+
<artifactId>json</artifactId>
1436+
</exclusion>
14321437
</exclusions>
14331438
</dependency>
14341439
<dependency>

0 commit comments

Comments
 (0)