This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 443da32 HBASE-22359 Backport of HBASE-21371 misses activation-api
license information
443da32 is described below
commit 443da328f2ab102b76b08bde6dde8136b80944f5
Author: Sean Busbey <[email protected]>
AuthorDate: Fri May 3 14:46:04 2019 -0500
HBASE-22359 Backport of HBASE-21371 misses activation-api license
information
Signed-off-by: Peter Somogyi <[email protected]>
---
.../src/main/resources/supplemental-models.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 6876d7a..9e07972 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -24,6 +24,22 @@ under the License.
hbase-shaded-server versions, with the execption 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-->
+ <supplement>
+ <project>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <!-- javax.activation-api is also separately licensed under the GPL
version 2 plus the Classpath Exception -->
+ <licenses>
+ <license>
+ <name>CDDL 1.1</name>
+
<url>https://github.com/javaee/activation/blob/master/LICENSE.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+
<!-- Artifacts missing license info in POM -->
<supplement>
<project>
