From 8572b749c2149852f250817119a3c12a0f92a4f4 Mon Sep 17 00:00:00 2001
From: Masatake Iwasaki <iwasakims@apache.org>
Date: Tue, 5 Sep 2023 22:28:22 +0900
Subject: [PATCH] BIGTOP-4001. Bump HBase to 2.4.17.

---
 .../common/hbase/patch1-relocate-okhttp.diff  | 21 -------------------
 bigtop.bom                                    |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 bigtop-packages/src/common/hbase/patch1-relocate-okhttp.diff

diff --git a/bigtop-packages/src/common/hbase/patch1-relocate-okhttp.diff b/bigtop-packages/src/common/hbase/patch1-relocate-okhttp.diff
deleted file mode 100644
index 5bff3b02c2..0000000000
--- a/bigtop-packages/src/common/hbase/patch1-relocate-okhttp.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
-index 5a08deb5e9..aad19ff744 100644
---- a/hbase-shaded/pom.xml
-+++ b/hbase-shaded/pom.xml
-@@ -408,6 +408,16 @@
-                     <shadedPattern>${shaded.prefix}.net.</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.
diff --git a/bigtop.bom b/bigtop.bom
index e8d4705b73..54462ad601 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -162,7 +162,7 @@ bigtop {
       name    = 'hbase'
       rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
       relNotes = 'Apache HBase'
-      version { base = '2.4.13'; pkg = base; release = 2 }
+      version { base = '2.4.17'; pkg = base; release = 1 }
       tarball { destination = "${name}-${version.base}.tar.gz"
                 source      = "${name}-${version.base}-src.tar.gz" }
       url     { download_path = "/$name/${version.base}/"