Repository: hbase
Updated Branches:
  refs/heads/branch-2 52c809c35 -> 1db463feb
  refs/heads/master b56760c73 -> a29ea3619


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/a29ea361
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a29ea361
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a29ea361

Branch: refs/heads/master
Commit: a29ea36194a18c1de415577e78ca3553818a72b5
Parents: b56760c
Author: Josh Elser <els...@apache.org>
Authored: Tue Sep 19 15:18:39 2017 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Tue Sep 19 16:19:39 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/a29ea361/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

Reply via email to