Skip to content

Commit 293db5e

Browse files
committed
redo patch due to line numbers
1 parent 5191f33 commit 293db5e

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

hbase/hbase-operator-tools/stackable/patches/1.3.0/0002-Exclude-hbase-testing-utils-dependency-from-the-buil.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f9e952767faf3032c0d4e729e51b5901fcf1a0e1 Mon Sep 17 00:00:00 2001
1+
From b589c5bae43f401c3c49a5c4b4d106c09343d32b Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Tue, 6 May 2025 17:58:34 +0200
44
Subject: Exclude hbase-testing-utils dependency from the build.
@@ -9,7 +9,7 @@ Subject: Exclude hbase-testing-utils dependency from the build.
99
2 files changed, 12 insertions(+), 4 deletions(-)
1010

1111
diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml
12-
index 1d57225..fd0018c 100644
12+
index 69af92e..7bebf32 100644
1313
--- a/hbase-hbck2/pom.xml
1414
+++ b/hbase-hbck2/pom.xml
1515
@@ -114,12 +114,19 @@
@@ -35,7 +35,7 @@ index 1d57225..fd0018c 100644
3535
<groupId>org.mockito</groupId>
3636
<artifactId>mockito-core</artifactId>
3737
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
38-
index 55ef075..eeebe14 100644
38+
index f9d94e8..1644c30 100644
3939
--- a/hbase-tools/pom.xml
4040
+++ b/hbase-tools/pom.xml
4141
@@ -103,12 +103,13 @@

hbase/hbase-operator-tools/stackable/patches/1.3.0/0003-Configure-git-commit-id-plugin-to-use-native-git.patch

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
From 9c25c222246a88fe1b15e73e4fabbe92e98db10e Mon Sep 17 00:00:00 2001
1+
From 923efe9f649c947de8809f78cbc899d238545d05 Mon Sep 17 00:00:00 2001
22
From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
3-
Date: Mon, 9 Feb 2026 18:24:16 +0100
3+
Date: Tue, 10 Feb 2026 11:35:36 +0100
44
Subject: Configure git-commit-id-plugin to use native git
55

6-
This fixes the problem that jgit cannot handle worktrees and the build fails.
7-
8-
See https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/215
96
---
107
hbase-hbck2/pom.xml | 3 ++-
118
1 file changed, 2 insertions(+), 1 deletion(-)
129

1310
diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml
14-
index 5bfad33..f1df165 100644
11+
index 7bebf32..e3c246f 100644
1512
--- a/hbase-hbck2/pom.xml
1613
+++ b/hbase-hbck2/pom.xml
17-
@@ -212,8 +212,9 @@
14+
@@ -214,8 +214,9 @@
1815
<plugin>
1916
<groupId>pl.project13.maven</groupId>
2017
<artifactId>git-commit-id-plugin</artifactId>

0 commit comments

Comments
 (0)