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 2022/03/07 19:17:37 UTC
[hbase] branch branch-2 updated: HBASE-26760 LICENSE handling should not allow non-aggregated apache-2.0 (#4172)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 2e2764f HBASE-26760 LICENSE handling should not allow non-aggregated apache-2.0 (#4172)
2e2764f is described below
commit 2e2764fa73a5c7c8e1c42400c951a87d2b893f68
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Mon Mar 7 10:31:02 2022 -0600
HBASE-26760 LICENSE handling should not allow non-aggregated apache-2.0 (#4172)
branch-2* already has correct names for Xerial Snappy wrapper and GSON.
Signed-off-by: Nick Dimiduk <nd...@apache.org>
(cherry picked from commit bcd9a9acefe0f5ceb3ccf6cc11e6ba9464526426)
---
hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index ac7c4a7..760208f 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -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
##
## 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
#foreach( ${dep} in ${projects} )
## if there are no licenses we'll fail the build later, so