You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/05/06 03:23:21 UTC
[hbase] 06/06: HBASE-22087 Update LICENSE/shading for the
dependencies from the latest Hadoop trunk.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 19042a923c3808ccca36914b41aed8cf97e5241f
Author: Wei-Chiu Chuang <we...@cloudera.com>
AuthorDate: Mon Mar 25 11:58:47 2019 +0100
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 <bu...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit 962585d376edccc8f4cfa311eee9fba7266f63c8)
---
.../src/main/resources/supplemental-models.xml | 18 ++++++++++++++++++
hbase-shaded/pom.xml | 19 +++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 8e045f2..c326986 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2059,6 +2059,24 @@ Copyright 2010 FasterXML.com
</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>
<artifactId>jcodings</artifactId>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 6207e95..60d28bb 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -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>