diff --git a/spark-connect-client/boil-config.toml b/spark-connect-client/boil-config.toml index 4083bd8cd..c0cfddf69 100644 --- a/spark-connect-client/boil-config.toml +++ b/spark-connect-client/boil-config.toml @@ -12,9 +12,9 @@ java-base = "17" [versions."3.5.7".build-arguments] python-version = "3.11" -[versions."4.0.0".local-images] -spark-k8s = "4.0.0" +[versions."4.0.1".local-images] +spark-k8s = "4.0.1" java-base = "17" -[versions."4.0.0".build-arguments] +[versions."4.0.1".build-arguments] python-version = "3.11" diff --git a/spark-k8s/boil-config.toml b/spark-k8s/boil-config.toml index 8b2cb468e..a11731ba3 100644 --- a/spark-k8s/boil-config.toml +++ b/spark-k8s/boil-config.toml @@ -36,14 +36,14 @@ jmx-exporter-version = "1.3.0" tini-version = "0.19.0" hbase-connector-version = "1.0.1" -[versions."4.0.0".local-images] +[versions."4.0.1".local-images] "hadoop/hadoop" = "3.4.1" java-base = "17" java-devel = "17" hbase = "2.6.2" vector = "0.49.0" -[versions."4.0.0".build-arguments] +[versions."4.0.1".build-arguments] python-version = "3.11" aws-java-sdk-bundle-version = "2.24.6" azure-storage-version = "7.0.1" # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.3.4 diff --git a/spark-k8s/stackable/patches/4.0.0/0001-Update-CycloneDX-plugin.patch b/spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch similarity index 88% rename from spark-k8s/stackable/patches/4.0.0/0001-Update-CycloneDX-plugin.patch rename to spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch index db7b12530..863f280c6 100644 --- a/spark-k8s/stackable/patches/4.0.0/0001-Update-CycloneDX-plugin.patch +++ b/spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch @@ -1,4 +1,4 @@ -From 2da5608928018dd017c91b904eb8f84a4f6df78a Mon Sep 17 00:00:00 2001 +From b5de94e20aff25a394c6095c0649b4fcbaa941aa Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Fri, 4 Jul 2025 15:54:55 +0200 Subject: Update CycloneDX plugin @@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh -index 16607e45ae..44e345a245 100755 +index 16607e45ae6..44e345a245d 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -176,7 +176,6 @@ BUILD_COMMAND=("$MVN" clean package \ @@ -21,7 +21,7 @@ index 16607e45ae..44e345a245 100755 # Actually build the jar diff --git a/pom.xml b/pom.xml -index 443d46a430..632920f100 100644 +index 22922143fc3..59c3747c625 100644 --- a/pom.xml +++ b/pom.xml @@ -3327,6 +3327,11 @@ diff --git a/spark-k8s/stackable/patches/4.0.0/patchable.toml b/spark-k8s/stackable/patches/4.0.1/patchable.toml similarity index 51% rename from spark-k8s/stackable/patches/4.0.0/patchable.toml rename to spark-k8s/stackable/patches/4.0.1/patchable.toml index 24d7204e9..bd074097c 100644 --- a/spark-k8s/stackable/patches/4.0.0/patchable.toml +++ b/spark-k8s/stackable/patches/4.0.1/patchable.toml @@ -1,2 +1,2 @@ -base = "fa33ea000a0bda9e5a3fa1af98e8e85b8cc5e4d4" +base = "29434ea766b0fc3c3bf6eaadb43a8f931133649e" mirror = "https://github.com/stackabletech/spark.git"