From d6fda6b57621894098a1635c97dee2a2320a04ad Mon Sep 17 00:00:00 2001
From: Gabor Bota <gabor.bota@cloudera.com>
Date: Tue, 26 Mar 2019 17:57:25 +0100
Subject: [PATCH] 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 <busbey@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>
(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 e6faab4c264..7c4e4851966 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -233,8 +233,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>