From 4360d25d9fa4ba9f766c2e6919da3cc220935372 Mon Sep 17 00:00:00 2001
From: Sean Busbey <busbey@apache.org>
Date: Mon, 22 Apr 2019 11:20:21 -0500
Subject: [PATCH] HBASE-22286 License handling incorrectly lists CDDL/GPLv2+CE
 as safe to not aggregate.

* Remove cddl/gplv2+ce from list of "default okay" licenses
* correct supplemental info for javax activation to specify CDDL 1.1

Signed-off-by: Sakthi <sakthivel.azhaku@gmail.com>
Signed-off-by: Esteban Gutierrez <esteban@apache.org>
(cherry picked from commit 01d3d32b16f8f234d75323ca283289ae05bf3014)
---
 .../src/main/resources/META-INF/LICENSE.vm      |  2 +-
 .../src/main/resources/supplemental-models.xml  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index 78b676499c5..0b1ad131e53 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1340,7 +1340,7 @@ You can redistribute it and/or modify it under either the terms of the
 ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
 ##
 ## NB: This list is later compared as lower-case. New entries must also be all lower-case
-#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'cddl/gplv2+ce' ])
+#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5' ])
 ## include LICENSE sections for anything not under ASL2.0
 #foreach( ${dep} in ${projects} )
 ## if there are no licenses we'll fail the build later, so
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 418b66909b5..6876d7ae37e 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2226,6 +2226,23 @@ Copyright (c) 2011 FuseSource Corp. All rights reserved.
           <url>https://glassfish.dev.java.net/public/CDDLv1.0.html</url>
           <distribution>repo</distribution>
           <comments>
+</comments>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>com.sun.activation</groupId>
+      <artifactId>javax.activation</artifactId>
+      <!-- javax.activation 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>
+          <comments>
+Copyright (c) 1997-2017 Oracle and/or its affiliates.
 </comments>
         </license>
       </licenses>