From 4df43bab69d04b0aa23a724dceb006c3e643b7ef Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 25 Mar 2019 11:58:47 +0100 Subject: [PATCH] HBASE-22087. Update LICENSE/shading for the dependencies from the latest Hadoop trunk. Change-Id: I75fb36af2f7e5a1e4b93d3f7e280f3ff5d9cb1ea --- .../src/main/resources/supplemental-models.xml | 18 +++++++++++++ hbase-shaded/hbase-shaded-client/pom.xml | 1 + hbase-shaded/pom.xml | 31 ++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 103919c..82a8045 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -978,6 +978,24 @@ Copyright 2010 FasterXML.com + + org.jline + jline + 3.9.0 + + + BSD license + https://opensource.org/licenses/BSD-3-Clause + repo + + Copyright (c) 2002-2018, the original author or authors. + + + + + + + org.jruby.jcodings jcodings diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 37ea416..dfbe1da 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -56,6 +56,7 @@ javax.annotation:javax.annotation-api + javax.activation:javax.activation-api javax.annotation:javax.annotation-api + javax.activation:javax.activation-api org.apache.hadoop:* @@ -208,6 +209,11 @@ ${shaded.prefix}.com.zaxxer + + + org.xbill + ${shaded.prefix}.org.xbill + @@ -243,6 +249,10 @@ ${shaded.prefix}.org.jcodings + org.jline + ${shaded.prefix}.org.jline + + org.joni ${shaded.prefix}.org.joni @@ -416,6 +426,10 @@ org.apache.commons.codec ${shaded.prefix}.org.apache.commons.codec + + org.apache.commons.text + ${shaded.prefix}.org.apache.commons.text + @@ -453,6 +467,16 @@ + + + dnsjava:dnsjava + + dig* + jnamed* + lookup* + update* + + org.eclipse.jetty.orbit:javax.servlet.jsp.jstl @@ -522,6 +546,13 @@ + + org.eclipse.jetty.*:* + + about.html + + + org.apache.kerby:* krb5-template.conf -- 2.5.3