Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <busbey@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>
(cherry picked from commit 962585d376)
This commit is contained in:
Wei-Chiu Chuang 2019-03-25 11:58:47 +01:00 committed by Sean Busbey
parent 8a472eae66
commit 19042a923c
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2058,6 +2058,24 @@ Copyright 2010 FasterXML.com
</project>
</supplement>
<supplement>
<project> <!-- hadoop.profile=3.0 from hadoop-3.3.0 -->
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<version>3.9.0</version>
<licenses>
<license>
<name>BSD license</name>
<url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution>
<comments>
Copyright (c) 2002-2018, the original author or authors.
</comments>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.jruby.jcodings</groupId>

19
hbase-shaded/pom.xml
View File

@ -208,6 +208,11 @@
<shadedPattern>${shaded.prefix}.com.zaxxer</shadedPattern>
</relocation>
<!-- dnsjava -->
<relocation>
<pattern>org.xbill</pattern>
<shadedPattern>${shaded.prefix}.org.xbill</shadedPattern>
</relocation>
<!-- netty family -->
<relocation>
@ -416,6 +421,10 @@
<pattern>org.apache.commons.codec</pattern>
<shadedPattern>${shaded.prefix}.org.apache.commons.codec</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.text</pattern>
<shadedPattern>${shaded.prefix}.org.apache.commons.text</shadedPattern>
</relocation>
<!-- top level net-->
<relocation>
@ -453,6 +462,16 @@
</transformer>
</transformers>
<filters>
<!-- remove utility classes which are not required from dnsjava -->
<filter>
<artifact>dnsjava:dnsjava</artifact>
<excludes>
<exclude>dig*</exclude>
<exclude>jnamed*</exclude>
<exclude>lookup*</exclude>
<exclude>update*</exclude>
</excludes>
</filter>
<filter>
<!-- this is a signed osgi bundle -->
<artifact>org.eclipse.jetty.orbit:javax.servlet.jsp.jstl</artifact>