Convert spark-k8s to patchable

Author: nightkr

spark-k8s/stackable/patches/3.5.1/001-cyclonedx-plugin.patch renamed to spark-k8s/stackable/patches/3.5.1/0001-Update-CycloneDX-plugin.patch

@@ -1,5 +1,15 @@
+From 08b7c02a497b8b3b70616281f810a898b1719a78 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <[email protected]>
+Date: Fri, 6 Sep 2024 17:53:52 +0200
+Subject: Update CycloneDX plugin
+
+---
+ dev/make-distribution.sh | 1 -
+ pom.xml                  | 7 ++++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
 diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
-index ef7c010..0f4c1c7 100755
+index ef7c010e93..0f4c1c74e4 100755
 --- a/dev/make-distribution.sh
 +++ b/dev/make-distribution.sh
 @@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \
@@ -11,7 +21,7 @@ index ef7c010..0f4c1c7 100755
 
  # Actually build the jar
 diff --git a/pom.xml b/pom.xml
-index 0f504db..6cca7db 100644
+index 0f504dbee8..6cca7db7bf 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3482,7 +3482,12 @@

spark-k8s/stackable/patches/3.5.1/002-CVE-2024-36114-upgrade-aircompressor.patch renamed to spark-k8s/stackable/patches/3.5.1/0002-Fix-CVE-2024-36114.patch

@@ -1,4 +1,8 @@
-Fix CVE-2024-36114
+From 3892892d934387d20c6d8fd45f126e054bef55b8 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,9 +21,12 @@ 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 6cca7db7bf8..fb9254e0cd9 100644
+index 6cca7db7bf..fb9254e0cd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2558,7 +2558,7 @@

spark-k8s/stackable/patches/3.5.1/patchable.toml

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

spark-k8s/stackable/patches/3.5.2/001-cyclonedx-plugin.patch renamed to spark-k8s/stackable/patches/3.5.2/0001-Update-CycloneDX-plugin.patch

@@ -1,5 +1,15 @@
+From 2f95ba96e5894cfd07eca25aef5968e6a6d543fd Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <[email protected]>
+Date: Fri, 6 Sep 2024 17:53:52 +0200
+Subject: Update CycloneDX plugin
+
+---
+ dev/make-distribution.sh | 1 -
+ pom.xml                  | 7 ++++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
 diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
-index ef7c010..0f4c1c7 100755
+index ef7c010e930..0f4c1c74e40 100755
 --- a/dev/make-distribution.sh
 +++ b/dev/make-distribution.sh
 @@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \
@@ -11,10 +21,10 @@ index ef7c010..0f4c1c7 100755
 
  # Actually build the jar
 diff --git a/pom.xml b/pom.xml
-index 0f504db..6cca7db 100644
+index 8fe98c35846..36a800162da 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3482,7 +3482,12 @@
+@@ -3513,7 +3513,12 @@
        <plugin>
          <groupId>org.cyclonedx</groupId>
          <artifactId>cyclonedx-maven-plugin</artifactId>

spark-k8s/stackable/patches/3.5.2/patchable.toml

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