Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-26760 LICENSE handling should not allow non-aggregated apache-2.0 (#4172) 

- correct the license name for the Xerial Snappy wrapper.
- correct the license name for the version of GSON brought in with Hadoop 3.3.2+

Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
This commit is contained in:
Sean Busbey 2022-03-07 10:31:02 -06:00 committed by GitHub
parent f3f2aa9631
commit bcd9a9acef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
View File

@ -1343,7 +1343,7 @@ You can redistribute it and/or modify it under either the terms of the
## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
## ##
## NB: This list is later compared as lower-case. New entries must also be all lower-case ## NB: This list is later compared as lower-case. New entries must also be all lower-case
#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'apache-2.0' ]) #set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5' ])
## include LICENSE sections for anything not under ASL2.0 ## include LICENSE sections for anything not under ASL2.0
#foreach( ${dep} in ${projects} ) #foreach( ${dep} in ${projects} )
## if there are no licenses we'll fail the build later, so ## if there are no licenses we'll fail the build later, so

30
hbase-resource-bundle/src/main/resources/supplemental-models.xml
View File

@ -290,6 +290,21 @@ under the License.
</licenses> </licenses>
</project> </project>
</supplement> </supplement>
<supplement>
<project>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.8.4</version> <!-- Xerial started referring to the license incorrectly in 1.1.7.6+ -->
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<!-- Hadoop is needed for versions < 2.7.1 --> <!-- Hadoop is needed for versions < 2.7.1 -->
<!-- /Hadoop --> <!-- /Hadoop -->
<supplement> <supplement>
@ -1024,6 +1039,21 @@ Copyright 2010 FasterXML.com
</project> </project>
</supplement> </supplement>
<supplement>
<project> <!-- hadoop.profile=3.0 from hadoop-3.3.2+ -->
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version> <!-- GSON started referring to the license incorrectly in 2.6+ -->
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement> <supplement>
<project> <project>
<groupId>org.jruby.jcodings</groupId> <groupId>org.jruby.jcodings</groupId>