From 5a8df45cd7a43d814ffbfa3e13da860d355575a8 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 7 Mar 2022 10:31:02 -0600 Subject: [PATCH] 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 (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 ac7c4a75e436..760208f4b863 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