From eb5c5a9bc8aa3e39b7da87d0a4130da480ba3a95 Mon Sep 17 00:00:00 2001
From: Mike Drob <mdrob@apache.org>
Date: Fri, 9 Jun 2017 11:44:02 -0500
Subject: [PATCH] HBASE-18033 Fix license check for hadoop-3.x

Hadoop 3.x added some new dependencies that refer to the apache license
by it's older title (from apache parent pom 14 and earlier). Instead of
listing them all individually, we can group them under ASL for our
LICENSE file.

Signed-off-by: Sean Busbey <busbey@apache.org>
---
 .../src/main/resources/META-INF/LICENSE.vm          |  2 +-
 .../src/main/resources/supplemental-models.xml      | 13 +++++++++++++
 2 files changed, 14 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 96f6bceff00..e593f126ef0 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1550,7 +1550,7 @@ ${dep.scm.url}
 #thrift_license()
 #end
 ## Note that this will fail the build if we don't have a license. update supplemental-models.
-#if( !(${dep.licenses[0].name.contains("Apache License, Version 2.0")}) )
+#if( !(${dep.licenses[0].name.contains("Apache License, Version 2.0")} || ${dep.licenses[0].name.contains("The Apache Software License, Version 2.0")}) )
 #if( ${dep.licenses[0].name.contains("CDDL")} )
 #if( ${dep.licenses[0].name.contains("1.0")} )
 #set($aggregated = $cddl_1_0.add($dep))
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 57ce56fa0c7..5808d3c8966 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2270,6 +2270,19 @@ Copyright 2005 Sun Microsystems, Inc. and portions Copyright Apache Software Fou
       </licenses>
     </project>
   </supplement>
+  <supplement>
+    <project>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>jsr311-api</artifactId>
+      <licenses>
+        <license>
+          <name>Common Development and Distribution License (CDDL) v1.0</name>
+          <url>http://www.opensource.org/licenses/cddl1.php</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
   <supplement>
     <project>
       <groupId>org.jamon</groupId>