Convert HBase 2.6.0 to patchable

Author: nightkr

hbase/stackable/patches/2.4.18/0006-Bumps-cyclonedx-maven-plugin-to-version-2.8.0-and-tw.patch renamed to hbase/stackable/patches/2.4.18/0006-Bump-cyclonedx-maven-plugin-to-version-2.8.0-and-twe.patch

@@ -1,7 +1,7 @@
-From 3d871f17a11c69b0db4fa42974f5bf51dd35751a Mon Sep 17 00:00:00 2001
+From 2aa0caa6a2c918f9f3bf21e9974f10fff1e1acc1 Mon Sep 17 00:00:00 2001
 From: Lukas Voetmand <[email protected]>
 Date: Fri, 6 Sep 2024 17:53:52 +0200
-Subject: Bumps cyclonedx-maven-plugin to version 2.8.0 and tweaks its
+Subject: Bump cyclonedx-maven-plugin to version 2.8.0 and tweak its
  configuration
 
 ---

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

@@ -1,10 +1,10 @@
-HBASE-28242 - Updates async-profiler support
-
-From: Lars Francke <[email protected]>
-
+From 5dedf99076578ec2d1a00f87b153ec7c04a40903 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.0/02-HBASE-28567.patch renamed to hbase/stackable/patches/2.6.0/0002-HBASE-28567-Race-condition-causes-MetaRegionLocation.patch

@@ -1,10 +1,11 @@
-HBASE-28567.
+From d0b4d835981de37250ad076298ef236c411b7ce0 Mon Sep 17 00:00:00 2001
+From: Razvan-Daniel Mihai <[email protected]>
+Date: Fri, 12 Jul 2024 17:30:12 -0400
+Subject: HBASE-28567: Race condition causes MetaRegionLocationCache to never
+ set watcher to populate meta location
 
-From: Lars Francke <[email protected]>
-
-Race condition causes MetaRegionLocationCache to never set watcher to populate meta location
 ---
- .../apache/hadoop/hbase/zookeeper/ZKWatcher.java   |    5 +++++
+ .../java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java    | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java

hbase/stackable/patches/2.6.0/03-patch-updates.patch renamed to hbase/stackable/patches/2.6.0/0003-Update-all-dependencies-which-have-a-new-patch-updat.patch

@@ -1,10 +1,10 @@
-Update all dependencies which have a new patch update available.
-
-From: Lars Francke <[email protected]>
-
+From fea1d27160dc1e8f53509ae0f57518404d16dae0 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 |   40 ++++++++++++++++++++--------------------
+ pom.xml | 40 ++++++++++++++++++++--------------------
  1 file changed, 20 insertions(+), 20 deletions(-)
 
 diff --git a/pom.xml b/pom.xml

hbase/stackable/patches/2.6.0/04-include-dataformat-xml.patch renamed to hbase/stackable/patches/2.6.0/0004-Include-jackson-dataformat-xml.patch

@@ -1,13 +1,14 @@
-Include jackson-dataformat-xml.
-
-From: Lars Francke <[email protected]>
+From 5aaae3665b8e50268810c5b3f443a204231b5d6a 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

hbase/stackable/patches/2.6.0/05-patch-cyclonedx-plugin.patch renamed to hbase/stackable/patches/2.6.0/0005-Bump-cyclonedx-maven-plugin-to-version-2.8.0-and-twe.patch

@@ -1,8 +1,18 @@
+From bcbdb378846206c42a602107e380c29af1ac9163 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.8.0 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 819e021d86..0bd6a69703 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3218,7 +3218,11 @@
+@@ -3230,7 +3230,11 @@
            <plugin>
              <groupId>org.cyclonedx</groupId>
              <artifactId>cyclonedx-maven-plugin</artifactId>

hbase/stackable/patches/2.6.0/06-CVE-2024-36114-bump-aircompressor-0-27.patch renamed to hbase/stackable/patches/2.6.0/0006-Fix-CVE-2024-36114.patch

@@ -1,4 +1,8 @@
-Fix CVE-2024-36114
+From 02affcbe2f4aa7a22493c9aaa72602c5520bf2a9 Mon Sep 17 00:00:00 2001
+From: Siegfried Weber <[email protected]>
+Date: Mon, 11 Nov 2024 10:00:15 +0100
+Subject: Fix CVE-2024-36114
+
 see https://github.com/stackabletech/vulnerabilities/issues/834
 
 Aircompressor is a library with ports of the Snappy, LZO, LZ4, and
@@ -17,6 +21,9 @@ have been fixed. When decompressing data from untrusted users, this can
 be exploited for a denial-of-service attack by crashing the JVM, or to
 leak other sensitive information from the Java process. There are no
 known workarounds for this issue.
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
 index 0bd6a69703..50948c2746 100644

hbase/stackable/patches/2.6.0/patchable.toml

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