You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/08/10 15:49:58 UTC

[hbase] branch branch-2.5 updated: HBASE-27292. Fix build failure against Hadoop 3.3.4 due to added dependency on okhttp. (#4687)

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

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


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new 8d7955f06fa HBASE-27292. Fix build failure against Hadoop 3.3.4 due to added dependency on okhttp. (#4687)
8d7955f06fa is described below

commit 8d7955f06fa44a8be909b8798a472814b040882c
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Wed Aug 10 22:38:25 2022 +0900

    HBASE-27292. Fix build failure against Hadoop 3.3.4 due to added dependency on okhttp. (#4687)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
    (cherry picked from commit 00612106b5fa78a0dd198cbcaab610bd8b1be277)
---
 hbase-shaded/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 5c75ea68cfc..ca6539663e8 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -416,6 +416,15 @@
                     <pattern>org.agrona</pattern>
                     <shadedPattern>${shaded.prefix}.org.agrona</shadedPattern>
                   </relocation>
+                  <!-- okhttp -->
+                  <relocation>
+                    <pattern>okhttp3.</pattern>
+                    <shadedPattern>${shaded.prefix}.okhttp3.</shadedPattern>
+                  </relocation>
+                  <relocation>
+                    <pattern>kotlin.</pattern>
+                    <shadedPattern>${shaded.prefix}.kotlin.</shadedPattern>
+                  </relocation>
                 </relocations>
                 <transformers>
                   <!-- Need to filter out some extraneous license files.