chore: Merge branch 'main' into chore/bump-trino-version-for-25.11.0

Author: Techassi

CHANGELOG.md

@@ -21,6 +21,8 @@ All notable changes to this project will be documented in this file.
 - spark: Add `3.5.7` ([#1280]).
 - spark-connect-client: Add `3.5.7` ([#1280]).
 - superset: Add `4.1.4`  ([#1284]).
+- spark: Add `4.0.1` ([#1286]).
+- spark-connect-client: Add `4.0.1` ([#1286]).
 - trino/trino-storage-connector: Add `477` ([#1285]).
 
 ### Changed
@@ -46,6 +48,8 @@ All notable changes to this project will be documented in this file.
 - spark: Remove `3.5.5` ([#1280]).
 - spark-connect-client: Remove unused example script from the image ([#1280]).
 - kafka: Remove `3.9.0` ([#1283]).
+- spark: Remove `4.0.0` ([#1286]).
+- spark-connect-client: Remove `4.0.0` ([#1286]).
 - trino/trino-storage-conector: Remove `470` ([#1285]).
 
 [#1207]: https://github.com/stackabletech/docker-images/pull/1207
@@ -67,8 +71,10 @@ All notable changes to this project will be documented in this file.
 [#1278]: https://github.com/stackabletech/docker-images/pull/1278
 [#1279]: https://github.com/stackabletech/docker-images/pull/1279
 [#1283]: https://github.com/stackabletech/docker-images/pull/1283
+[#1280]: https://github.com/stackabletech/docker-images/pull/1280
 [#1284]: https://github.com/stackabletech/docker-images/pull/1284
 [#1285]: https://github.com/stackabletech/docker-images/pull/1285
+[#1286]: https://github.com/stackabletech/docker-images/pull/1286
 
 ## [25.7.0] - 2025-07-23
 

rust/boil/src/build/cli.rs

@@ -47,7 +47,7 @@ pub struct BuildArguments {
     /// The format is host[:port].
     #[arg(
         short, long,
-        default_value_t = HostPort::localhost(),
+        default_value_t = Self::default_registry(),
         value_hint = ValueHint::Hostname,
         help_heading = "Registry Options"
     )]
@@ -125,6 +125,13 @@ impl BuildArguments {
         "0.0.0-dev".parse().expect("must be a valid SemVer")
     }
 
+    fn default_registry() -> HostPort {
+        HostPort {
+            host: Host::Domain(String::from("oci.stackable.tech")),
+            port: None,
+        }
+    }
+
     // TODO: Auto-detect this
     fn default_architecture() -> TargetPlatform {
         TargetPlatform::Linux(Architecture::Amd64)

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"

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

…4.0.0/0001-Update-CycloneDX-plugin.patch …4.0.1/0001-Update-CycloneDX-plugin.patchspark-k8s/stackable/patches/4.0.0/0001-Update-CycloneDX-plugin.patch renamed to spark-k8s/stackable/patches/4.0.1/0001-Update-CycloneDX-plugin.patch spark-k8s/stackable/patches/4.0.0/0001-Update-CycloneDX-plugin.patch renamed to 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 @@

…s/stackable/patches/4.0.0/patchable.toml …s/stackable/patches/4.0.1/patchable.tomlspark-k8s/stackable/patches/4.0.0/patchable.toml renamed to spark-k8s/stackable/patches/4.0.1/patchable.toml spark-k8s/stackable/patches/4.0.0/patchable.toml renamed to spark-k8s/stackable/patches/4.0.1/patchable.toml

@@ -1,2 +1,2 @@
-base = "fa33ea000a0bda9e5a3fa1af98e8e85b8cc5e4d4"
+base = "29434ea766b0fc3c3bf6eaadb43a8f931133649e"
 mirror = "https://github.com/stackabletech/spark.git"