[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.
This commit is contained in:
parent
22a9d064e9
commit
16eaad9dae
3
NOTICE
3
NOTICE
|
@ -421,9 +421,6 @@ Copyright (c) 2011, Terrence Parr.
|
||||||
This product includes/uses ASM (http://asm.ow2.org/),
|
This product includes/uses ASM (http://asm.ow2.org/),
|
||||||
Copyright (c) 2000-2007 INRIA, France Telecom.
|
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/),
|
This product includes/uses JLine (http://jline.sourceforge.net/),
|
||||||
Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>.
|
Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>.
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,6 @@ jline-2.12.1.jar
|
||||||
joda-time-2.9.3.jar
|
joda-time-2.9.3.jar
|
||||||
jodd-core-3.5.2.jar
|
jodd-core-3.5.2.jar
|
||||||
jpam-1.1.jar
|
jpam-1.1.jar
|
||||||
json-20090211.jar
|
|
||||||
json4s-ast_2.11-3.2.11.jar
|
json4s-ast_2.11-3.2.11.jar
|
||||||
json4s-core_2.11-3.2.11.jar
|
json4s-core_2.11-3.2.11.jar
|
||||||
json4s-jackson_2.11-3.2.11.jar
|
json4s-jackson_2.11-3.2.11.jar
|
||||||
|
|
|
@ -108,7 +108,6 @@ jline-2.12.1.jar
|
||||||
joda-time-2.9.3.jar
|
joda-time-2.9.3.jar
|
||||||
jodd-core-3.5.2.jar
|
jodd-core-3.5.2.jar
|
||||||
jpam-1.1.jar
|
jpam-1.1.jar
|
||||||
json-20090211.jar
|
|
||||||
json4s-ast_2.11-3.2.11.jar
|
json4s-ast_2.11-3.2.11.jar
|
||||||
json4s-core_2.11-3.2.11.jar
|
json4s-core_2.11-3.2.11.jar
|
||||||
json4s-jackson_2.11-3.2.11.jar
|
json4s-jackson_2.11-3.2.11.jar
|
||||||
|
|
|
@ -108,7 +108,6 @@ jline-2.12.1.jar
|
||||||
joda-time-2.9.3.jar
|
joda-time-2.9.3.jar
|
||||||
jodd-core-3.5.2.jar
|
jodd-core-3.5.2.jar
|
||||||
jpam-1.1.jar
|
jpam-1.1.jar
|
||||||
json-20090211.jar
|
|
||||||
json4s-ast_2.11-3.2.11.jar
|
json4s-ast_2.11-3.2.11.jar
|
||||||
json4s-core_2.11-3.2.11.jar
|
json4s-core_2.11-3.2.11.jar
|
||||||
json4s-jackson_2.11-3.2.11.jar
|
json4s-jackson_2.11-3.2.11.jar
|
||||||
|
|
|
@ -116,7 +116,6 @@ jline-2.12.1.jar
|
||||||
joda-time-2.9.3.jar
|
joda-time-2.9.3.jar
|
||||||
jodd-core-3.5.2.jar
|
jodd-core-3.5.2.jar
|
||||||
jpam-1.1.jar
|
jpam-1.1.jar
|
||||||
json-20090211.jar
|
|
||||||
json4s-ast_2.11-3.2.11.jar
|
json4s-ast_2.11-3.2.11.jar
|
||||||
json4s-core_2.11-3.2.11.jar
|
json4s-core_2.11-3.2.11.jar
|
||||||
json4s-jackson_2.11-3.2.11.jar
|
json4s-jackson_2.11-3.2.11.jar
|
||||||
|
|
|
@ -116,7 +116,6 @@ jline-2.12.1.jar
|
||||||
joda-time-2.9.3.jar
|
joda-time-2.9.3.jar
|
||||||
jodd-core-3.5.2.jar
|
jodd-core-3.5.2.jar
|
||||||
jpam-1.1.jar
|
jpam-1.1.jar
|
||||||
json-20090211.jar
|
|
||||||
json4s-ast_2.11-3.2.11.jar
|
json4s-ast_2.11-3.2.11.jar
|
||||||
json4s-core_2.11-3.2.11.jar
|
json4s-core_2.11-3.2.11.jar
|
||||||
json4s-jackson_2.11-3.2.11.jar
|
json4s-jackson_2.11-3.2.11.jar
|
||||||
|
|
5
pom.xml
5
pom.xml
|
@ -1429,6 +1429,11 @@
|
||||||
<groupId>jline</groupId>
|
<groupId>jline</groupId>
|
||||||
<artifactId>jline</artifactId>
|
<artifactId>jline</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
|
<!-- Cat X license now; see SPARK-18262 -->
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.json</groupId>
|
||||||
|
<artifactId>json</artifactId>
|
||||||
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
Loading…
Reference in a new issue