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-14243 Correct NOTICE files.
Date Wed, 19 Aug 2015 22:43:42 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 585cd22c9 -> a21cfb26c


HBASE-14243 Correct NOTICE files.

* fix hbase-it's incorrect use of hbase-server's unfiltered NOTICE
* fix printed comment in resource-bundle NOTICE
* add dependency url for non-aggregated works so that we meet Category B requirements


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

Branch: refs/heads/branch-1.0
Commit: a21cfb26cef3ab97b5d3896b6892a29c23c05bae
Parents: 585cd22
Author: Sean Busbey <busbey@cloudera.com>
Authored: Tue Aug 18 18:02:22 2015 -0500
Committer: Sean Busbey <busbey@apache.org>
Committed: Wed Aug 19 17:36:11 2015 -0500

----------------------------------------------------------------------
 hbase-it/pom.xml                                            | 4 ++++
 hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a21cfb26/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index b8fc500..b5f9cb2 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -45,6 +45,10 @@
       <testResource>
          <!-- We depend on hbase-server test resources -->
         <directory>../hbase-server/src/test/resources</directory>
+        <excludes>
+          <exclude>META-INF/NOTICE</exclude>
+          <exclude>META-INF/LICENSE</exclude>
+        </excludes>
       </testResource>
     </testResources>
     <pluginManagement>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a21cfb26/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
index 69500d8..368e847 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
@@ -291,12 +291,13 @@ JRuby's licence.
 #end
 #if(!${aggregated})
 --
-# For now, we're assuming we will aggregate all Category B licenses
 This product includes ${dep.name}
 
 Licensed under ${dep.licenses[0].name}, see LICENSE for details.
 
 incorporated from ${dep.groupId}:${dep.artifactId}:${dep.packaging}:${dep.version}
+
+For source see '${dep.url}'.
 #end
 #end
 #end


Mime
View raw message