From 4732aa557fa94152ed791c069bcc5906803d7551 Mon Sep 17 00:00:00 2001 From: Gabor Bota Date: Tue, 26 Mar 2019 17:57:25 +0100 Subject: [PATCH] HBASE-22109. Update hbase shaded content checker after guava update in hadoop branch-3.0 to 27.0-jre --- .../src/main/resources/META-INF/LICENSE.vm | 2 +- hbase-shaded/pom.xml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) 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 0b1ad131e5..5b9e4ff0a4 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm @@ -1340,7 +1340,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' ]) +#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' ]) ## 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 diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 0c5b046ece..0a2fd5edd4 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -227,8 +227,12 @@ - org.codehaus - ${shaded.prefix}.org.codehaus + org.checkerframework + ${shaded.prefix}.org.checkerframework + + + org.codehaus + ${shaded.prefix}.org.codehaus org.eclipse -- 2.17.0