Skip to content

Commit f057c72

Browse files
authored
Dependecy upgrades (apache-spark-on-k8s#409)
1 parent b2f4c27 commit f057c72

File tree

4 files changed

+64
-131
lines changed

4 files changed

+64
-131
lines changed

dev/deps/spark-deps-hadoop-palantir

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
HikariCP-java7-2.4.12.jar
2-
RoaringBitmap-0.6.43.jar
2+
RoaringBitmap-0.7.16.jar
33
activation-1.1.1.jar
44
aircompressor-0.10.jar
55
antlr4-runtime-4.7.jar
@@ -26,21 +26,21 @@ classmate-1.1.0.jar
2626
commons-beanutils-1.9.3.jar
2727
commons-beanutils-core-1.8.0.jar
2828
commons-cli-1.2.jar
29-
commons-codec-1.10.jar
29+
commons-codec-1.11.jar
3030
commons-collections-3.2.2.jar
3131
commons-compiler-3.0.9.jar
3232
commons-compress-1.8.1.jar
3333
commons-configuration-1.6.jar
3434
commons-crypto-1.0.0.jar
3535
commons-digester-1.8.jar
3636
commons-httpclient-3.1.jar
37-
commons-io-2.4.jar
37+
commons-io-2.6.jar
3838
commons-lang-2.6.jar
39-
commons-lang3-3.5.jar
39+
commons-lang3-3.8.jar
4040
commons-logging-1.2.jar
41-
commons-math3-3.4.1.jar
42-
commons-net-3.1.jar
43-
compress-lzf-1.0.3.jar
41+
commons-math3-3.6.1.jar
42+
commons-net-3.6.jar
43+
compress-lzf-1.0.4.jar
4444
core-1.1.2.jar
4545
curator-client-2.7.1.jar
4646
curator-framework-2.7.1.jar
@@ -86,22 +86,22 @@ htrace-core4-4.1.0-incubating.jar
8686
httpclient-4.5.6.jar
8787
httpcore-4.4.10.jar
8888
ivy-2.4.0.jar
89-
jackson-annotations-2.9.5.jar
90-
jackson-core-2.9.5.jar
89+
jackson-annotations-2.9.6.jar
90+
jackson-core-2.9.6.jar
9191
jackson-core-asl-1.9.13.jar
92-
jackson-databind-2.9.5.jar
93-
jackson-dataformat-cbor-2.9.5.jar
94-
jackson-dataformat-yaml-2.9.5.jar
95-
jackson-datatype-guava-2.9.5.jar
96-
jackson-datatype-jdk8-2.9.5.jar
97-
jackson-datatype-joda-2.9.5.jar
98-
jackson-datatype-jsr310-2.9.5.jar
92+
jackson-databind-2.9.6.jar
93+
jackson-dataformat-cbor-2.9.6.jar
94+
jackson-dataformat-yaml-2.9.6.jar
95+
jackson-datatype-guava-2.9.6.jar
96+
jackson-datatype-jdk8-2.9.6.jar
97+
jackson-datatype-joda-2.9.6.jar
98+
jackson-datatype-jsr310-2.9.6.jar
9999
jackson-jaxrs-1.9.13.jar
100100
jackson-mapper-asl-1.9.13.jar
101-
jackson-module-afterburner-2.9.5.jar
102-
jackson-module-jaxb-annotations-2.9.5.jar
103-
jackson-module-paranamer-2.9.5.jar
104-
jackson-module-scala_2.11-2.9.5.jar
101+
jackson-module-afterburner-2.9.6.jar
102+
jackson-module-jaxb-annotations-2.9.6.jar
103+
jackson-module-paranamer-2.9.6.jar
104+
jackson-module-scala_2.11-2.9.6.jar
105105
jackson-xc-1.9.13.jar
106106
janino-3.0.9.jar
107107
javassist-3.20.0-GA.jar
@@ -125,15 +125,15 @@ jersey-server-2.25.1.jar
125125
jetty-6.1.26.jar
126126
jetty-sslengine-6.1.26.jar
127127
jetty-util-6.1.26.jar
128-
jetty-util-9.4.8.v20171121.jar
129-
joda-time-2.9.9.jar
128+
jetty-util-9.4.12.v20180830.jar
129+
joda-time-2.10.jar
130130
json-smart-1.3.1.jar
131131
json4s-ast_2.11-3.5.3.jar
132132
json4s-core_2.11-3.5.3.jar
133133
json4s-jackson_2.11-3.5.3.jar
134134
json4s-scalap_2.11-3.5.3.jar
135135
jsp-api-2.1.jar
136-
jsr305-3.0.1.jar
136+
jsr305-3.0.2.jar
137137
jtransforms-2.4.0.jar
138138
jul-to-slf4j-1.7.25.jar
139139
kafka-clients-0.11.0.0.jar
@@ -142,24 +142,24 @@ kubernetes-client-3.0.0.jar
142142
kubernetes-model-2.0.0.jar
143143
leveldbjni-all-1.8.jar
144144
log4j-1.2.17.jar
145-
logging-interceptor-3.9.1.jar
146-
lz4-java-1.4.0.jar
145+
logging-interceptor-3.11.0.jar
146+
lz4-java-1.4.1.jar
147147
machinist_2.11-0.6.1.jar
148148
macro-compat_2.11-1.1.1.jar
149-
metrics-core-3.2.5.jar
150-
metrics-graphite-3.2.5.jar
149+
metrics-core-3.2.6.jar
150+
metrics-graphite-3.2.6.jar
151151
metrics-influxdb-1.2.2.jar
152-
metrics-json-3.2.5.jar
153-
metrics-jvm-3.2.5.jar
152+
metrics-json-3.2.6.jar
153+
metrics-jvm-3.2.6.jar
154154
minlog-1.3.0.jar
155155
mssql-jdbc-6.2.1.jre7.jar
156156
netty-3.10.6.Final.jar
157-
netty-all-4.1.17.Final.jar
157+
netty-all-4.1.29.Final.jar
158158
nimbus-jose-jwt-4.41.1.jar
159-
objenesis-2.5.1.jar
159+
objenesis-2.6.jar
160160
okhttp-2.7.5.jar
161-
okhttp-3.9.1.jar
162-
okio-1.13.0.jar
161+
okhttp-3.11.0.jar
162+
okio-1.15.0.jar
163163
opencsv-2.3.jar
164164
orc-core-1.5.2-nohive.jar
165165
orc-mapreduce-1.5.2-nohive.jar
@@ -185,12 +185,12 @@ shapeless_2.11-2.3.2.jar
185185
slf4j-api-1.7.25.jar
186186
slf4j-log4j12-1.7.25.jar
187187
snakeyaml-1.18.jar
188-
snappy-java-1.1.7.1.jar
188+
snappy-java-1.1.7.2.jar
189189
spire-macros_2.11-0.13.0.jar
190190
spire_2.11-0.13.0.jar
191191
stax-api-1.0-2.jar
192192
stax2-api-3.1.4.jar
193-
stream-2.7.0.jar
193+
stream-2.9.6.jar
194194
univocity-parsers-2.7.3.jar
195195
validation-api-1.1.0.Final.jar
196196
woodstox-core-5.0.3.jar
@@ -199,4 +199,4 @@ xmlenc-0.52.jar
199199
xz-1.5.jar
200200
zjsonpatch-0.3.0.jar
201201
zookeeper-3.4.6.jar
202-
zstd-jni-1.3.2-2.jar
202+
zstd-jni-1.3.5-3.jar

dev/sbt-checkstyle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# with failure (either resolution or compilation); the "q" makes SBT quit.
2222
ERRORS=$(echo -e "q\n" \
2323
| build/sbt \
24+
-Phadoop-palantir \
2425
-Pkinesis-asl \
2526
-Pmesos \
2627
-Pkafka-0-8 \

pom.xml

Lines changed: 26 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,17 @@
132132
<hive.version.short>1.2.1</hive.version.short>
133133
<derby.version>10.12.1.1</derby.version>
134134
<parquet.version>1.10.1-palantir.3</parquet.version>
135-
<feign.version>8.18.0</feign.version>
136-
<okhttp3.version>3.9.1</okhttp3.version>
135+
<okhttp3.version>3.11.0</okhttp3.version>
137136
<okhttp.version>2.7.5</okhttp.version>
138-
<okio.version>1.13.0</okio.version>
139-
<retrofit.version>2.3.0</retrofit.version>
140-
<bouncycastle.version>1.58</bouncycastle.version>
141-
<jetty.version>9.4.8.v20171121</jetty.version>
137+
<okio.version>1.15.0</okio.version>
138+
<jetty.version>9.4.12.v20180830</jetty.version>
142139
<orc.version>1.5.2</orc.version>
143140
<orc.classifier>nohive</orc.classifier>
144141
<javaxservlet.version>3.1.0</javaxservlet.version>
145142
<chill.version>0.9.3</chill.version>
146143
<ivy.version>2.4.0</ivy.version>
147144
<oro.version>2.0.8</oro.version>
148-
<codahale.metrics.version>3.2.5</codahale.metrics.version>
145+
<dropwizard.metrics.version>3.2.6</dropwizard.metrics.version>
149146
<dropwizard.version>1.0.0</dropwizard.version>
150147
<spark-influx-sink.version>0.4.0</spark-influx-sink.version>
151148
<avro.version>1.8.2</avro.version>
@@ -162,33 +159,33 @@
162159
<commons.httpcore.version>4.4.10</commons.httpcore.version>
163160
<!-- commons-httpclient/commons-httpclient-->
164161
<httpclient.classic.version>3.1</httpclient.classic.version>
165-
<commons.math3.version>3.4.1</commons.math3.version>
162+
<commons.math3.version>3.6.1</commons.math3.version>
166163
<!-- managed up from 3.2.1 for SPARK-11652 -->
167164
<commons.collections.version>3.2.2</commons.collections.version>
168165
<scala.version>2.11.12</scala.version>
169166
<scala.binary.version>2.11</scala.binary.version>
170167
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
171-
<fasterxml.jackson.version>2.9.5</fasterxml.jackson.version>
172-
<fasterxml.jackson.databind.version>2.9.5</fasterxml.jackson.databind.version>
173-
<snappy.version>1.1.7.1</snappy.version>
168+
<fasterxml.jackson.version>2.9.6</fasterxml.jackson.version>
169+
<fasterxml.jackson.databind.version>2.9.6</fasterxml.jackson.databind.version>
170+
<snappy.version>1.1.7.2</snappy.version>
174171
<netlib.java.version>1.1.2</netlib.java.version>
175172
<calcite.version>1.2.0-incubating</calcite.version>
176-
<commons-codec.version>1.10</commons-codec.version>
177-
<commons-io.version>2.4</commons-io.version>
173+
<commons-codec.version>1.11</commons-codec.version>
174+
<commons-io.version>2.6</commons-io.version>
178175
<!-- org.apache.commons/commons-lang/-->
179176
<commons-lang2.version>2.6</commons-lang2.version>
180177
<!-- org.apache.commons/commons-lang3/-->
181-
<commons-lang3.version>3.5</commons-lang3.version>
178+
<commons-lang3.version>3.8</commons-lang3.version>
182179
<commons-compress.version>1.8.1</commons-compress.version>
183180
<commons-pool.version>1.6</commons-pool.version>
184181
<datanucleus-core.version>3.2.10</datanucleus-core.version>
185182
<javax-activation.version>1.1.1</javax-activation.version>
186-
<objenesis.version>2.5.1</objenesis.version>
183+
<objenesis.version>2.6</objenesis.version>
187184
<janino.version>3.0.9</janino.version>
188185
<jersey.version>2.25.1</jersey.version>
189-
<joda.version>2.9.9</joda.version>
186+
<joda.version>2.10</joda.version>
190187
<jodd.version>3.5.2</jodd.version>
191-
<jsr305.version>3.0.1</jsr305.version>
188+
<jsr305.version>3.0.2</jsr305.version>
192189
<libthrift.version>0.9.3</libthrift.version>
193190
<antlr4.version>4.7</antlr4.version>
194191
<antlr.version>3.4</antlr.version>
@@ -369,61 +366,6 @@
369366
<artifactId>okhttp</artifactId>
370367
<version>${okhttp.version}</version>
371368
</dependency>
372-
373-
<dependency>
374-
<groupId>com.squareup.retrofit2</groupId>
375-
<artifactId>retrofit</artifactId>
376-
<version>${retrofit.version}</version>
377-
<exclusions>
378-
<exclusion>
379-
<groupId>com.fasterxml.jackson.core</groupId>
380-
<artifactId>jackson-core</artifactId>
381-
</exclusion>
382-
<exclusion>
383-
<groupId>com.fasterxml.jackson.core</groupId>
384-
<artifactId>jackson-databind</artifactId>
385-
</exclusion>
386-
<exclusion>
387-
<groupId>com.fasterxml.jackson.core</groupId>
388-
<artifactId>jackson-annotations</artifactId>
389-
</exclusion>
390-
</exclusions>
391-
</dependency>
392-
<dependency>
393-
<groupId>com.squareup.retrofit2</groupId>
394-
<artifactId>converter-jackson</artifactId>
395-
<version>${retrofit.version}</version>
396-
<exclusions>
397-
<exclusion>
398-
<groupId>com.fasterxml.jackson.core</groupId>
399-
<artifactId>jackson-core</artifactId>
400-
</exclusion>
401-
<exclusion>
402-
<groupId>com.fasterxml.jackson.core</groupId>
403-
<artifactId>jackson-databind</artifactId>
404-
</exclusion>
405-
<exclusion>
406-
<groupId>com.fasterxml.jackson.core</groupId>
407-
<artifactId>jackson-annotations</artifactId>
408-
</exclusion>
409-
</exclusions>
410-
</dependency>
411-
<dependency>
412-
<groupId>com.squareup.retrofit2</groupId>
413-
<artifactId>converter-scalars</artifactId>
414-
<version>${retrofit.version}</version>
415-
</dependency>
416-
<dependency>
417-
<groupId>org.bouncycastle</groupId>
418-
<artifactId>bcpkix-jdk15on</artifactId>
419-
<version>${bouncycastle.version}</version>
420-
</dependency>
421-
<dependency>
422-
<groupId>org.bouncycastle</groupId>
423-
<artifactId>bcprov-jdk15on</artifactId>
424-
<!-- brought in by jets3t; see SPARK-22634 -->
425-
<version>${bouncycastle.version}</version>
426-
</dependency>
427369
<!-- This artifact is a shaded version of ASM 6.x. The POM that was used to produce this
428370
is at https://github.com/apache/geronimo-xbean/tree/trunk/xbean-asm6-shaded
429371
For context on why we shade ASM, see SPARK-782 and SPARK-6152. -->
@@ -666,7 +608,7 @@
666608
<dependency>
667609
<groupId>com.ning</groupId>
668610
<artifactId>compress-lzf</artifactId>
669-
<version>1.0.3</version>
611+
<version>1.0.4</version>
670612
</dependency>
671613
<dependency>
672614
<groupId>org.xerial.snappy</groupId>
@@ -676,17 +618,17 @@
676618
<dependency>
677619
<groupId>org.lz4</groupId>
678620
<artifactId>lz4-java</artifactId>
679-
<version>1.4.0</version>
621+
<version>1.4.1</version>
680622
</dependency>
681623
<dependency>
682624
<groupId>com.github.luben</groupId>
683625
<artifactId>zstd-jni</artifactId>
684-
<version>1.3.2-2</version>
626+
<version>1.3.5-3</version>
685627
</dependency>
686628
<dependency>
687629
<groupId>com.clearspring.analytics</groupId>
688630
<artifactId>stream</artifactId>
689-
<version>2.7.0</version>
631+
<version>2.9.6</version>
690632
<exclusions>
691633
<!-- Only HyperLogLogPlus is used, which doesn't depend on fastutil -->
692634
<exclusion>
@@ -709,17 +651,17 @@
709651
<dependency>
710652
<groupId>org.roaringbitmap</groupId>
711653
<artifactId>RoaringBitmap</artifactId>
712-
<version>0.6.43</version>
654+
<version>0.7.16</version>
713655
</dependency>
714656
<dependency>
715657
<groupId>commons-net</groupId>
716658
<artifactId>commons-net</artifactId>
717-
<version>3.1</version>
659+
<version>3.6</version>
718660
</dependency>
719661
<dependency>
720662
<groupId>io.netty</groupId>
721663
<artifactId>netty-all</artifactId>
722-
<version>4.1.17.Final</version>
664+
<version>4.1.29.Final</version>
723665
</dependency>
724666
<dependency>
725667
<groupId>io.netty</groupId>
@@ -734,27 +676,27 @@
734676
<dependency>
735677
<groupId>io.dropwizard.metrics</groupId>
736678
<artifactId>metrics-core</artifactId>
737-
<version>${codahale.metrics.version}</version>
679+
<version>${dropwizard.metrics.version}</version>
738680
</dependency>
739681
<dependency>
740682
<groupId>io.dropwizard.metrics</groupId>
741683
<artifactId>metrics-jvm</artifactId>
742-
<version>${codahale.metrics.version}</version>
684+
<version>${dropwizard.metrics.version}</version>
743685
</dependency>
744686
<dependency>
745687
<groupId>io.dropwizard.metrics</groupId>
746688
<artifactId>metrics-json</artifactId>
747-
<version>${codahale.metrics.version}</version>
689+
<version>${dropwizard.metrics.version}</version>
748690
</dependency>
749691
<dependency>
750692
<groupId>io.dropwizard.metrics</groupId>
751693
<artifactId>metrics-ganglia</artifactId>
752-
<version>${codahale.metrics.version}</version>
694+
<version>${dropwizard.metrics.version}</version>
753695
</dependency>
754696
<dependency>
755697
<groupId>io.dropwizard.metrics</groupId>
756698
<artifactId>metrics-graphite</artifactId>
757-
<version>${codahale.metrics.version}</version>
699+
<version>${dropwizard.metrics.version}</version>
758700
</dependency>
759701
<dependency>
760702
<groupId>io.dropwizard</groupId>
@@ -3138,15 +3080,6 @@
31383080
</modules>
31393081
</profile>
31403082

3141-
<!--
3142-
The cloud profile enables the cloud module.
3143-
It does not declare the hadoop-* artifacts which
3144-
the cloud module pulls in; these are delegated to
3145-
the hadoop-x.y protocols, so permitting different
3146-
hadoop versions to declare different include/exclude
3147-
rules (especially transient dependencies).
3148-
3149-
-->
31503083
<profile>
31513084
<id>hadoop-cloud</id>
31523085
<modules>

0 commit comments

Comments
 (0)