Skip to content

Commit 962585d

Browse files
jojochuangbusbey
andcommitted
HBASE-22087 Update LICENSE/shading for the dependencies from the latest Hadoop trunk.
When building with latest hadoop: * JLine is now in the assembly so update licensing * shaded client w/hadoop needs relocation for a couple new hadoop transitives Co-authored-by: Sean Busbey <[email protected]> Signed-off-by: Sean Busbey <[email protected]>
1 parent 5c1af95 commit 962585d

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

hbase-resource-bundle/src/main/resources/supplemental-models.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,24 @@ Copyright 2010 FasterXML.com
977977
</project>
978978
</supplement>
979979

980+
<supplement>
981+
<project> <!-- hadoop.profile=3.0 from hadoop-3.3.0 -->
982+
<groupId>org.jline</groupId>
983+
<artifactId>jline</artifactId>
984+
<version>3.9.0</version>
985+
<licenses>
986+
<license>
987+
<name>BSD license</name>
988+
<url>https://opensource.org/licenses/BSD-3-Clause</url>
989+
<distribution>repo</distribution>
990+
<comments>
991+
Copyright (c) 2002-2018, the original author or authors.
992+
</comments>
993+
</license>
994+
</licenses>
995+
</project>
996+
</supplement>
997+
980998
<supplement>
981999
<project>
9821000
<groupId>org.jruby.jcodings</groupId>

hbase-shaded/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@
214214
<shadedPattern>${shaded.prefix}.com.zaxxer</shadedPattern>
215215
</relocation>
216216

217+
<!-- dnsjava -->
218+
<relocation>
219+
<pattern>org.xbill</pattern>
220+
<shadedPattern>${shaded.prefix}.org.xbill</shadedPattern>
221+
</relocation>
217222

218223
<!-- netty family -->
219224
<relocation>
@@ -426,6 +431,10 @@
426431
<pattern>org.apache.commons.codec</pattern>
427432
<shadedPattern>${shaded.prefix}.org.apache.commons.codec</shadedPattern>
428433
</relocation>
434+
<relocation>
435+
<pattern>org.apache.commons.text</pattern>
436+
<shadedPattern>${shaded.prefix}.org.apache.commons.text</shadedPattern>
437+
</relocation>
429438

430439
<!-- top level net-->
431440
<relocation>
@@ -463,6 +472,16 @@
463472
</transformer>
464473
</transformers>
465474
<filters>
475+
<!-- remove utility classes which are not required from dnsjava -->
476+
<filter>
477+
<artifact>dnsjava:dnsjava</artifact>
478+
<excludes>
479+
<exclude>dig*</exclude>
480+
<exclude>jnamed*</exclude>
481+
<exclude>lookup*</exclude>
482+
<exclude>update*</exclude>
483+
</excludes>
484+
</filter>
466485
<filter>
467486
<!-- this is a signed osgi bundle -->
468487
<artifact>org.eclipse.jetty.orbit:javax.servlet.jsp.jstl</artifact>

0 commit comments

Comments
 (0)