You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/05/05 11:06:27 UTC
[hbase] branch branch-2 updated: HBASE-22359 Backport of
HBASE-21371 misses activation-api license information
This is an automated email from the ASF dual-hosted git repository.
psomogyi 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 77ed576 HBASE-22359 Backport of HBASE-21371 misses activation-api license information
77ed576 is described below
commit 77ed5769867dd2694e2b66ab7ea0c4a070fb2f6c
Author: Sean Busbey <bu...@apache.org>
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 <ps...@apache.org>
---
.../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 80850f9..0e957de 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>