From 87c9746f507db5ad1743497d6f8ec577d09ce794 Mon Sep 17 00:00:00 2001
From: Viraj Jasani <vjasani@apache.org>
Date: Wed, 22 Apr 2026 20:29:41 -0700
Subject: [PATCH 1/3] PHOENIX-7806 Upgrade hbase versions to 2.5.14 and 2.6.5

---
 phoenix-hbase-compat-2.6.4/pom.xml | 2 +-
 pom.xml                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phoenix-hbase-compat-2.6.4/pom.xml b/phoenix-hbase-compat-2.6.4/pom.xml
index a1944187ebf..27f9dcbaed6 100644
--- a/phoenix-hbase-compat-2.6.4/pom.xml
+++ b/phoenix-hbase-compat-2.6.4/pom.xml
@@ -28,7 +28,7 @@
   <description>Compatibility module for HBase 2.6.4+</description>
 
   <properties>
-    <hbase26.compat.version>2.6.4-hadoop3</hbase26.compat.version>
+    <hbase26.compat.version>2.6.5-hadoop3</hbase26.compat.version>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index ae2d2c6d795..5aab0e18f14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,10 +77,10 @@
     <!-- The default hbase versions to build with (override with hbase.version) -->
     <hbase-2.5.0.runtime.version>2.5.3-hadoop3</hbase-2.5.0.runtime.version>
     <hbase-2.5.4.runtime.version>2.5.10-hadoop3</hbase-2.5.4.runtime.version>
-    <hbase-2.5.runtime.version>2.5.13-hadoop3</hbase-2.5.runtime.version>
+    <hbase-2.5.runtime.version>2.5.14-hadoop3</hbase-2.5.runtime.version>
     <hbase-2.6.0.runtime.version>2.6.1-hadoop3</hbase-2.6.0.runtime.version>
     <hbase-2.6.3.runtime.version>2.6.3-hadoop3</hbase-2.6.3.runtime.version>
-    <hbase-2.6.runtime.version>2.6.4-hadoop3</hbase-2.6.runtime.version>
+    <hbase-2.6.runtime.version>2.6.5-hadoop3</hbase-2.6.runtime.version>
 
     <compileSource>1.8</compileSource>
     <maven.compiler.source>${compileSource}</maven.compiler.source>

From bd438c59bf2f6b820d3d33644c0bda2ef24afcdd Mon Sep 17 00:00:00 2001
From: Viraj Jasani <vjasani@apache.org>
Date: Wed, 22 Apr 2026 20:51:50 -0700
Subject: [PATCH 2/3] to be reverted - test 2.6 profile

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5aab0e18f14..4325e83547f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2154,7 +2154,8 @@
       <id>phoenix-hbase-compat-2.5.13-default</id>
       <activation>
         <property>
-          <name>!hbase.profile</name>
+          <name>hbase.profile</name>
+          <value>2.5</value>
         </property>
       </activation>
       <properties>
@@ -2215,8 +2216,7 @@
       <id>phoenix-hbase-compat-2.6.4</id>
       <activation>
         <property>
-          <name>hbase.profile</name>
-          <value>2.6</value>
+          <name>!hbase.profile</name>
         </property>
       </activation>
       <properties>

From b927a14e42c288a809ef76dc99f1722c3d9d4a0e Mon Sep 17 00:00:00 2001
From: Viraj Jasani <vjasani@apache.org>
Date: Thu, 23 Apr 2026 20:16:45 -0700
Subject: [PATCH 3/3] increase build time

---
 Jenkinsfile        | 2 +-
 Jenkinsfile.github | 2 +-
 Jenkinsfile.yetus  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 49a44d3766f..2bdb6785483 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ pipeline {
 
                     stage('BuildAndTest') {
                         options {
-                            timeout(time: 9, unit: 'HOURS')
+                            timeout(time: 11, unit: 'HOURS')
                         }
                         steps {
                             dir("HBASE_${HBASE_PROFILE}") {
diff --git a/Jenkinsfile.github b/Jenkinsfile.github
index cf7bd9f4fc2..b2ed97be20c 100644
--- a/Jenkinsfile.github
+++ b/Jenkinsfile.github
@@ -26,7 +26,7 @@ pipeline {
         // N.B. this is per-branch, which means per PR
         disableConcurrentBuilds()
         buildDiscarder(logRotator(daysToKeepStr: '15', artifactDaysToKeepStr: '5'))
-        timeout (time: 9, unit: 'HOURS')
+        timeout (time: 11, unit: 'HOURS')
         timestamps()
         skipDefaultCheckout()
     }
diff --git a/Jenkinsfile.yetus b/Jenkinsfile.yetus
index 7e99f45b056..28477873bc2 100644
--- a/Jenkinsfile.yetus
+++ b/Jenkinsfile.yetus
@@ -37,7 +37,7 @@ pipeline {
             }
 
             options {
-                timeout(time: 9, unit: 'HOURS')
+                timeout(time: 11, unit: 'HOURS')
             }
 
             steps {