Skip to content

Commit 68375f0

Browse files
committed
Upgrade guava and hadoop.
1 parent 71aea02 commit 68375f0

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

dev/deps/spark-deps-hadoop-3.2-hive-2.3

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ accessors-smart/1.2//accessors-smart-1.2.jar
77
activation/1.1.1//activation-1.1.1.jar
88
aircompressor/0.10//aircompressor-0.10.jar
99
algebra_2.12/2.0.0-M2//algebra_2.12-2.0.0-M2.jar
10+
animal-sniffer-annotations/1.17//animal-sniffer-annotations-1.17.jar
1011
antlr-runtime/3.5.2//antlr-runtime-3.5.2.jar
1112
antlr4-runtime/4.7.1//antlr4-runtime-4.7.1.jar
1213
aopalliance-repackaged/2.6.1//aopalliance-repackaged-2.6.1.jar
@@ -20,10 +21,13 @@ automaton/1.11-8//automaton-1.11-8.jar
2021
avro-ipc/1.8.2//avro-ipc-1.8.2.jar
2122
avro-mapred/1.8.2/hadoop2/avro-mapred-1.8.2-hadoop2.jar
2223
avro/1.8.2//avro-1.8.2.jar
24+
bcpkix-jdk15on/1.60//bcpkix-jdk15on-1.60.jar
25+
bcprov-jdk15on/1.60//bcprov-jdk15on-1.60.jar
2326
bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar
2427
breeze-macros_2.12/1.0//breeze-macros_2.12-1.0.jar
2528
breeze_2.12/1.0//breeze_2.12-1.0.jar
2629
cats-kernel_2.12/2.0.0-M4//cats-kernel_2.12-2.0.0-M4.jar
30+
checker-qual/2.5.2//checker-qual-2.5.2.jar
2731
chill-java/0.9.5//chill-java-0.9.5.jar
2832
chill_2.12/0.9.5//chill_2.12-0.9.5.jar
2933
commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
@@ -57,27 +61,29 @@ derby/10.12.1.1//derby-10.12.1.1.jar
5761
dnsjava/2.1.7//dnsjava-2.1.7.jar
5862
dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
5963
ehcache/3.3.1//ehcache-3.3.1.jar
64+
error_prone_annotations/2.2.0//error_prone_annotations-2.2.0.jar
65+
failureaccess/1.0//failureaccess-1.0.jar
6066
flatbuffers-java/1.9.0//flatbuffers-java-1.9.0.jar
6167
generex/1.0.2//generex-1.0.2.jar
6268
geronimo-jcache_1.0_spec/1.0-alpha-1//geronimo-jcache_1.0_spec-1.0-alpha-1.jar
6369
gson/2.2.4//gson-2.2.4.jar
64-
guava/14.0.1//guava-14.0.1.jar
70+
guava/27.0-jre//guava-27.0-jre.jar
6571
guice-servlet/4.0//guice-servlet-4.0.jar
6672
guice/4.0//guice-4.0.jar
67-
hadoop-annotations/3.2.0//hadoop-annotations-3.2.0.jar
68-
hadoop-auth/3.2.0//hadoop-auth-3.2.0.jar
69-
hadoop-client/3.2.0//hadoop-client-3.2.0.jar
70-
hadoop-common/3.2.0//hadoop-common-3.2.0.jar
71-
hadoop-hdfs-client/3.2.0//hadoop-hdfs-client-3.2.0.jar
72-
hadoop-mapreduce-client-common/3.2.0//hadoop-mapreduce-client-common-3.2.0.jar
73-
hadoop-mapreduce-client-core/3.2.0//hadoop-mapreduce-client-core-3.2.0.jar
74-
hadoop-mapreduce-client-jobclient/3.2.0//hadoop-mapreduce-client-jobclient-3.2.0.jar
75-
hadoop-yarn-api/3.2.0//hadoop-yarn-api-3.2.0.jar
76-
hadoop-yarn-client/3.2.0//hadoop-yarn-client-3.2.0.jar
77-
hadoop-yarn-common/3.2.0//hadoop-yarn-common-3.2.0.jar
78-
hadoop-yarn-registry/3.2.0//hadoop-yarn-registry-3.2.0.jar
79-
hadoop-yarn-server-common/3.2.0//hadoop-yarn-server-common-3.2.0.jar
80-
hadoop-yarn-server-web-proxy/3.2.0//hadoop-yarn-server-web-proxy-3.2.0.jar
73+
hadoop-annotations/3.2.1//hadoop-annotations-3.2.1.jar
74+
hadoop-auth/3.2.1//hadoop-auth-3.2.1.jar
75+
hadoop-client/3.2.1//hadoop-client-3.2.1.jar
76+
hadoop-common/3.2.1//hadoop-common-3.2.1.jar
77+
hadoop-hdfs-client/3.2.1//hadoop-hdfs-client-3.2.1.jar
78+
hadoop-mapreduce-client-common/3.2.1//hadoop-mapreduce-client-common-3.2.1.jar
79+
hadoop-mapreduce-client-core/3.2.1//hadoop-mapreduce-client-core-3.2.1.jar
80+
hadoop-mapreduce-client-jobclient/3.2.1//hadoop-mapreduce-client-jobclient-3.2.1.jar
81+
hadoop-yarn-api/3.2.1//hadoop-yarn-api-3.2.1.jar
82+
hadoop-yarn-client/3.2.1//hadoop-yarn-client-3.2.1.jar
83+
hadoop-yarn-common/3.2.1//hadoop-yarn-common-3.2.1.jar
84+
hadoop-yarn-registry/3.2.1//hadoop-yarn-registry-3.2.1.jar
85+
hadoop-yarn-server-common/3.2.1//hadoop-yarn-server-common-3.2.1.jar
86+
hadoop-yarn-server-web-proxy/3.2.1//hadoop-yarn-server-web-proxy-3.2.1.jar
8187
hive-beeline/2.3.7//hive-beeline-2.3.7.jar
8288
hive-cli/2.3.7//hive-cli-2.3.7.jar
8389
hive-common/2.3.7//hive-common-2.3.7.jar
@@ -100,14 +106,15 @@ httpclient/4.5.6//httpclient-4.5.6.jar
100106
httpcore/4.4.12//httpcore-4.4.12.jar
101107
istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar
102108
ivy/2.4.0//ivy-2.4.0.jar
109+
j2objc-annotations/1.1//j2objc-annotations-1.1.jar
103110
jackson-annotations/2.10.0//jackson-annotations-2.10.0.jar
104111
jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar
105112
jackson-core/2.10.0//jackson-core-2.10.0.jar
106113
jackson-databind/2.10.0//jackson-databind-2.10.0.jar
107114
jackson-dataformat-yaml/2.10.0//jackson-dataformat-yaml-2.10.0.jar
108115
jackson-datatype-jsr310/2.10.3//jackson-datatype-jsr310-2.10.3.jar
109-
jackson-jaxrs-base/2.9.5//jackson-jaxrs-base-2.9.5.jar
110-
jackson-jaxrs-json-provider/2.9.5//jackson-jaxrs-json-provider-2.9.5.jar
116+
jackson-jaxrs-base/2.9.8//jackson-jaxrs-base-2.9.8.jar
117+
jackson-jaxrs-json-provider/2.9.8//jackson-jaxrs-json-provider-2.9.8.jar
111118
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
112119
jackson-module-jaxb-annotations/2.10.0//jackson-module-jaxb-annotations-2.10.0.jar
113120
jackson-module-paranamer/2.10.0//jackson-module-paranamer-2.10.0.jar
@@ -171,6 +178,7 @@ kubernetes-model/4.9.2//kubernetes-model-4.9.2.jar
171178
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
172179
libfb303/0.9.3//libfb303-0.9.3.jar
173180
libthrift/0.12.0//libthrift-0.12.0.jar
181+
listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
174182
log4j/1.2.17//log4j-1.2.17.jar
175183
logging-interceptor/3.12.6//logging-interceptor-3.12.6.jar
176184
lz4-java/1.7.1//lz4-java-1.7.1.jar

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<sbt.project.name>spark</sbt.project.name>
121121
<slf4j.version>1.7.30</slf4j.version>
122122
<log4j.version>1.2.17</log4j.version>
123-
<hadoop.version>3.2.0</hadoop.version>
123+
<hadoop.version>3.2.1</hadoop.version>
124124
<protobuf.version>2.5.0</protobuf.version>
125125
<yarn.version>${hadoop.version}</yarn.version>
126126
<zookeeper.version>3.4.14</zookeeper.version>
@@ -180,7 +180,7 @@
180180
<!-- org.apache.commons/commons-pool2/-->
181181
<commons-pool2.version>2.6.2</commons-pool2.version>
182182
<datanucleus-core.version>4.1.17</datanucleus-core.version>
183-
<guava.version>14.0.1</guava.version>
183+
<guava.version>27.0-jre</guava.version>
184184
<janino.version>3.1.2</janino.version>
185185
<jersey.version>2.30</jersey.version>
186186
<joda.version>2.10.5</joda.version>
@@ -3129,6 +3129,7 @@
31293129
<hadoop.version>2.7.4</hadoop.version>
31303130
<curator.version>2.7.1</curator.version>
31313131
<commons-io.version>2.4</commons-io.version>
3132+
<guava.version>14.0.1</guava.version>
31323133
</properties>
31333134
</profile>
31343135

project/SparkBuild.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ object KubernetesIntegrationTests {
626626
* Overrides to work around sbt's dependency resolution being different from Maven's.
627627
*/
628628
object DependencyOverrides {
629-
lazy val guavaVersion = sys.props.get("guava.version").getOrElse("14.0.1")
629+
lazy val guavaVersion = sys.props.get("guava.version").getOrElse("27.0-jre")
630630
lazy val settings = Seq(
631631
dependencyOverrides += "com.google.guava" % "guava" % guavaVersion,
632632
dependencyOverrides += "xerces" % "xercesImpl" % "2.12.0",

0 commit comments

Comments
 (0)