Skip to content

Commit 7311267

Browse files
dervoetidervoeti
committed
chore: migrate patches of dependencies to patchable format
1 parent 97a3ad5 commit 7311267

File tree

19 files changed

+96
-77
lines changed

19 files changed

+96
-77
lines changed

‎hbase/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ ARG DELETE_CACHES="true"
139139
# so that they are not expanded. Disabling ShellCheck rules in a Dockerfile
140140
# does not work, so please ignore the according warning (SC2016).
141141
COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/bin/hbck2.env /stackable/bin/
142-
COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/patches /stackable/patches
142+
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches /stackable/patches
143+
COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/patches/apply_patches.sh /stackable/patches
143144
COPY --chown=${STACKABLE_USER_UID}:0 --chmod=755 hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/
144145

145146
USER ${STACKABLE_USER_UID}
@@ -152,7 +153,7 @@ RUN --mount=type=cache,id=maven-hbase-operator-tools-${HBASE_OPERATOR_TOOLS},uid
152153
curl "https://repo.stackable.tech/repository/packages/hbase-operator-tools/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src.tar.gz" | tar -xzC .
153154
mv hbase-operator-tools-${HBASE_OPERATOR_TOOLS} hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
154155
chmod +x patches/apply_patches.sh
155-
patches/apply_patches.sh hbase-operator-tools/${HBASE_OPERATOR_TOOLS} hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
156+
patches/apply_patches.sh ${HBASE_OPERATOR_TOOLS} hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
156157

157158
mvn \
158159
--batch-mode \
@@ -232,7 +233,8 @@ ARG STACKABLE_USER_UID
232233
# This can be used to speed up builds when disk space is of no concern.
233234
ARG DELETE_CACHES="true"
234235

235-
COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/patches /stackable/patches
236+
COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches /stackable/patches
237+
COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/patches/apply_patches.sh /stackable/patches
236238
USER ${STACKABLE_USER_UID}
237239
WORKDIR /stackable
238240

@@ -242,7 +244,7 @@ curl "https://repo.stackable.tech/repository/packages/phoenix/phoenix-${PHOENIX}
242244
mv phoenix-${PHOENIX} phoenix-${PHOENIX}-src
243245

244246
chmod +x patches/apply_patches.sh
245-
patches/apply_patches.sh phoenix/${PHOENIX} phoenix-${PHOENIX}-src
247+
patches/apply_patches.sh ${PHOENIX} phoenix-${PHOENIX}-src
246248

247249
# Passing "-f" means it'll build in the phoenix source directory without cding into it
248250
# The Maven command can be found inside of the scripts in the create-release folder (release-util.sh as of Phoenix 5.2.0)

‎hbase/stackable/patches/hbase-operator-tools/1.2.0/01-cyclonedx-plugin.patch‎ renamed to ‎hbase/hbase-operator-tools/stackable/patches/1.2.0/0001-Add-CycloneDX-plugin.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
From 925a136ad24ae2d273990c36e591a87116f78ec0 Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Thu, 13 Mar 2025 22:04:20 +0100
4+
Subject: Add CycloneDX plugin
5+
6+
---
7+
pom.xml | 17 +++++++++++++++++
8+
1 file changed, 17 insertions(+)
9+
110
diff --git a/pom.xml b/pom.xml
211
index aba42b0..0288bde 100644
312
--- a/pom.xml

‎hbase/hbase-operator-tools/stackable/patches/1.2.0/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-operator-tools.git"
2+
base = "478af00af79f82624264fd2bb447b97fecc8e790"

‎hbase/stackable/patches/hbase-operator-tools/1.3.0-fd5a5fb/01-cyclonedx-plugin.patch‎ renamed to ‎hbase/hbase-operator-tools/stackable/patches/1.3.0-fd5a5fb/0001-Add-CycloneDX-plugin.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
From 8616ee8b26bfbba285a36b91eb41a203a49b222a Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Thu, 13 Mar 2025 22:07:31 +0100
4+
Subject: Add CycloneDX plugin
5+
6+
---
7+
pom.xml | 17 +++++++++++++++++
8+
1 file changed, 17 insertions(+)
9+
110
diff --git a/pom.xml b/pom.xml
211
index caa032a..0025687 100644
312
--- a/pom.xml

‎hbase/hbase-operator-tools/stackable/patches/1.3.0-fd5a5fb/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-operator-tools.git"
2+
base = "fd5a5fb90755949a90c502c76de8313130403fa3"

‎hbase/stackable/patches/phoenix/5.2.0/01-cyclonedx-plugin.patch‎ renamed to ‎hbase/phoenix/stackable/patches/5.2.0/0001-Add-CycloneDX-plugin.patch‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1+
From a30f7fc9682806daf1b49cd8cb496ff9e8b1f72d Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Thu, 13 Mar 2025 16:49:18 +0100
4+
Subject: Add CycloneDX plugin
5+
6+
---
7+
pom.xml | 17 +++++++++++++++++
8+
1 file changed, 17 insertions(+)
9+
110
diff --git a/pom.xml b/pom.xml
2-
index bce2398..4abcb5a 100644
11+
index bce239830..4abcb5a28 100644
312
--- a/pom.xml
413
+++ b/pom.xml
514
@@ -680,6 +680,23 @@

‎hbase/stackable/patches/phoenix/5.2.0/02-CVE-2023-34455-update-snappy-version.patch‎ renamed to ‎hbase/phoenix/stackable/patches/5.2.0/0002-Fix-CVE-2023-34455.patch‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
Fix CVE-2023-34455
1+
From 478367176853837a6875105cec74b2977ab23c2c Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Thu, 13 Mar 2025 16:50:29 +0100
4+
Subject: Fix CVE-2023-34455
25

36
See https://github.com/stackabletech/vulnerabilities/issues/558
7+
---
8+
phoenix-core-client/pom.xml | 6 ++++++
9+
phoenix-core-server/pom.xml | 8 +++++++-
10+
phoenix-pherf/pom.xml | 6 ++++++
11+
phoenix-tracing-webapp/pom.xml | 6 ++++++
12+
pom.xml | 7 +++++++
13+
5 files changed, 32 insertions(+), 1 deletion(-)
414

515
diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
616
index f711b0f6f..3cfbffef9 100644

‎hbase/phoenix/stackable/patches/5.2.0/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/phoenix.git"
2+
base = "ee35d060a00863bbad23f18028e1524a845874f3"

‎hbase/stackable/patches/phoenix/5.2.1/01-cyclonedx-plugin.patch‎ renamed to ‎hbase/phoenix/stackable/patches/5.2.1/0001-Add-CycloneDX-plugin.patch‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1+
From 7727bee78aa96e3342da8cb9b3221327f29c43db Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Thu, 13 Mar 2025 22:00:03 +0100
4+
Subject: Add CycloneDX plugin
5+
6+
---
7+
pom.xml | 17 +++++++++++++++++
8+
1 file changed, 17 insertions(+)
9+
110
diff --git a/pom.xml b/pom.xml
2-
index bce2398..4abcb5a 100644
11+
index ed97bb870..f8534b4ad 100644
312
--- a/pom.xml
413
+++ b/pom.xml
5-
@@ -680,6 +680,23 @@
14+
@@ -697,6 +697,23 @@
615
<extensions>true</extensions>
716
<inherited>true</inherited>
817
</plugin>

‎hbase/stackable/patches/phoenix/5.2.1/02-CVE-2023-34455-update-snappy-version.patch‎ renamed to ‎hbase/phoenix/stackable/patches/5.2.1/0002-Fix-CVE-2023-34455.patch‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
1-
Fix CVE-2023-34455
1+
From 24a0779c5e24caec82d23988f0b4b026e4bc7c8c Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Thu, 13 Mar 2025 22:01:52 +0100
4+
Subject: Fix CVE-2023-34455
25

36
See https://github.com/stackabletech/vulnerabilities/issues/558
7+
---
8+
phoenix-core-client/pom.xml | 6 ++++++
9+
phoenix-core-server/pom.xml | 8 +++++++-
10+
phoenix-pherf/pom.xml | 6 ++++++
11+
phoenix-tracing-webapp/pom.xml | 6 ++++++
12+
pom.xml | 7 +++++++
13+
5 files changed, 32 insertions(+), 1 deletion(-)
414

515
diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
6-
index f711b0f6f..3cfbffef9 100644
16+
index eaf92a75e..cbbebc9d5 100644
717
--- a/phoenix-core-client/pom.xml
818
+++ b/phoenix-core-client/pom.xml
9-
@@ -230,6 +230,12 @@
19+
@@ -233,6 +233,12 @@
1020
<groupId>org.apache.hadoop</groupId>
1121
<artifactId>hadoop-auth</artifactId>
1222
</dependency>
@@ -20,7 +30,7 @@ index f711b0f6f..3cfbffef9 100644
2030
<!-- HBase dependencies -->
2131
<dependency>
2232
diff --git a/phoenix-core-server/pom.xml b/phoenix-core-server/pom.xml
23-
index d5032ece2..e47fb0837 100644
33+
index bb582d408..61cfeef6d 100644
2434
--- a/phoenix-core-server/pom.xml
2535
+++ b/phoenix-core-server/pom.xml
2636
@@ -59,6 +59,12 @@
@@ -44,7 +54,7 @@ index d5032ece2..e47fb0837 100644
4454
\ No newline at end of file
4555
+</project>
4656
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
47-
index c03fff9a1..cdcce2f98 100644
57+
index 787137edc..017cb5dd5 100644
4858
--- a/phoenix-pherf/pom.xml
4959
+++ b/phoenix-pherf/pom.xml
5060
@@ -159,6 +159,12 @@
@@ -61,7 +71,7 @@ index c03fff9a1..cdcce2f98 100644
6171
<!-- Test Dependencies -->
6272
<dependency>
6373
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
64-
index d2d1549ef..c8054159e 100755
74+
index 681e68043..3f28979e7 100755
6575
--- a/phoenix-tracing-webapp/pom.xml
6676
+++ b/phoenix-tracing-webapp/pom.xml
6777
@@ -89,6 +89,12 @@
@@ -78,10 +88,10 @@ index d2d1549ef..c8054159e 100755
7888

7989
<build>
8090
diff --git a/pom.xml b/pom.xml
81-
index 4abcb5a28..21dcf71ad 100644
91+
index f8534b4ad..ec98a082a 100644
8292
--- a/pom.xml
8393
+++ b/pom.xml
84-
@@ -850,6 +850,13 @@
94+
@@ -892,6 +892,13 @@
8595
</exclusion>
8696
</exclusions>
8797
</dependency>

0 commit comments

Comments
 (0)