Skip to content

Commit 117a07c

Browse files
committed
Revert to non-shaded Hadoop client library.
1 parent 6bd491e commit 117a07c

File tree

2 files changed

+52
-5
lines changed

2 files changed

+52
-5
lines changed

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

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ JLargeArrays/1.5//JLargeArrays-1.5.jar
33
JTransforms/3.1//JTransforms-3.1.jar
44
RoaringBitmap/0.9.0//RoaringBitmap-0.9.0.jar
55
ST4/4.0.4//ST4-4.0.4.jar
6+
accessors-smart/2.4.2//accessors-smart-2.4.2.jar
67
activation/1.1.1//activation-1.1.1.jar
78
aircompressor/0.21//aircompressor-0.21.jar
89
algebra_2.12/2.0.1//algebra_2.12-2.0.1.jar
@@ -28,11 +29,13 @@ breeze_2.12/1.2//breeze_2.12-1.2.jar
2829
cats-kernel_2.12/2.1.1//cats-kernel_2.12-2.1.1.jar
2930
chill-java/0.10.0//chill-java-0.10.0.jar
3031
chill_2.12/0.10.0//chill_2.12-0.10.0.jar
32+
commons-beanutils/1.9.4//commons-beanutils-1.9.4.jar
3133
commons-cli/1.2//commons-cli-1.2.jar
3234
commons-codec/1.15//commons-codec-1.15.jar
3335
commons-collections/3.2.2//commons-collections-3.2.2.jar
3436
commons-compiler/3.0.16//commons-compiler-3.0.16.jar
3537
commons-compress/1.21//commons-compress-1.21.jar
38+
commons-configuration2/2.1.1//commons-configuration2-2.1.1.jar
3639
commons-crypto/1.1.0//commons-crypto-1.1.0.jar
3740
commons-dbcp/1.4//commons-dbcp-1.4.jar
3841
commons-io/2.8.0//commons-io-2.8.0.jar
@@ -52,14 +55,25 @@ datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar
5255
datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar
5356
datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar
5457
derby/10.14.2.0//derby-10.14.2.0.jar
58+
dnsjava/2.1.7//dnsjava-2.1.7.jar
5559
dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
5660
flatbuffers-java/1.9.0//flatbuffers-java-1.9.0.jar
5761
generex/1.0.2//generex-1.0.2.jar
5862
gson/2.2.4//gson-2.2.4.jar
5963
guava/14.0.1//guava-14.0.1.jar
60-
hadoop-client-api/3.3.1//hadoop-client-api-3.3.1.jar
61-
hadoop-client-runtime/3.3.1//hadoop-client-runtime-3.3.1.jar
64+
hadoop-annotations/3.3.1//hadoop-annotations-3.3.1.jar
65+
hadoop-auth/3.3.1//hadoop-auth-3.3.1.jar
66+
hadoop-client/3.3.1//hadoop-client-3.3.1.jar
67+
hadoop-common/3.3.1//hadoop-common-3.3.1.jar
68+
hadoop-hdfs-client/3.3.1//hadoop-hdfs-client-3.3.1.jar
69+
hadoop-mapreduce-client-common/3.3.1//hadoop-mapreduce-client-common-3.3.1.jar
70+
hadoop-mapreduce-client-core/3.3.1//hadoop-mapreduce-client-core-3.3.1.jar
71+
hadoop-mapreduce-client-jobclient/3.3.1//hadoop-mapreduce-client-jobclient-3.3.1.jar
6272
hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar
73+
hadoop-shaded-protobuf_3_7/1.1.1//hadoop-shaded-protobuf_3_7-1.1.1.jar
74+
hadoop-yarn-api/3.3.1//hadoop-yarn-api-3.3.1.jar
75+
hadoop-yarn-client/3.3.1//hadoop-yarn-client-3.3.1.jar
76+
hadoop-yarn-common/3.3.1//hadoop-yarn-common-3.3.1.jar
6377
hadoop-yarn-server-web-proxy/3.3.1//hadoop-yarn-server-web-proxy-3.3.1.jar
6478
hive-beeline/2.3.9//hive-beeline-2.3.9.jar
6579
hive-cli/2.3.9//hive-cli-2.3.9.jar
@@ -90,8 +104,12 @@ jackson-core/2.12.5//jackson-core-2.12.5.jar
90104
jackson-databind/2.12.5//jackson-databind-2.12.5.jar
91105
jackson-dataformat-yaml/2.12.5//jackson-dataformat-yaml-2.12.5.jar
92106
jackson-datatype-jsr310/2.11.2//jackson-datatype-jsr310-2.11.2.jar
107+
jackson-jaxrs-base/2.10.5//jackson-jaxrs-base-2.10.5.jar
108+
jackson-jaxrs-json-provider/2.10.5//jackson-jaxrs-json-provider-2.10.5.jar
93109
jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar
110+
jackson-module-jaxb-annotations/2.12.5//jackson-module-jaxb-annotations-2.12.5.jar
94111
jackson-module-scala_2.12/2.12.5//jackson-module-scala_2.12-2.12.5.jar
112+
jakarta.activation-api/1.2.1//jakarta.activation-api-1.2.1.jar
95113
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
96114
jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
97115
jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar
@@ -101,9 +119,11 @@ jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
101119
janino/3.0.16//janino-3.0.16.jar
102120
javassist/3.25.0-GA//javassist-3.25.0-GA.jar
103121
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
122+
javax.servlet-api/3.1.0//javax.servlet-api-3.1.0.jar
104123
javolution/5.5.1//javolution-5.5.1.jar
105124
jaxb-api/2.2.11//jaxb-api-2.2.11.jar
106125
jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar
126+
jcip-annotations/1.0-1//jcip-annotations-1.0-1.jar
107127
jcl-over-slf4j/1.7.30//jcl-over-slf4j-1.7.30.jar
108128
jdo-api/3.0.1//jdo-api-3.0.1.jar
109129
jersey-client/2.34//jersey-client-2.34.jar
@@ -112,18 +132,36 @@ jersey-container-servlet-core/2.34//jersey-container-servlet-core-2.34.jar
112132
jersey-container-servlet/2.34//jersey-container-servlet-2.34.jar
113133
jersey-hk2/2.34//jersey-hk2-2.34.jar
114134
jersey-server/2.34//jersey-server-2.34.jar
135+
jetty-io/9.4.43.v20210629//jetty-io-9.4.43.v20210629.jar
115136
jline/2.14.6//jline-2.14.6.jar
137+
jline/3.9.0//jline-3.9.0.jar
116138
joda-time/2.10.10//joda-time-2.10.10.jar
117139
jodd-core/3.5.2//jodd-core-3.5.2.jar
118140
jpam/1.1//jpam-1.1.jar
141+
json-smart/2.4.2//json-smart-2.4.2.jar
119142
json/1.8//json-1.8.jar
120143
json4s-ast_2.12/3.7.0-M11//json4s-ast_2.12-3.7.0-M11.jar
121144
json4s-core_2.12/3.7.0-M11//json4s-core_2.12-3.7.0-M11.jar
122145
json4s-jackson_2.12/3.7.0-M11//json4s-jackson_2.12-3.7.0-M11.jar
123146
json4s-scalap_2.12/3.7.0-M11//json4s-scalap_2.12-3.7.0-M11.jar
147+
jsp-api/2.1//jsp-api-2.1.jar
124148
jsr305/3.0.0//jsr305-3.0.0.jar
125149
jta/1.1//jta-1.1.jar
126150
jul-to-slf4j/1.7.30//jul-to-slf4j-1.7.30.jar
151+
kerb-admin/1.0.1//kerb-admin-1.0.1.jar
152+
kerb-client/1.0.1//kerb-client-1.0.1.jar
153+
kerb-common/1.0.1//kerb-common-1.0.1.jar
154+
kerb-core/1.0.1//kerb-core-1.0.1.jar
155+
kerb-crypto/1.0.1//kerb-crypto-1.0.1.jar
156+
kerb-identity/1.0.1//kerb-identity-1.0.1.jar
157+
kerb-server/1.0.1//kerb-server-1.0.1.jar
158+
kerb-simplekdc/1.0.1//kerb-simplekdc-1.0.1.jar
159+
kerb-util/1.0.1//kerb-util-1.0.1.jar
160+
kerby-asn1/1.0.1//kerby-asn1-1.0.1.jar
161+
kerby-config/1.0.1//kerby-config-1.0.1.jar
162+
kerby-pkix/1.0.1//kerby-pkix-1.0.1.jar
163+
kerby-util/1.0.1//kerby-util-1.0.1.jar
164+
kerby-xdr/1.0.1//kerby-xdr-1.0.1.jar
127165
kryo-shaded/4.0.2//kryo-shaded-4.0.2.jar
128166
kubernetes-client/5.6.0//kubernetes-client-5.6.0.jar
129167
kubernetes-model-admissionregistration/5.6.0//kubernetes-model-admissionregistration-5.6.0.jar
@@ -162,7 +200,9 @@ metrics-json/4.2.2//metrics-json-4.2.2.jar
162200
metrics-jvm/4.2.2//metrics-jvm-4.2.2.jar
163201
minlog/1.3.0//minlog-1.3.0.jar
164202
netty-all/4.1.63.Final//netty-all-4.1.63.Final.jar
203+
nimbus-jose-jwt/9.8.1//nimbus-jose-jwt-9.8.1.jar
165204
objenesis/2.6//objenesis-2.6.jar
205+
okhttp/2.7.5//okhttp-2.7.5.jar
166206
okhttp/3.12.12//okhttp-3.12.12.jar
167207
okio/1.14.0//okio-1.14.0.jar
168208
opencsv/2.3//opencsv-2.3.jar
@@ -181,6 +221,7 @@ parquet-jackson/1.12.0//parquet-jackson-1.12.0.jar
181221
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
182222
py4j/0.10.9.2//py4j-0.10.9.2.jar
183223
pyrolite/4.30//pyrolite-4.30.jar
224+
re2j/1.1//re2j-1.1.jar
184225
rocksdbjni/6.20.3//rocksdbjni-6.20.3.jar
185226
scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
186227
scala-compiler/2.12.14//scala-compiler-2.12.14.jar
@@ -199,13 +240,19 @@ spire-platform_2.12/0.17.0//spire-platform_2.12-0.17.0.jar
199240
spire-util_2.12/0.17.0//spire-util_2.12-0.17.0.jar
200241
spire_2.12/0.17.0//spire_2.12-0.17.0.jar
201242
stax-api/1.0.1//stax-api-1.0.1.jar
243+
stax2-api/4.2.1//stax2-api-4.2.1.jar
202244
stream/2.9.6//stream-2.9.6.jar
203245
super-csv/2.2.0//super-csv-2.2.0.jar
204246
threeten-extra/1.5.0//threeten-extra-1.5.0.jar
205247
tink/1.6.0//tink-1.6.0.jar
248+
token-provider/1.0.1//token-provider-1.0.1.jar
206249
transaction-api/1.1//transaction-api-1.1.jar
207250
univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar
208251
velocity/1.5//velocity-1.5.jar
252+
websocket-api/9.4.40.v20210413//websocket-api-9.4.40.v20210413.jar
253+
websocket-client/9.4.40.v20210413//websocket-client-9.4.40.v20210413.jar
254+
websocket-common/9.4.40.v20210413//websocket-common-9.4.40.v20210413.jar
255+
woodstox-core/5.3.0//woodstox-core-5.3.0.jar
209256
xbean-asm9-shaded/4.20//xbean-asm9-shaded-4.20.jar
210257
xz/1.8//xz-1.8.jar
211258
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@
253253
when the Hadoop profile is hadoop-2.7, because these are only available in 3.x. Note that,
254254
as result we have to include the same hadoop-client dependency multiple times in hadoop-2.7.
255255
-->
256-
<hadoop-client-api.artifact>hadoop-client-api</hadoop-client-api.artifact>
257-
<hadoop-client-runtime.artifact>hadoop-client-runtime</hadoop-client-runtime.artifact>
258-
<hadoop-client-minicluster.artifact>hadoop-client-minicluster</hadoop-client-minicluster.artifact>
256+
<hadoop-client-api.artifact>hadoop-client</hadoop-client-api.artifact>
257+
<hadoop-client-runtime.artifact>hadoop-client</hadoop-client-runtime.artifact>
258+
<hadoop-client-minicluster.artifact>hadoop-client</hadoop-client-minicluster.artifact>
259259

260260
<!--
261261
Overridable test home. So that you can call individual pom files directly without

0 commit comments

Comments
 (0)