From 640315a61baf1a354e0bf66db421a1a8a849ae81 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:42:23 +0100
Subject: [PATCH 1/2] DRILL-8515. upgrade to hbase client 2.6.1

---
 contrib/storage-phoenix/pom.xml | 2 +-
 pom.xml                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/storage-phoenix/pom.xml b/contrib/storage-phoenix/pom.xml
index e21dd3a9b68..a82f55334a6 100644
--- a/contrib/storage-phoenix/pom.xml
+++ b/contrib/storage-phoenix/pom.xml
@@ -31,7 +31,7 @@
   <properties>
     <phoenix.version>5.1.3</phoenix.version>
     <!-- Limit the HBase minicluster version to 2.4.x to avoid a dependency conflict. -->
-    <hbase.minicluster.version>2.4.17</hbase.minicluster.version>
+    <hbase.minicluster.version>2.6.1</hbase.minicluster.version>
     <skipTests>false</skipTests>
   </properties>
 
diff --git a/pom.xml b/pom.xml
index 1b5693b34e7..051d9a8a8c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
     <guava.version>32.1.2-jre</guava.version>
     <hadoop.version>3.3.6</hadoop.version>
     <hamcrest.version>2.2</hamcrest.version>
-    <hbase.version>2.5.5-hadoop3</hbase.version>
+    <hbase.version>2.6.1-hadoop3</hbase.version>
     <hikari.version>4.0.3</hikari.version>
     <!--
       Currently, Hive storage plugin only supports Apache Hive 3.1.3 or vendor specific variants of the
@@ -2943,7 +2943,7 @@
       </activation>
       <properties>
         <hadoop.version>2.10.2</hadoop.version>
-        <hbase.version>2.5.5</hbase.version>
+        <hbase.version>2.6.1</hbase.version>
       </properties>
       <dependencyManagement>
         <dependencies>

From a6bc46e123a9b8dc62db35efd1a7242400b1b0a1 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Wed, 1 Jan 2025 20:47:11 +0100
Subject: [PATCH 2/2] Update pom.xml

---
 contrib/storage-phoenix/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/storage-phoenix/pom.xml b/contrib/storage-phoenix/pom.xml
index a82f55334a6..e21dd3a9b68 100644
--- a/contrib/storage-phoenix/pom.xml
+++ b/contrib/storage-phoenix/pom.xml
@@ -31,7 +31,7 @@
   <properties>
     <phoenix.version>5.1.3</phoenix.version>
     <!-- Limit the HBase minicluster version to 2.4.x to avoid a dependency conflict. -->
-    <hbase.minicluster.version>2.6.1</hbase.minicluster.version>
+    <hbase.minicluster.version>2.4.17</hbase.minicluster.version>
     <skipTests>false</skipTests>
   </properties>