hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject hbase git commit: HBASE-18033 Fix license check for hadoop-3.x
Date Fri, 09 Jun 2017 20:11:00 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 7b40f4f3e -> a6216db16


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>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a6216db1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a6216db1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a6216db1

Branch: refs/heads/master
Commit: a6216db16f7fa3342f9ab16a52b46270aea5b4ae
Parents: 7b40f4f
Author: Mike Drob <mdrob@apache.org>
Authored: Fri Jun 9 11:44:02 2017 -0500
Committer: Sean Busbey <busbey@apache.org>
Committed: Fri Jun 9 14:49:44 2017 -0500

----------------------------------------------------------------------
 .../src/main/resources/META-INF/LICENSE.vm             |  2 +-
 .../src/main/resources/supplemental-models.xml         | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a6216db1/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
----------------------------------------------------------------------
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 96f6bce..e593f12 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))

http://git-wip-us.apache.org/repos/asf/hbase/blob/a6216db1/hbase-resource-bundle/src/main/resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 57ce56f..5808d3c 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2272,6 +2272,19 @@ Copyright 2005 Sun Microsystems, Inc. and portions Copyright Apache
Software Fou
   </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>
       <artifactId>jamon-runtime</artifactId>
       <name>Jamon runtime support classes</name>


Mime
View raw message