This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new c701c1262ee HBASE-27292. Fix build failure against Hadoop 3.3.4 due to
added dependency on okhttp. (#4687)
c701c1262ee is described below
commit c701c1262eef7a13381843bad7fc0b368f82b25c
Author: Masatake Iwasaki <[email protected]>
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 <[email protected]>
(cherry picked from commit 00612106b5fa78a0dd198cbcaab610bd8b1be277)
---
hbase-shaded/pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index e6b35017ffb..8a4317663cf 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -407,7 +407,19 @@
<pattern>net/</pattern>
<shadedPattern>${shaded.prefix}.net.</shadedPattern>
</relocation>
-
+ <relocation>
+ <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.
