[SPARK-27862][BUILD] Move to json4s 3.6.6
## What changes were proposed in this pull request? Move to json4s version 3.6.6 Add scala-xml 1.2.0 ## How was this patch tested? Pass the Jenkins Closes #24736 from igreenfield/master. Authored-by: Izek Greenfield <igreenfield@axiomsl.com> Signed-off-by: Sean Owen <sean.owen@databricks.com>
This commit is contained in:
parent
93db7b870d
commit
c647f9011c
|
@ -368,6 +368,7 @@ org.eclipse.jetty:jetty-servlets
|
|||
org.eclipse.jetty:jetty-util
|
||||
org.eclipse.jetty:jetty-webapp
|
||||
org.eclipse.jetty:jetty-xml
|
||||
org.scala-lang.modules:scala-xml_2.12
|
||||
|
||||
core/src/main/java/org/apache/spark/util/collection/TimSort.java
|
||||
core/src/main/resources/org/apache/spark/ui/static/bootstrap*
|
||||
|
@ -412,7 +413,6 @@ org.scala-lang:scala-compiler
|
|||
org.scala-lang:scala-library
|
||||
org.scala-lang:scala-reflect
|
||||
org.scala-lang.modules:scala-parser-combinators_2.12
|
||||
org.scala-lang.modules:scala-xml_2.12
|
||||
org.fusesource.leveldbjni:leveldbjni-all
|
||||
net.sourceforge.f2j:arpack_combined_all
|
||||
xmlenc:xmlenc
|
||||
|
|
|
@ -1163,3 +1163,18 @@ Copyright 2014 The Apache Software Foundation
|
|||
|
||||
Apache Mahout (http://mahout.apache.org/)
|
||||
Copyright 2014 The Apache Software Foundation
|
||||
|
||||
scala-xml
|
||||
Copyright (c) 2002-2019 EPFL
|
||||
Copyright (c) 2011-2019 Lightbend, Inc.
|
||||
|
||||
scala-xml includes software developed at
|
||||
LAMP/EPFL (https://lamp.epfl.ch/) and
|
||||
Lightbend, Inc. (https://www.lightbend.com/).
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License").
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
|
@ -220,6 +220,10 @@
|
|||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.scala-lang.modules</groupId>
|
||||
<artifactId>scala-xml_${scala.binary.version}</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.scala-lang</groupId>
|
||||
<artifactId>scala-library</artifactId>
|
||||
|
|
|
@ -121,10 +121,10 @@ jline-2.14.6.jar
|
|||
joda-time-2.9.3.jar
|
||||
jodd-core-3.5.2.jar
|
||||
jpam-1.1.jar
|
||||
json4s-ast_2.12-3.5.3.jar
|
||||
json4s-core_2.12-3.5.3.jar
|
||||
json4s-jackson_2.12-3.5.3.jar
|
||||
json4s-scalap_2.12-3.5.3.jar
|
||||
json4s-ast_2.12-3.6.6.jar
|
||||
json4s-core_2.12-3.6.6.jar
|
||||
json4s-jackson_2.12-3.6.6.jar
|
||||
json4s-scalap_2.12-3.6.6.jar
|
||||
jsp-api-2.1.jar
|
||||
jsr305-3.0.0.jar
|
||||
jta-1.1.jar
|
||||
|
@ -174,7 +174,7 @@ scala-compiler-2.12.8.jar
|
|||
scala-library-2.12.8.jar
|
||||
scala-parser-combinators_2.12-1.1.0.jar
|
||||
scala-reflect-2.12.8.jar
|
||||
scala-xml_2.12-1.0.6.jar
|
||||
scala-xml_2.12-1.2.0.jar
|
||||
shapeless_2.12-2.3.2.jar
|
||||
shims-0.7.45.jar
|
||||
slf4j-api-1.7.16.jar
|
||||
|
|
|
@ -124,10 +124,10 @@ joda-time-2.9.3.jar
|
|||
jodd-core-3.5.2.jar
|
||||
jpam-1.1.jar
|
||||
json-smart-2.3.jar
|
||||
json4s-ast_2.12-3.5.3.jar
|
||||
json4s-core_2.12-3.5.3.jar
|
||||
json4s-jackson_2.12-3.5.3.jar
|
||||
json4s-scalap_2.12-3.5.3.jar
|
||||
json4s-ast_2.12-3.6.6.jar
|
||||
json4s-core_2.12-3.6.6.jar
|
||||
json4s-jackson_2.12-3.6.6.jar
|
||||
json4s-scalap_2.12-3.6.6.jar
|
||||
jsp-api-2.1.jar
|
||||
jsr305-3.0.0.jar
|
||||
jta-1.1.jar
|
||||
|
@ -194,7 +194,7 @@ scala-compiler-2.12.8.jar
|
|||
scala-library-2.12.8.jar
|
||||
scala-parser-combinators_2.12-1.1.0.jar
|
||||
scala-reflect-2.12.8.jar
|
||||
scala-xml_2.12-1.0.6.jar
|
||||
scala-xml_2.12-1.2.0.jar
|
||||
shapeless_2.12-2.3.2.jar
|
||||
shims-0.7.45.jar
|
||||
slf4j-api-1.7.16.jar
|
||||
|
|
7
pom.xml
7
pom.xml
|
@ -762,7 +762,7 @@
|
|||
<dependency>
|
||||
<groupId>org.json4s</groupId>
|
||||
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
|
||||
<version>3.5.3</version>
|
||||
<version>3.6.6</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
|
@ -770,6 +770,11 @@
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.scala-lang.modules</groupId>
|
||||
<artifactId>scala-xml_${scala.binary.version}</artifactId>
|
||||
<version>1.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.scala-lang</groupId>
|
||||
<artifactId>scala-compiler</artifactId>
|
||||
|
|
Loading…
Reference in a new issue