Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport "HBASE-26436 check-aggregate-license error related to javadns after HADOOP-17317" to branch-2 #3837

Merged
merged 1 commit into from Nov 11, 2021
Merged

Backport "HBASE-26436 check-aggregate-license error related to javadns after HADOOP-17317" to branch-2 #3837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 43 additions & 2 deletions hbase-resource-bundle/src/main/resources/supplemental-models.xml
View file
Open in desktop
Expand Up @@ -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-->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>