From d55c10cb8c2cd038917c5f9d31ecddb7af5b41db Mon Sep 17 00:00:00 2001
From: "kedia,Akanksha" <akedia@visa.com>
Date: Wed, 16 Aug 2023 10:33:20 +0530
Subject: [PATCH 1/2] BIGTOP-3987: Upgrade phoenix version to 5.1.3

---
 bigtop.bom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigtop.bom b/bigtop.bom
index 6123b67930..4a4eafc8ac 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -247,7 +247,7 @@ bigtop {
     'phoenix' {
       name    = 'phoenix'
       relNotes = 'Apache Phoenix: A SQL skin over HBase'
-      version { base = "5.1.2"; pkg = base; release = 1 }
+      version { base = "5.1.3"; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}-src.tar.gz"
                 source      = destination }
       url     { download_path = "/$name/$name-${version.base}"

From 64d15a960f0c7a90397b18dd501d25de38c269e3 Mon Sep 17 00:00:00 2001
From: "kedia,Akanksha" <akedia@visa.com>
Date: Wed, 16 Aug 2023 10:56:47 +0530
Subject: [PATCH 2/2] BIGTOP-3989 : Upgrade hbase version to 2.5.3

---
 .../hbase/patch0-HBASE-27065-2.4.13.diff      | 251 ------------------
 .../common/hbase/patch1-relocate-okhttp.diff  |  21 --
 bigtop.bom                                    |   4 +-
 3 files changed, 2 insertions(+), 274 deletions(-)
 delete mode 100644 bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
 delete mode 100644 bigtop-packages/src/common/hbase/patch1-relocate-okhttp.diff

diff --git a/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff b/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
deleted file mode 100644
index 21ed3d15ce..0000000000
--- a/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
+++ /dev/null
@@ -1,251 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 97d1c283dd..679206e019 100755
---- a/pom.xml
-+++ b/pom.xml
-@@ -3510,6 +3510,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3542,6 +3550,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3575,6 +3591,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3619,6 +3643,22 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.fusesource.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.openlabtesting.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3670,6 +3710,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-               <exclusion>
-                 <groupId>io.netty</groupId>
-                 <artifactId>netty</artifactId>
-@@ -3678,6 +3726,14 @@
-                 <groupId>io.netty</groupId>
-                 <artifactId>netty-all</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>org.fusesource.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.openlabtesting.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3727,13 +3783,34 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-+              <!--
-+              Needed in test context when hadoop-3.3 runs.
-               <exclusion>
-                 <groupId>io.netty</groupId>
-                 <artifactId>netty-all</artifactId>
-               </exclusion>
-+              -->
-+              <exclusion>
-+                <groupId>org.fusesource.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.openlabtesting.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-+            <!-- Is this needed? Seems a duplicate of the above dependency but for the
-+            classifier-->
-             <groupId>org.apache.hadoop</groupId>
-             <artifactId>hadoop-hdfs</artifactId>
-             <version>${hadoop-three.version}</version>
-@@ -3745,6 +3822,30 @@
-                 <groupId>com.sun.jersey</groupId>
-                 <artifactId>jersey-core</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-log4j12</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>log4j</groupId>
-+                <artifactId>log4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.fusesource.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.openlabtesting.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3768,6 +3869,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3835,6 +3944,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3905,6 +4022,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3975,6 +4100,22 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.fusesource.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.openlabtesting.leveldbjni</groupId>
-+                <artifactId>leveldbjni-all</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
-@@ -3991,6 +4132,14 @@
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-               </exclusion>
-+              <exclusion>
-+                <groupId>ch.qos.reload4j</groupId>
-+                <artifactId>reload4j</artifactId>
-+              </exclusion>
-+              <exclusion>
-+                <groupId>org.slf4j</groupId>
-+                <artifactId>slf4j-reload4j</artifactId>
-+              </exclusion>
-             </exclusions>
-           </dependency>
-           <dependency>
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 4a4eafc8ac..a54150de2c 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.5.3'; pkg = base; release = 1 }
       tarball { destination = "${name}-${version.base}.tar.gz"
                 source      = "${name}-${version.base}-src.tar.gz" }
       url     { download_path = "/$name/${version.base}/"
@@ -247,7 +247,7 @@ bigtop {
     'phoenix' {
       name    = 'phoenix'
       relNotes = 'Apache Phoenix: A SQL skin over HBase'
-      version { base = "5.1.3"; pkg = base; release = 1 }
+      version { base = "5.1.2"; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}-src.tar.gz"
                 source      = destination }
       url     { download_path = "/$name/$name-${version.base}"