Convert HBase 2.6.1 to patchable

Author: nightkr

hbase/stackable/patches/2.6.1/01-HBASE-28242.patch renamed to hbase/stackable/patches/2.6.1/0001-HBASE-28242-Updates-async-profiler-support.patch

@@ -1,10 +1,10 @@
-HBASE-28242 - Updates async-profiler support
-
-From: Lars Francke <[email protected]>
-
+From 12fa4ad4f12adef53c4e9d782b18152dfb3f7075 Mon Sep 17 00:00:00 2001
+From: Siegfried Weber <[email protected]>
+Date: Tue, 6 Feb 2024 16:10:54 +0100
+Subject: HBASE-28242: Updates async-profiler support
 
 ---
- .../apache/hadoop/hbase/http/ProfileServlet.java   |  205 ++++++++++++--------
+ .../hadoop/hbase/http/ProfileServlet.java     | 205 +++++++++++-------
  1 file changed, 121 insertions(+), 84 deletions(-)
 
 diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java

hbase/stackable/patches/2.6.1/02-patch-updates.patch renamed to hbase/stackable/patches/2.6.1/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch

@@ -1,5 +1,14 @@
+From 8b8b17064695f7c631ef3abd79351d756b155dd1 Mon Sep 17 00:00:00 2001
+From: Lars Francke <[email protected]>
+Date: Thu, 11 Jul 2024 10:12:51 +0200
+Subject: Update all dependencies which have a new patch update available.
+
+---
+ pom.xml | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
 diff --git a/pom.xml b/pom.xml
-index 01123cb..3734fb1 100644
+index 01123cb35b..3734fb1142 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -567,7 +567,7 @@

hbase/stackable/patches/2.6.1/03-include-dataformat-xml.patch renamed to hbase/stackable/patches/2.6.1/0003-Include-jackson-dataformat-xml.patch

@@ -1,13 +1,14 @@
-Include jackson-dataformat-xml.
-
-From: Lars Francke <[email protected]>
+From 056084630f50ba09e9a078aa9152b6c4f8550f3c Mon Sep 17 00:00:00 2001
+From: Razvan-Daniel Mihai <[email protected]>
+Date: Fri, 12 Jul 2024 17:30:12 -0400
+Subject: Include jackson-dataformat-xml.
 
 This is needed for XmlLayout to work so our structured logging works.
 It is an optional dependency of log4j2 so we need to make sure to include
 it.
 ---
- hbase-assembly/pom.xml |    5 +++++
- pom.xml                |   12 ++++++++++++
+ hbase-assembly/pom.xml |  5 +++++
+ pom.xml                | 12 ++++++++++++
  2 files changed, 17 insertions(+)
 
 diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
@@ -27,10 +28,10 @@ index 1564851b85..0786288a84 100644
        <groupId>org.apache.logging.log4j</groupId>
        <artifactId>log4j-slf4j-impl</artifactId>
 diff --git a/pom.xml b/pom.xml
-index b420025c6c..819e021d86 100644
+index 3734fb1142..ff1b35986b 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1149,6 +1149,11 @@
+@@ -1159,6 +1159,11 @@
          <artifactId>log4j-core</artifactId>
          <version>${log4j2.version}</version>
        </dependency>
@@ -42,7 +43,7 @@ index b420025c6c..819e021d86 100644
        <dependency>
          <groupId>org.apache.logging.log4j</groupId>
          <artifactId>log4j-slf4j-impl</artifactId>
-@@ -1159,6 +1164,13 @@
+@@ -1169,6 +1174,13 @@
          <artifactId>log4j-1.2-api</artifactId>
          <version>${log4j2.version}</version>
        </dependency>

hbase/stackable/patches/2.6.1/04-patch-cyclonedx-plugin.patch renamed to hbase/stackable/patches/2.6.1/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch

@@ -1,8 +1,18 @@
+From e8cfb60570a094f21d0ac3f13b600180770ad2bd Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <[email protected]>
+Date: Fri, 6 Sep 2024 17:53:52 +0200
+Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its
+ configuration
+
+---
+ pom.xml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
 diff --git a/pom.xml b/pom.xml
-index 918cdaa..2a83794 100644
+index ff1b35986b..5ce072ab36 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3218,7 +3218,11 @@
+@@ -3290,7 +3290,11 @@
            <plugin>
              <groupId>org.cyclonedx</groupId>
              <artifactId>cyclonedx-maven-plugin</artifactId>

hbase/stackable/patches/2.6.1/patchable.toml

@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/hbase.git"
+base = "7ed50b4dd742269a78875fb32112215f831284ff"