From 962585d376edccc8f4cfa311eee9fba7266f63c8 Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@cloudera.com>
Date: Mon, 25 Mar 2019 11:58:47 +0100
Subject: [PATCH] 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>
---
 .../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 56f4f622689..7eeed27534f 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -977,6 +977,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>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 99ffa5cb5d3..478ab59f542 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -214,6 +214,11 @@
                                         <shadedPattern>${shaded.prefix}.com.zaxxer</shadedPattern>
                                     </relocation>
 
+                                    <!-- dnsjava -->
+                                    <relocation>
+                                        <pattern>org.xbill</pattern>
+                                        <shadedPattern>${shaded.prefix}.org.xbill</shadedPattern>
+                                    </relocation>
 
                                     <!-- netty family -->
                                     <relocation>
@@ -426,6 +431,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>
@@ -463,6 +472,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>