Skip to content

Commit 6cf0e71

Browse files
nightkrnightkr
committed
Convert HBase 2.4.18 to patchable
1 parent ef49dfe commit 6cf0e71

8 files changed

+42
-46
lines changed

‎hbase/stackable/patches/2.4.18/01-HBASE-27103.patch‎ renamed to ‎hbase/stackable/patches/2.4.18/0001-HBASE-27103-Fixes-HBase-build-on-arm64.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
HBASE-27103 - fixes HBase build
2-
3-
From: Lars Francke <[email protected]>
4-
1+
From 393df760d7beb6735e6b788501ddeb5f60615a4a Mon Sep 17 00:00:00 2001
2+
From: Maximilian Wittich <[email protected]>
3+
Date: Fri, 15 Dec 2023 13:14:28 +0100
4+
Subject: HBASE-27103: Fixes HBase build on arm64
55

66
---
7-
.../src/main/resources/supplemental-models.xml | 14 ++++++++++++++
7+
.../src/main/resources/supplemental-models.xml | 14 ++++++++++++++
88
1 file changed, 14 insertions(+)
99

1010
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml

‎hbase/stackable/patches/2.4.18/02-HBASE-28242.patch‎ renamed to ‎hbase/stackable/patches/2.4.18/0002-HBASE-28242-Updates-async-profiler-support.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
HBASE-28242 - Updates async-profiler support
2-
3-
From: Lars Francke <[email protected]>
4-
1+
From 5e26329f7b75e2ee2aa797f7bdcf3524bd45e491 Mon Sep 17 00:00:00 2001
2+
From: Siegfried Weber <[email protected]>
3+
Date: Tue, 6 Feb 2024 16:10:54 +0100
4+
Subject: HBASE-28242: Updates async-profiler support
55

66
---
7-
.../apache/hadoop/hbase/http/ProfileServlet.java | 205 ++++++++++++--------
7+
.../hadoop/hbase/http/ProfileServlet.java | 205 +++++++++++-------
88
1 file changed, 121 insertions(+), 84 deletions(-)
99

1010
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.4.18/03-HBASE-28379.patch‎ renamed to ‎hbase/stackable/patches/2.4.18/0003-HBASE-28379-Upgrade-thirdparty-deps.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
HBASE-28379 Upgrade thirdparty dep to 4.1.6
2-
3-
From: Lars Francke <[email protected]>
4-
1+
From 8720a56fe1727d3de52e937e9df1631ed7b3c476 Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Thu, 11 Jul 2024 10:12:51 +0200
4+
Subject: HBASE-28379: Upgrade thirdparty deps
55

66
---
7-
hbase-protocol-shaded/pom.xml | 2 +-
8-
hbase-shaded/pom.xml | 2 +-
9-
pom.xml | 16 +++++++++++++---
7+
hbase-protocol-shaded/pom.xml | 2 +-
8+
hbase-shaded/pom.xml | 2 +-
9+
pom.xml | 16 +++++++++++++---
1010
3 files changed, 15 insertions(+), 5 deletions(-)
1111

1212
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml

‎hbase/stackable/patches/2.4.18/04-HBASE-28511.patch‎ renamed to ‎hbase/stackable/patches/2.4.18/0004-HBASE-28511-Update-hbase-thirdparty-to-4.1.7.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
HBASE-28511 Update hbase-thirdparty to 4.1.7
2-
3-
From: Lars Francke <[email protected]>
4-
1+
From 92521e5f2798dbb21af9af56f48eb649f97e48ac Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Thu, 11 Jul 2024 10:12:51 +0200
4+
Subject: HBASE-28511: Update hbase-thirdparty to 4.1.7
55

66
---
7-
.../hadoop/hbase/security/EncryptionUtil.java | 4 ++--
8-
.../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 2 +-
9-
.../mapreduce/TableSnapshotInputFormatImpl.java | 2 +-
10-
hbase-protocol-shaded/pom.xml | 2 +-
11-
.../hadoop/hbase/io/hfile/FixedFileTrailer.java | 2 +-
12-
.../hbase/zookeeper/MasterAddressTracker.java | 2 +-
13-
pom.xml | 8 ++++----
7+
.../org/apache/hadoop/hbase/security/EncryptionUtil.java | 4 ++--
8+
.../apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 2 +-
9+
.../hbase/mapreduce/TableSnapshotInputFormatImpl.java | 2 +-
10+
hbase-protocol-shaded/pom.xml | 2 +-
11+
.../apache/hadoop/hbase/io/hfile/FixedFileTrailer.java | 2 +-
12+
.../hadoop/hbase/zookeeper/MasterAddressTracker.java | 2 +-
13+
pom.xml | 8 ++++----
1414
7 files changed, 11 insertions(+), 11 deletions(-)
1515

1616
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java

‎hbase/stackable/patches/2.4.18/05-patch-updates.patch‎ renamed to ‎hbase/stackable/patches/2.4.18/0005-Update-all-available-dependencies-to-new-patch-versi.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Updates all available dependencies to new patch versions
2-
3-
From: Lars Francke <[email protected]>
4-
1+
From 6acfff9441d96c18c2a1ec7c0d0c40aec8e94b2f Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Thu, 11 Jul 2024 10:12:51 +0200
4+
Subject: Update all available dependencies to new patch versions
55

66
---
7-
pom.xml | 46 +++++++++++++++++++++++-----------------------
7+
pom.xml | 46 +++++++++++++++++++++++-----------------------
88
1 file changed, 23 insertions(+), 23 deletions(-)
99

1010
diff --git a/pom.xml b/pom.xml

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
Bumps cyclonedx-maven-plugin to version 2.8.0 and tweaks its configuration
2-
3-
From: dervoeti <[email protected]>
4-
1+
From 3d871f17a11c69b0db4fa42974f5bf51dd35751a Mon Sep 17 00:00:00 2001
2+
From: Lukas Voetmand <[email protected]>
3+
Date: Fri, 6 Sep 2024 17:53:52 +0200
4+
Subject: Bumps cyclonedx-maven-plugin to version 2.8.0 and tweaks its
5+
configuration
56

67
---
7-
pom.xml | 6 +++++-
8+
pom.xml | 6 +++++-
89
1 file changed, 5 insertions(+), 1 deletion(-)
910

1011
diff --git a/pom.xml b/pom.xml
11-
index 8bd80e81e2..a437d5c819 100755
12+
index 8bd80e81e2..58c29a9d90 100755
1213
--- a/pom.xml
1314
+++ b/pom.xml
1415
@@ -3011,7 +3011,11 @@

‎hbase/stackable/patches/2.4.18/patchable.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
upstream = "https://github.com/apache/hbase.git"
2+
base = "a1767f4d76859c0068720a6c1e5cb78282ebfe1e"

‎hbase/stackable/patches/2.4.18/series‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)