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
This commit is contained in:
parent
16f8d27708
commit
ebd34844ce
|
@ -45,6 +45,10 @@
|
||||||
<testResource>
|
<testResource>
|
||||||
<!-- We depend on hbase-server test resources -->
|
<!-- We depend on hbase-server test resources -->
|
||||||
<directory>../hbase-server/src/test/resources</directory>
|
<directory>../hbase-server/src/test/resources</directory>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/NOTICE</exclude>
|
||||||
|
<exclude>META-INF/LICENSE</exclude>
|
||||||
|
</excludes>
|
||||||
</testResource>
|
</testResource>
|
||||||
</testResources>
|
</testResources>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
|
|
|
@ -291,12 +291,13 @@ JRuby's licence.
|
||||||
#end
|
#end
|
||||||
#if(!${aggregated})
|
#if(!${aggregated})
|
||||||
--
|
--
|
||||||
# For now, we're assuming we will aggregate all Category B licenses
|
|
||||||
This product includes ${dep.name}
|
This product includes ${dep.name}
|
||||||
|
|
||||||
Licensed under ${dep.licenses[0].name}, see LICENSE for details.
|
Licensed under ${dep.licenses[0].name}, see LICENSE for details.
|
||||||
|
|
||||||
incorporated from ${dep.groupId}:${dep.artifactId}:${dep.packaging}:${dep.version}
|
incorporated from ${dep.groupId}:${dep.artifactId}:${dep.packaging}:${dep.version}
|
||||||
|
|
||||||
|
For source see '${dep.url}'.
|
||||||
#end
|
#end
|
||||||
#end
|
#end
|
||||||
#end
|
#end
|
||||||
|
|
Loading…
Reference in New Issue