Skip to content

Commit c647f90

Browse files
Izek Greenfieldsrowen
Izek Greenfield
authored andcommitted
[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 apache#24736 from igreenfield/master. Authored-by: Izek Greenfield <[email protected]> Signed-off-by: Sean Owen <[email protected]>
1 parent 93db7b8 commit c647f90

6 files changed

+36
-12
lines changed

LICENSE-binary

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ org.eclipse.jetty:jetty-servlets
368368
org.eclipse.jetty:jetty-util
369369
org.eclipse.jetty:jetty-webapp
370370
org.eclipse.jetty:jetty-xml
371+
org.scala-lang.modules:scala-xml_2.12
371372

372373
core/src/main/java/org/apache/spark/util/collection/TimSort.java
373374
core/src/main/resources/org/apache/spark/ui/static/bootstrap*
@@ -412,7 +413,6 @@ org.scala-lang:scala-compiler
412413
org.scala-lang:scala-library
413414
org.scala-lang:scala-reflect
414415
org.scala-lang.modules:scala-parser-combinators_2.12
415-
org.scala-lang.modules:scala-xml_2.12
416416
org.fusesource.leveldbjni:leveldbjni-all
417417
net.sourceforge.f2j:arpack_combined_all
418418
xmlenc:xmlenc

NOTICE-binary

+15
Original file line numberDiff line numberDiff line change
@@ -1163,3 +1163,18 @@ Copyright 2014 The Apache Software Foundation
11631163

11641164
Apache Mahout (http://mahout.apache.org/)
11651165
Copyright 2014 The Apache Software Foundation
1166+
1167+
scala-xml
1168+
Copyright (c) 2002-2019 EPFL
1169+
Copyright (c) 2011-2019 Lightbend, Inc.
1170+
1171+
scala-xml includes software developed at
1172+
LAMP/EPFL (https://lamp.epfl.ch/) and
1173+
Lightbend, Inc. (https://www.lightbend.com/).
1174+
1175+
Licensed under the Apache License, Version 2.0 (the "License").
1176+
Unless required by applicable law or agreed to in writing, software
1177+
distributed under the License is distributed on an "AS IS" BASIS,
1178+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1179+
See the License for the specific language governing permissions and
1180+
limitations under the License.

core/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@
220220
<groupId>commons-net</groupId>
221221
<artifactId>commons-net</artifactId>
222222
</dependency>
223+
<dependency>
224+
<groupId>org.scala-lang.modules</groupId>
225+
<artifactId>scala-xml_${scala.binary.version}</artifactId>
226+
</dependency>
223227
<dependency>
224228
<groupId>org.scala-lang</groupId>
225229
<artifactId>scala-library</artifactId>

dev/deps/spark-deps-hadoop-2.7

+5-5
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ jline-2.14.6.jar
121121
joda-time-2.9.3.jar
122122
jodd-core-3.5.2.jar
123123
jpam-1.1.jar
124-
json4s-ast_2.12-3.5.3.jar
125-
json4s-core_2.12-3.5.3.jar
126-
json4s-jackson_2.12-3.5.3.jar
127-
json4s-scalap_2.12-3.5.3.jar
124+
json4s-ast_2.12-3.6.6.jar
125+
json4s-core_2.12-3.6.6.jar
126+
json4s-jackson_2.12-3.6.6.jar
127+
json4s-scalap_2.12-3.6.6.jar
128128
jsp-api-2.1.jar
129129
jsr305-3.0.0.jar
130130
jta-1.1.jar
@@ -174,7 +174,7 @@ scala-compiler-2.12.8.jar
174174
scala-library-2.12.8.jar
175175
scala-parser-combinators_2.12-1.1.0.jar
176176
scala-reflect-2.12.8.jar
177-
scala-xml_2.12-1.0.6.jar
177+
scala-xml_2.12-1.2.0.jar
178178
shapeless_2.12-2.3.2.jar
179179
shims-0.7.45.jar
180180
slf4j-api-1.7.16.jar

dev/deps/spark-deps-hadoop-3.2

+5-5
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ joda-time-2.9.3.jar
124124
jodd-core-3.5.2.jar
125125
jpam-1.1.jar
126126
json-smart-2.3.jar
127-
json4s-ast_2.12-3.5.3.jar
128-
json4s-core_2.12-3.5.3.jar
129-
json4s-jackson_2.12-3.5.3.jar
130-
json4s-scalap_2.12-3.5.3.jar
127+
json4s-ast_2.12-3.6.6.jar
128+
json4s-core_2.12-3.6.6.jar
129+
json4s-jackson_2.12-3.6.6.jar
130+
json4s-scalap_2.12-3.6.6.jar
131131
jsp-api-2.1.jar
132132
jsr305-3.0.0.jar
133133
jta-1.1.jar
@@ -194,7 +194,7 @@ scala-compiler-2.12.8.jar
194194
scala-library-2.12.8.jar
195195
scala-parser-combinators_2.12-1.1.0.jar
196196
scala-reflect-2.12.8.jar
197-
scala-xml_2.12-1.0.6.jar
197+
scala-xml_2.12-1.2.0.jar
198198
shapeless_2.12-2.3.2.jar
199199
shims-0.7.45.jar
200200
slf4j-api-1.7.16.jar

pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -762,14 +762,19 @@
762762
<dependency>
763763
<groupId>org.json4s</groupId>
764764
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
765-
<version>3.5.3</version>
765+
<version>3.6.6</version>
766766
<exclusions>
767767
<exclusion>
768768
<groupId>com.fasterxml.jackson.core</groupId>
769769
<artifactId>*</artifactId>
770770
</exclusion>
771771
</exclusions>
772772
</dependency>
773+
<dependency>
774+
<groupId>org.scala-lang.modules</groupId>
775+
<artifactId>scala-xml_${scala.binary.version}</artifactId>
776+
<version>1.2.0</version>
777+
</dependency>
773778
<dependency>
774779
<groupId>org.scala-lang</groupId>
775780
<artifactId>scala-compiler</artifactId>

0 commit comments

Comments
 (0)