You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/08/19 23:22:52 UTC
hbase git commit: HBASE-14243 Correct NOTICE files.
Repository: hbase
Updated Branches:
refs/heads/master 16f8d2770 -> ebd34844c
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/ebd34844
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ebd34844
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ebd34844
Branch: refs/heads/master
Commit: ebd34844ce9faa7ba2d97a10e00b9148bc201410
Parents: 16f8d27
Author: Sean Busbey <bu...@cloudera.com>
Authored: Tue Aug 18 18:02:22 2015 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Aug 19 15:45:58 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/ebd34844/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index b579e38..f62a57d 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/ebd34844/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