Skip to content

Commit 36384a7

Browse files
committed
HIVE-29206: Remove commons-lang from hive-exec shaded jar
1 parent d90574c commit 36384a7

File tree

29 files changed

+336
-47
lines changed

29 files changed

+336
-47
lines changed

accumulo-handler/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,21 @@
4343
<groupId>commons-collections</groupId>
4444
<artifactId>commons-collections</artifactId>
4545
</exclusion>
46+
<exclusion>
47+
<groupId>commons-lang</groupId>
48+
<artifactId>commons-lang</artifactId>
49+
</exclusion>
4650
</exclusions>
4751
</dependency>
4852
<dependency>
4953
<groupId>org.apache.accumulo</groupId>
5054
<artifactId>accumulo-fate</artifactId>
55+
<exclusions>
56+
<exclusion>
57+
<groupId>commons-lang</groupId>
58+
<artifactId>commons-lang</artifactId>
59+
</exclusion>
60+
</exclusions>
5161
</dependency>
5262
<dependency>
5363
<groupId>org.apache.accumulo</groupId>

cli/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,23 @@
145145
<groupId>org.apache.tez</groupId>
146146
<artifactId>tez-mapreduce</artifactId>
147147
<scope>test</scope>
148+
<exclusions>
149+
<exclusion>
150+
<groupId>commons-lang</groupId>
151+
<artifactId>commons-lang</artifactId>
152+
</exclusion>
153+
</exclusions>
148154
</dependency>
149155
<dependency>
150156
<groupId>org.apache.tez</groupId>
151157
<artifactId>tez-dag</artifactId>
152158
<scope>test</scope>
159+
<exclusions>
160+
<exclusion>
161+
<groupId>commons-lang</groupId>
162+
<artifactId>commons-lang</artifactId>
163+
</exclusion>
164+
</exclusions>
153165
</dependency>
154166
<dependency>
155167
<groupId>org.mockito</groupId>

common/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,10 @@
241241
<groupId>com.sun.jersey</groupId>
242242
<artifactId>jersey-client</artifactId>
243243
</exclusion>
244+
<exclusion>
245+
<groupId>commons-lang</groupId>
246+
<artifactId>commons-lang</artifactId>
247+
</exclusion>
244248
</exclusions>
245249
</dependency>
246250
<dependency>

hbase-handler/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,23 @@
261261
<groupId>org.apache.tez</groupId>
262262
<artifactId>tez-mapreduce</artifactId>
263263
<scope>test</scope>
264+
<exclusions>
265+
<exclusion>
266+
<groupId>commons-lang</groupId>
267+
<artifactId>commons-lang</artifactId>
268+
</exclusion>
269+
</exclusions>
264270
</dependency>
265271
<dependency>
266272
<groupId>org.apache.tez</groupId>
267273
<artifactId>tez-dag</artifactId>
268274
<scope>test</scope>
275+
<exclusions>
276+
<exclusion>
277+
<groupId>commons-lang</groupId>
278+
<artifactId>commons-lang</artifactId>
279+
</exclusion>
280+
</exclusions>
269281
</dependency>
270282
<dependency>
271283
<groupId>org.mockito</groupId>

hcatalog/core/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,10 @@
303303
<groupId>ch.qos.reload4j</groupId>
304304
<artifactId>reload4j</artifactId>
305305
</exclusion>
306+
<exclusion>
307+
<groupId>commons-lang</groupId>
308+
<artifactId>commons-lang</artifactId>
309+
</exclusion>
306310
</exclusions>
307311
</dependency>
308312
<dependency>

itests/hive-blobstore/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
<groupId>com.sun.jersey</groupId>
212212
<artifactId>jersey-client</artifactId>
213213
</exclusion>
214+
<exclusion>
215+
<groupId>commons-lang</groupId>
216+
<artifactId>commons-lang</artifactId>
217+
</exclusion>
214218
</exclusions>
215219
</dependency>
216220
<dependency>
@@ -222,6 +226,10 @@
222226
<groupId>org.slf4j</groupId>
223227
<artifactId>slf4j-log4j12</artifactId>
224228
</exclusion>
229+
<exclusion>
230+
<groupId>commons-lang</groupId>
231+
<artifactId>commons-lang</artifactId>
232+
</exclusion>
225233
<exclusion>
226234
<groupId>commons-logging</groupId>
227235
<artifactId>commons-logging</artifactId>
@@ -242,6 +250,10 @@
242250
<groupId>org.slf4j</groupId>
243251
<artifactId>slf4j-log4j12</artifactId>
244252
</exclusion>
253+
<exclusion>
254+
<groupId>commons-lang</groupId>
255+
<artifactId>commons-lang</artifactId>
256+
</exclusion>
245257
<exclusion>
246258
<groupId>commons-logging</groupId>
247259
<artifactId>commons-logging</artifactId>

itests/hive-jmh/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@
6262
<dependency>
6363
<groupId>org.apache.tez</groupId>
6464
<artifactId>tez-runtime-internals</artifactId>
65+
<exclusions>
66+
<exclusion>
67+
<groupId>commons-lang</groupId>
68+
<artifactId>commons-lang</artifactId>
69+
</exclusion>
70+
</exclusions>
6571
</dependency>
6672
<dependency>
6773
<groupId>org.apache.hive</groupId>
@@ -79,6 +85,12 @@
7985
<dependency>
8086
<groupId>org.apache.tez</groupId>
8187
<artifactId>tez-runtime-library</artifactId>
88+
<exclusions>
89+
<exclusion>
90+
<groupId>commons-lang</groupId>
91+
<artifactId>commons-lang</artifactId>
92+
</exclusion>
93+
</exclusions>
8294
</dependency>
8395
<dependency>
8496
<groupId>org.apache.hadoop</groupId>

itests/hive-minikdc/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<version>${apache-directory-server.version}</version>
4242
<scope>test</scope>
4343
<exclusions>
44+
<exclusion>
45+
<groupId>commons-lang</groupId>
46+
<artifactId>commons-lang</artifactId>
47+
</exclusion>
4448
<exclusion>
4549
<groupId>dom4j</groupId>
4650
<artifactId>dom4j</artifactId>
@@ -158,6 +162,10 @@
158162
<groupId>org.slf4j</groupId>
159163
<artifactId>slf4j-log4j12</artifactId>
160164
</exclusion>
165+
<exclusion>
166+
<groupId>commons-lang</groupId>
167+
<artifactId>commons-lang</artifactId>
168+
</exclusion>
161169
<exclusion>
162170
<groupId>commons-logging</groupId>
163171
<artifactId>commons-logging</artifactId>
@@ -275,6 +283,10 @@
275283
<groupId>ch.qos.reload4j</groupId>
276284
<artifactId>reload4j</artifactId>
277285
</exclusion>
286+
<exclusion>
287+
<groupId>commons-lang</groupId>
288+
<artifactId>commons-lang</artifactId>
289+
</exclusion>
278290
<exclusion>
279291
<groupId>commons-logging</groupId>
280292
<artifactId>commons-logging</artifactId>

itests/hive-unit-hadoop2/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
<groupId>org.slf4j</groupId>
5454
<artifactId>slf4j-log4j12</artifactId>
5555
</exclusion>
56+
<exclusion>
57+
<groupId>commons-lang</groupId>
58+
<artifactId>commons-lang</artifactId>
59+
</exclusion>
5660
<exclusion>
5761
<groupId>commons-logging</groupId>
5862
<artifactId>commons-logging</artifactId>
@@ -242,6 +246,10 @@
242246
<groupId>ch.qos.reload4j</groupId>
243247
<artifactId>reload4j</artifactId>
244248
</exclusion>
249+
<exclusion>
250+
<groupId>commons-lang</groupId>
251+
<artifactId>commons-lang</artifactId>
252+
</exclusion>
245253
<exclusion>
246254
<groupId>commons-logging</groupId>
247255
<artifactId>commons-logging</artifactId>

itests/hive-unit/pom.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@
128128
<groupId>org.slf4j</groupId>
129129
<artifactId>slf4j-log4j12</artifactId>
130130
</exclusion>
131+
<exclusion>
132+
<groupId>commons-lang</groupId>
133+
<artifactId>commons-lang</artifactId>
134+
</exclusion>
131135
<exclusion>
132136
<groupId>commons-logging</groupId>
133137
<artifactId>commons-logging</artifactId>
@@ -396,6 +400,10 @@
396400
<groupId>com.sun.jersey</groupId>
397401
<artifactId>jersey-client</artifactId>
398402
</exclusion>
403+
<exclusion>
404+
<groupId>commons-lang</groupId>
405+
<artifactId>commons-lang</artifactId>
406+
</exclusion>
399407
</exclusions>
400408
</dependency>
401409
<dependency>
@@ -407,6 +415,10 @@
407415
<groupId>org.slf4j</groupId>
408416
<artifactId>slf4j-log4j12</artifactId>
409417
</exclusion>
418+
<exclusion>
419+
<groupId>commons-lang</groupId>
420+
<artifactId>commons-lang</artifactId>
421+
</exclusion>
410422
<exclusion>
411423
<groupId>commons-logging</groupId>
412424
<artifactId>commons-logging</artifactId>
@@ -422,6 +434,10 @@
422434
<groupId>org.slf4j</groupId>
423435
<artifactId>slf4j-log4j12</artifactId>
424436
</exclusion>
437+
<exclusion>
438+
<groupId>commons-lang</groupId>
439+
<artifactId>commons-lang</artifactId>
440+
</exclusion>
425441
<exclusion>
426442
<groupId>commons-logging</groupId>
427443
<artifactId>commons-logging</artifactId>
@@ -432,6 +448,12 @@
432448
<groupId>org.apache.tez</groupId>
433449
<artifactId>tez-mapreduce</artifactId>
434450
<scope>test</scope>
451+
<exclusions>
452+
<exclusion>
453+
<groupId>commons-lang</groupId>
454+
<artifactId>commons-lang</artifactId>
455+
</exclusion>
456+
</exclusions>
435457
</dependency>
436458
<dependency>
437459
<groupId>org.apache.tez</groupId>
@@ -442,6 +464,10 @@
442464
<groupId>org.slf4j</groupId>
443465
<artifactId>slf4j-log4j12</artifactId>
444466
</exclusion>
467+
<exclusion>
468+
<groupId>commons-lang</groupId>
469+
<artifactId>commons-lang</artifactId>
470+
</exclusion>
445471
<exclusion>
446472
<groupId>commons-logging</groupId>
447473
<artifactId>commons-logging</artifactId>
@@ -558,6 +584,13 @@
558584
</goals>
559585
<configuration>
560586
<rules>
587+
<bannedDependencies>
588+
<excludes>
589+
<exclude>commons-lang:commons-lang</exclude>
590+
</excludes>
591+
<searchTransitive>true</searchTransitive>
592+
<message>Banned commons-lang:commons-lang dependency/transitive dependency was found!</message>
593+
</bannedDependencies>
561594
<bannedDependencies>
562595
<excludes>
563596
<exclude>org.junit.jupiter:junit-jupiter</exclude>

0 commit comments

Comments
 (0)