From ba82201dc1919d2b6a0bc3073d4884b4489956e1 Mon Sep 17 00:00:00 2001
From: Viraj Jasani <vjasani@apache.org>
Date: Sat, 17 Apr 2021 19:04:14 +0530
Subject: [PATCH 1/3] PHOENIX-6446 : Bump default HBase version on 2.3 profile
 to 2.3.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 95d382695d6..e3d5045c089 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
     <!-- The default hbase versions to build with (override with hbase.version) -->
     <hbase-2.1.runtime.version>2.1.10</hbase-2.1.runtime.version>
     <hbase-2.2.runtime.version>2.2.6</hbase-2.2.runtime.version>
-    <hbase-2.3.runtime.version>2.3.4</hbase-2.3.runtime.version>
+    <hbase-2.3.runtime.version>2.3.5</hbase-2.3.runtime.version>
     <hbase-2.4.0.runtime.version>2.4.0</hbase-2.4.0.runtime.version>
     <hbase-2.4.runtime.version>2.4.2</hbase-2.4.runtime.version>
 

From 9b90cc81c1e419579f83d4dbc71732b83cf5bd22 Mon Sep 17 00:00:00 2001
From: Viraj Jasani <vjasani@apache.org>
Date: Sat, 17 Apr 2021 19:10:55 +0530
Subject: [PATCH 2/3] for test run - to be reverted

---
 phoenix-core/pom.xml   |  4 ++--
 phoenix-server/pom.xml |  2 +-
 pom.xml                | 11 ++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 6afaba6196f..11ce7e95a7e 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -643,7 +643,7 @@
     </dependencies>
   </profile>
   <profile>
-    <id>phoenix-hbase-compat-2.4.1-default</id>
+    <id>phoenix-hbase-compat-2.3.0-default</id>
     <!-- keep dependency plugin happy -->
     <activation>
       <property>
@@ -651,7 +651,7 @@
       </property>
     </activation>
     <properties>
-      <hbase.profile>2.4</hbase.profile>
+      <hbase.profile>2.3</hbase.profile>
     </properties>
     <dependencies>
       <dependency>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 483bd190eb0..96df4730274 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -474,7 +474,7 @@
         </dependencies>
       </profile>
     <profile>
-      <id>phoenix-hbase-compat-2.4.1-default</id>
+      <id>phoenix-hbase-compat-2.3.0-default</id>
       <!-- keep dependency plugin happy -->
       <activation>
         <property>
diff --git a/pom.xml b/pom.xml
index e3d5045c089..8cb02acc908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1530,18 +1530,19 @@
     <profile>
       <!-- must be identical to phoenix-hbase-compat-2.4.1 profile -->
       <!-- PHOENIX-5993 This won't work with the public HBase artifacts -->
-      <id>phoenix-hbase-compat-2.4.1-default</id>
+      <id>phoenix-hbase-compat-2.3.0-default</id>
       <activation>
         <property>
           <name>!hbase.profile</name>
         </property>
       </activation>
       <properties>
-        <hbase.profile>2.4</hbase.profile>
-        <hbase.compat.version>2.4.1</hbase.compat.version>
-        <hbase.version>${hbase-2.4.runtime.version}</hbase.version>
-        <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
+        <hbase.profile>2.3</hbase.profile>
+        <hbase.compat.version>2.3.0</hbase.compat.version>
+        <hbase.version>${hbase-2.3.runtime.version}</hbase.version>
+        <hbase.thirdparty.version>3.3.0</hbase.thirdparty.version>
         <zookeeper.version>3.5.7</zookeeper.version>
+        <hadoop.version>3.1.3</hadoop.version>
       </properties>
     </profile>
     <profile>

From aca8ded06803fd8dfb0d258131d3c75cea8a8bb6 Mon Sep 17 00:00:00 2001
From: Viraj Jasani <vjasani@apache.org>
Date: Sun, 18 Apr 2021 13:09:56 +0530
Subject: [PATCH 3/3] Revert "for test run - to be reverted"

This reverts commit 9b90cc81c1e419579f83d4dbc71732b83cf5bd22.
---
 phoenix-core/pom.xml   |  4 ++--
 phoenix-server/pom.xml |  2 +-
 pom.xml                | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 11ce7e95a7e..6afaba6196f 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -643,7 +643,7 @@
     </dependencies>
   </profile>
   <profile>
-    <id>phoenix-hbase-compat-2.3.0-default</id>
+    <id>phoenix-hbase-compat-2.4.1-default</id>
     <!-- keep dependency plugin happy -->
     <activation>
       <property>
@@ -651,7 +651,7 @@
       </property>
     </activation>
     <properties>
-      <hbase.profile>2.3</hbase.profile>
+      <hbase.profile>2.4</hbase.profile>
     </properties>
     <dependencies>
       <dependency>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 96df4730274..483bd190eb0 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -474,7 +474,7 @@
         </dependencies>
       </profile>
     <profile>
-      <id>phoenix-hbase-compat-2.3.0-default</id>
+      <id>phoenix-hbase-compat-2.4.1-default</id>
       <!-- keep dependency plugin happy -->
       <activation>
         <property>
diff --git a/pom.xml b/pom.xml
index 8cb02acc908..e3d5045c089 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1530,19 +1530,18 @@
     <profile>
       <!-- must be identical to phoenix-hbase-compat-2.4.1 profile -->
       <!-- PHOENIX-5993 This won't work with the public HBase artifacts -->
-      <id>phoenix-hbase-compat-2.3.0-default</id>
+      <id>phoenix-hbase-compat-2.4.1-default</id>
       <activation>
         <property>
           <name>!hbase.profile</name>
         </property>
       </activation>
       <properties>
-        <hbase.profile>2.3</hbase.profile>
-        <hbase.compat.version>2.3.0</hbase.compat.version>
-        <hbase.version>${hbase-2.3.runtime.version}</hbase.version>
-        <hbase.thirdparty.version>3.3.0</hbase.thirdparty.version>
+        <hbase.profile>2.4</hbase.profile>
+        <hbase.compat.version>2.4.1</hbase.compat.version>
+        <hbase.version>${hbase-2.4.runtime.version}</hbase.version>
+        <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
         <zookeeper.version>3.5.7</zookeeper.version>
-        <hadoop.version>3.1.3</hadoop.version>
       </properties>
     </profile>
     <profile>