From 013e75d1912a97894157d77256d5ed2e545c564a Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Tue, 18 Aug 2015 18:02:22 -0500 Subject: [PATCH] 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 --- hbase-it/pom.xml | 4 ++++ hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 @@ ../hbase-server/src/test/resources + + META-INF/NOTICE + META-INF/LICENSE + 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 -- 2.1.0