You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2021/11/11 15:48:27 UTC
[hbase] branch branch-2 updated: HBASE-26436
check-aggregate-license error related to javadns after HADOOP-17317
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new d3f5a4a HBASE-26436 check-aggregate-license error related to javadns after HADOOP-17317
d3f5a4a is described below
commit d3f5a4acd32d92be04ea5cff49ba88d22a069cdc
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Wed Nov 10 10:06:12 2021 -0800
HBASE-26436 check-aggregate-license error related to javadns after HADOOP-17317
Signed-off-by: Sean Busbey <bu...@apache.org>
Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
---
.../src/main/resources/supplemental-models.xml | 45 +++++++++++++++++++++-
1 file changed, 43 insertions(+), 2 deletions(-)
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 43801a1..42cf49f 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -21,7 +21,7 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
<!-- this file is a superset of the contents of the hbase-shaded-client and
- hbase-shaded-server versions, with the execption of moving the text of
+ hbase-shaded-server versions, with the exception of moving the text of
the CPL to LICENSE.vm -->
<!-- All of the below missing / ambiguous / full text license info verified at dependency source -->
<!-- Dual licensed dependencies-->
@@ -2520,7 +2520,7 @@ Copyright (c) 2010 Oracle and/or its affiliates.
</project>
</supplement>
<supplement>
-<!-- Found by seraching through the servlet-api-source-2.5.jar -->
+<!-- Found by searching through the servlet-api-source-2.5.jar -->
<project>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -3337,4 +3337,45 @@ Copyright (c) 2007-2017 The JRuby project
</licenses>
</project>
</supplement>
+ <supplement>
+ <project> <!-- v3.4.0 comes in via HADOOP-17317 -->
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <version>3.4.0</version>
+ <name>dnsjava</name>
+ <licenses>
+ <license>
+ <name>BSD 2-Clause License</name>
+ <url>https://opensource.org/licenses/BSD-2-Clause</url>
+ <distribution>repo</distribution>
+ <comments>
+ Copyright (c) 1998-2011, Brian Wellington.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ </comments>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
</supplementalDataModels>