This is an automated email from the ASF dual-hosted git repository. busbey pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8a472eae665c3fabf9e074a2698d0f48ce9c346f Author: Gabor Bota <[email protected]> AuthorDate: Tue Mar 26 17:57:25 2019 +0100 HBASE-22109 Update hbase shaded client for new transitive dependencies of guava after hadoop update * Hadoop updated to Guava 27.0-jre * Guava 27 adds error checker framework as a transitive dependency * update relocation rules to relocate it for the shaded client that includes hadoop Co-authored-by: Sean Busbey <[email protected]> Signed-off-by: Sean Busbey <[email protected]> (cherry picked from commit 5c1af95c0aa8909a1d90635d3763060e01bcb5d0) --- hbase-shaded/pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index ba3d8f5..6207e95 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -227,8 +227,12 @@ <!-- top level org --> <relocation> - <pattern>org.codehaus</pattern> - <shadedPattern>${shaded.prefix}.org.codehaus</shadedPattern> + <pattern>org.checkerframework</pattern> + <shadedPattern>${shaded.prefix}.org.checkerframework</shadedPattern> + </relocation> + <relocation> + <pattern>org.codehaus</pattern> + <shadedPattern>${shaded.prefix}.org.codehaus</shadedPattern> </relocation> <relocation> <pattern>org.eclipse</pattern>
