Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit d6a3111

Browse files
mccheahash211
authored andcommitted
Fix sbt build. (#344)
* Fix sbt build. - Remove extraneous Feign dependency that we no longer use in submission v2. - Exclude Jackson from various modules to ensure every Jackson module is forced to 2.6.5. - Fix a linter error only caught by sbt. - Add Kubernetes modules to various parts of the SBT infrastructure * Actually remove feign * Actually exclude Jackson from kubernetes client.
1 parent d4ec136 commit d6a3111

File tree

10 files changed

+165
-47
lines changed

10 files changed

+165
-47
lines changed

dev/deps/spark-deps-hadoop-2.2

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ aopalliance-1.0.jar
88
aopalliance-repackaged-2.4.0-b34.jar
99
apache-log4j-extras-1.2.17.jar
1010
arpack_combined_all-0.1.jar
11+
automaton-1.11-8.jar
1112
avro-1.7.7.jar
1213
avro-ipc-1.7.7.jar
1314
avro-mapred-1.7.7-hadoop2.jar
15+
bcpkix-jdk15on-1.54.jar
16+
bcprov-jdk15on-1.54.jar
1417
bonecp-0.8.0.RELEASE.jar
1518
breeze-macros_2.11-0.12.jar
1619
breeze_2.11-0.12.jar
@@ -40,6 +43,8 @@ commons-math3-3.4.1.jar
4043
commons-net-2.2.jar
4144
commons-pool-1.5.4.jar
4245
compress-lzf-1.0.3.jar
46+
converter-jackson-2.2.0.jar
47+
converter-scalars-2.2.0.jar
4348
core-1.1.2.jar
4449
curator-client-2.4.0.jar
4550
curator-framework-2.4.0.jar
@@ -49,6 +54,7 @@ datanucleus-core-3.2.10.jar
4954
datanucleus-rdbms-3.2.9.jar
5055
derby-10.12.1.1.jar
5156
eigenbase-properties-1.1.5.jar
57+
generex-1.0.1.jar
5258
guava-14.0.1.jar
5359
guice-3.0.jar
5460
guice-servlet-3.0.jar
@@ -77,7 +83,11 @@ jackson-annotations-2.6.5.jar
7783
jackson-core-2.6.5.jar
7884
jackson-core-asl-1.9.13.jar
7985
jackson-databind-2.6.5.jar
86+
jackson-dataformat-yaml-2.6.5.jar
87+
jackson-jaxrs-base-2.6.5.jar
88+
jackson-jaxrs-json-provider-2.6.5.jar
8089
jackson-mapper-asl-1.9.13.jar
90+
jackson-module-jaxb-annotations-2.6.5.jar
8191
jackson-module-paranamer-2.6.5.jar
8292
jackson-module-scala_2.11-2.6.5.jar
8393
janino-3.0.0.jar
@@ -96,6 +106,7 @@ jersey-container-servlet-2.22.2.jar
96106
jersey-container-servlet-core-2.22.2.jar
97107
jersey-guava-2.22.2.jar
98108
jersey-media-jaxb-2.22.2.jar
109+
jersey-media-multipart-2.22.2.jar
99110
jersey-server-2.22.2.jar
100111
jets3t-0.7.1.jar
101112
jetty-util-6.1.26.jar
@@ -111,20 +122,26 @@ jta-1.1.jar
111122
jtransforms-2.4.0.jar
112123
jul-to-slf4j-1.7.16.jar
113124
kryo-shaded-3.0.3.jar
125+
kubernetes-client-2.2.13.jar
126+
kubernetes-model-1.0.67.jar
114127
leveldbjni-all-1.8.jar
115128
libfb303-0.9.2.jar
116129
libthrift-0.9.2.jar
117130
log4j-1.2.17.jar
131+
logging-interceptor-3.6.0.jar
118132
lz4-1.3.0.jar
119133
mesos-1.0.0-shaded-protobuf.jar
120134
metrics-core-3.1.2.jar
121135
metrics-graphite-3.1.2.jar
122136
metrics-json-3.1.2.jar
123137
metrics-jvm-3.1.2.jar
138+
mimepull-1.9.6.jar
124139
minlog-1.3.0.jar
125140
netty-3.8.0.Final.jar
126141
netty-all-4.0.42.Final.jar
127142
objenesis-2.1.jar
143+
okhttp-3.6.0.jar
144+
okio-1.11.0.jar
128145
opencsv-2.3.jar
129146
oro-2.0.8.jar
130147
osgi-resource-locator-1.0.1.jar
@@ -141,6 +158,7 @@ pmml-schema-1.2.15.jar
141158
protobuf-java-2.5.0.jar
142159
py4j-0.10.4.jar
143160
pyrolite-4.13.jar
161+
retrofit-2.2.0.jar
144162
scala-compiler-2.11.8.jar
145163
scala-library-2.11.8.jar
146164
scala-parser-combinators_2.11-1.0.4.jar
@@ -150,6 +168,7 @@ scalap-2.11.8.jar
150168
shapeless_2.11-2.0.0.jar
151169
slf4j-api-1.7.16.jar
152170
slf4j-log4j12-1.7.16.jar
171+
snakeyaml-1.15.jar
153172
snappy-0.2.jar
154173
snappy-java-1.1.2.6.jar
155174
spire-macros_2.11-0.7.4.jar
@@ -163,4 +182,5 @@ validation-api-1.1.0.Final.jar
163182
xbean-asm5-shaded-4.4.jar
164183
xmlenc-0.52.jar
165184
xz-1.0.jar
185+
zjsonpatch-0.3.0.jar
166186
zookeeper-3.4.5.jar

dev/deps/spark-deps-hadoop-2.3

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ aopalliance-1.0.jar
99
aopalliance-repackaged-2.4.0-b34.jar
1010
apache-log4j-extras-1.2.17.jar
1111
arpack_combined_all-0.1.jar
12+
automaton-1.11-8.jar
1213
avro-1.7.7.jar
1314
avro-ipc-1.7.7.jar
1415
avro-mapred-1.7.7-hadoop2.jar
1516
base64-2.3.8.jar
16-
bcprov-jdk15on-1.51.jar
17+
bcpkix-jdk15on-1.54.jar
18+
bcprov-jdk15on-1.54.jar
1719
bonecp-0.8.0.RELEASE.jar
1820
breeze-macros_2.11-0.12.jar
1921
breeze_2.11-0.12.jar
@@ -42,6 +44,8 @@ commons-math3-3.4.1.jar
4244
commons-net-2.2.jar
4345
commons-pool-1.5.4.jar
4446
compress-lzf-1.0.3.jar
47+
converter-jackson-2.2.0.jar
48+
converter-scalars-2.2.0.jar
4549
core-1.1.2.jar
4650
curator-client-2.4.0.jar
4751
curator-framework-2.4.0.jar
@@ -51,6 +55,7 @@ datanucleus-core-3.2.10.jar
5155
datanucleus-rdbms-3.2.9.jar
5256
derby-10.12.1.1.jar
5357
eigenbase-properties-1.1.5.jar
58+
generex-1.0.1.jar
5459
guava-14.0.1.jar
5560
guice-3.0.jar
5661
guice-servlet-3.0.jar
@@ -79,7 +84,11 @@ jackson-annotations-2.6.5.jar
7984
jackson-core-2.6.5.jar
8085
jackson-core-asl-1.9.13.jar
8186
jackson-databind-2.6.5.jar
87+
jackson-dataformat-yaml-2.6.5.jar
88+
jackson-jaxrs-base-2.6.5.jar
89+
jackson-jaxrs-json-provider-2.6.5.jar
8290
jackson-mapper-asl-1.9.13.jar
91+
jackson-module-jaxb-annotations-2.6.5.jar
8392
jackson-module-paranamer-2.6.5.jar
8493
jackson-module-scala_2.11-2.6.5.jar
8594
janino-3.0.0.jar
@@ -100,6 +109,7 @@ jersey-container-servlet-2.22.2.jar
100109
jersey-container-servlet-core-2.22.2.jar
101110
jersey-guava-2.22.2.jar
102111
jersey-media-jaxb-2.22.2.jar
112+
jersey-media-multipart-2.22.2.jar
103113
jersey-server-2.22.2.jar
104114
jets3t-0.9.3.jar
105115
jetty-6.1.26.jar
@@ -116,22 +126,28 @@ jta-1.1.jar
116126
jtransforms-2.4.0.jar
117127
jul-to-slf4j-1.7.16.jar
118128
kryo-shaded-3.0.3.jar
129+
kubernetes-client-2.2.13.jar
130+
kubernetes-model-1.0.67.jar
119131
leveldbjni-all-1.8.jar
120132
libfb303-0.9.2.jar
121133
libthrift-0.9.2.jar
122134
log4j-1.2.17.jar
135+
logging-interceptor-3.6.0.jar
123136
lz4-1.3.0.jar
124137
mail-1.4.7.jar
125138
mesos-1.0.0-shaded-protobuf.jar
126139
metrics-core-3.1.2.jar
127140
metrics-graphite-3.1.2.jar
128141
metrics-json-3.1.2.jar
129142
metrics-jvm-3.1.2.jar
143+
mimepull-1.9.6.jar
130144
minlog-1.3.0.jar
131145
mx4j-3.0.2.jar
132146
netty-3.8.0.Final.jar
133147
netty-all-4.0.42.Final.jar
134148
objenesis-2.1.jar
149+
okhttp-3.6.0.jar
150+
okio-1.11.0.jar
135151
opencsv-2.3.jar
136152
oro-2.0.8.jar
137153
osgi-resource-locator-1.0.1.jar
@@ -148,6 +164,7 @@ pmml-schema-1.2.15.jar
148164
protobuf-java-2.5.0.jar
149165
py4j-0.10.4.jar
150166
pyrolite-4.13.jar
167+
retrofit-2.2.0.jar
151168
scala-compiler-2.11.8.jar
152169
scala-library-2.11.8.jar
153170
scala-parser-combinators_2.11-1.0.4.jar
@@ -157,6 +174,7 @@ scalap-2.11.8.jar
157174
shapeless_2.11-2.0.0.jar
158175
slf4j-api-1.7.16.jar
159176
slf4j-log4j12-1.7.16.jar
177+
snakeyaml-1.15.jar
160178
snappy-0.2.jar
161179
snappy-java-1.1.2.6.jar
162180
spire-macros_2.11-0.7.4.jar
@@ -171,4 +189,5 @@ validation-api-1.1.0.Final.jar
171189
xbean-asm5-shaded-4.4.jar
172190
xmlenc-0.52.jar
173191
xz-1.0.jar
192+
zjsonpatch-0.3.0.jar
174193
zookeeper-3.4.5.jar

dev/deps/spark-deps-hadoop-2.4

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ aopalliance-1.0.jar
99
aopalliance-repackaged-2.4.0-b34.jar
1010
apache-log4j-extras-1.2.17.jar
1111
arpack_combined_all-0.1.jar
12+
automaton-1.11-8.jar
1213
avro-1.7.7.jar
1314
avro-ipc-1.7.7.jar
1415
avro-mapred-1.7.7-hadoop2.jar
1516
base64-2.3.8.jar
16-
bcprov-jdk15on-1.51.jar
17+
bcpkix-jdk15on-1.54.jar
18+
bcprov-jdk15on-1.54.jar
1719
bonecp-0.8.0.RELEASE.jar
1820
breeze-macros_2.11-0.12.jar
1921
breeze_2.11-0.12.jar
@@ -42,6 +44,8 @@ commons-math3-3.4.1.jar
4244
commons-net-2.2.jar
4345
commons-pool-1.5.4.jar
4446
compress-lzf-1.0.3.jar
47+
converter-jackson-2.2.0.jar
48+
converter-scalars-2.2.0.jar
4549
core-1.1.2.jar
4650
curator-client-2.4.0.jar
4751
curator-framework-2.4.0.jar
@@ -51,6 +55,7 @@ datanucleus-core-3.2.10.jar
5155
datanucleus-rdbms-3.2.9.jar
5256
derby-10.12.1.1.jar
5357
eigenbase-properties-1.1.5.jar
58+
generex-1.0.1.jar
5459
guava-14.0.1.jar
5560
guice-3.0.jar
5661
guice-servlet-3.0.jar
@@ -79,7 +84,11 @@ jackson-annotations-2.6.5.jar
7984
jackson-core-2.6.5.jar
8085
jackson-core-asl-1.9.13.jar
8186
jackson-databind-2.6.5.jar
87+
jackson-dataformat-yaml-2.6.5.jar
88+
jackson-jaxrs-base-2.6.5.jar
89+
jackson-jaxrs-json-provider-2.6.5.jar
8290
jackson-mapper-asl-1.9.13.jar
91+
jackson-module-jaxb-annotations-2.6.5.jar
8392
jackson-module-paranamer-2.6.5.jar
8493
jackson-module-scala_2.11-2.6.5.jar
8594
janino-3.0.0.jar
@@ -100,6 +109,7 @@ jersey-container-servlet-2.22.2.jar
100109
jersey-container-servlet-core-2.22.2.jar
101110
jersey-guava-2.22.2.jar
102111
jersey-media-jaxb-2.22.2.jar
112+
jersey-media-multipart-2.22.2.jar
103113
jersey-server-2.22.2.jar
104114
jets3t-0.9.3.jar
105115
jetty-6.1.26.jar
@@ -116,22 +126,28 @@ jta-1.1.jar
116126
jtransforms-2.4.0.jar
117127
jul-to-slf4j-1.7.16.jar
118128
kryo-shaded-3.0.3.jar
129+
kubernetes-client-2.2.13.jar
130+
kubernetes-model-1.0.67.jar
119131
leveldbjni-all-1.8.jar
120132
libfb303-0.9.2.jar
121133
libthrift-0.9.2.jar
122134
log4j-1.2.17.jar
135+
logging-interceptor-3.6.0.jar
123136
lz4-1.3.0.jar
124137
mail-1.4.7.jar
125138
mesos-1.0.0-shaded-protobuf.jar
126139
metrics-core-3.1.2.jar
127140
metrics-graphite-3.1.2.jar
128141
metrics-json-3.1.2.jar
129142
metrics-jvm-3.1.2.jar
143+
mimepull-1.9.6.jar
130144
minlog-1.3.0.jar
131145
mx4j-3.0.2.jar
132146
netty-3.8.0.Final.jar
133147
netty-all-4.0.42.Final.jar
134148
objenesis-2.1.jar
149+
okhttp-3.6.0.jar
150+
okio-1.11.0.jar
135151
opencsv-2.3.jar
136152
oro-2.0.8.jar
137153
osgi-resource-locator-1.0.1.jar
@@ -148,6 +164,7 @@ pmml-schema-1.2.15.jar
148164
protobuf-java-2.5.0.jar
149165
py4j-0.10.4.jar
150166
pyrolite-4.13.jar
167+
retrofit-2.2.0.jar
151168
scala-compiler-2.11.8.jar
152169
scala-library-2.11.8.jar
153170
scala-parser-combinators_2.11-1.0.4.jar
@@ -157,6 +174,7 @@ scalap-2.11.8.jar
157174
shapeless_2.11-2.0.0.jar
158175
slf4j-api-1.7.16.jar
159176
slf4j-log4j12-1.7.16.jar
177+
snakeyaml-1.15.jar
160178
snappy-0.2.jar
161179
snappy-java-1.1.2.6.jar
162180
spire-macros_2.11-0.7.4.jar
@@ -171,4 +189,5 @@ validation-api-1.1.0.Final.jar
171189
xbean-asm5-shaded-4.4.jar
172190
xmlenc-0.52.jar
173191
xz-1.0.jar
192+
zjsonpatch-0.3.0.jar
174193
zookeeper-3.4.5.jar

0 commit comments

Comments
 (0)