You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2017/09/19 20:57:43 UTC
[2/2] hbase git commit: HBASE-18851 Add "BSD" to the acceptable
licenses list
HBASE-18851 Add "BSD" to the acceptable licenses list
org.ow2.asm:asm actually is 3-clause BSD, but it was
marked as "BSD" which we need to add to our exclusions
list.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1db463fe
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1db463fe
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1db463fe
Branch: refs/heads/branch-2
Commit: 1db463feba8443d27acc8f7a7c242f82d7a83f52
Parents: 52c809c
Author: Josh Elser <el...@apache.org>
Authored: Tue Sep 19 15:18:39 2017 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Sep 19 16:32:15 2017 -0400
----------------------------------------------------------------------
hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1db463fe/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
----------------------------------------------------------------------
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 e1475a5..0df8f33 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1338,7 +1338,7 @@ You can redistribute it and/or modify it under either the terms of the
## license mentions.
##
## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
-#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'Mozilla Public License Version 1.1', 'Mozilla Public License Version 2.0', 'Creative Commons Attribution License, Version 2.5' ])
+#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'BSD', '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