You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/05/06 03:23:13 UTC

[hbase] 03/04: HBASE-22109 Update hbase shaded client for new transitive dependencies of guava after hadoop update

This is an automated email from the ASF dual-hosted git repository.

busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit d6fda6b57621894098a1635c97dee2a2320a04ad
Author: Gabor Bota <ga...@cloudera.com>
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 <bu...@apache.org>
    Signed-off-by: Sean Busbey <bu...@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 e6faab4..7c4e485 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>