chore: Merge branch 'main' into fix/boil-default-registry

Author: Techassi

CHANGELOG.md

@@ -20,6 +20,9 @@ All notable changes to this project will be documented in this file.
 - opa: Add `1.8.0` ([#1279]).
 - 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]).
 
 ### Changed
 
@@ -42,7 +45,9 @@ All notable changes to this project will be documented in this file.
 - opa: Remove `1.0.1` ([#1279]).
 - spark: Remove `3.5.5` ([#1280]).
 - spark-connect-client: Remove unused example script from the image ([#1280]).
-- kafka: Remove `3.9.0` ([#1283]). 
+- kafka: Remove `3.9.0` ([#1283]).
+- spark: Remove `4.0.0` ([#1286]).
+- spark-connect-client: Remove `4.0.0` ([#1286]).
 
 [#1207]: https://github.com/stackabletech/docker-images/pull/1207
 [#1215]: https://github.com/stackabletech/docker-images/pull/1215
@@ -63,6 +68,9 @@ 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
+[#1286]: https://github.com/stackabletech/docker-images/pull/1286
 
 ## [25.7.0] - 2025-07-23
 

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

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 <[email protected]>
 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 @@

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"

superset/README.md

@@ -2,6 +2,8 @@
 
 ## Constraints
 
-The `constraints-<version>.txt` files come from e.g. <https://github.com/apache/superset/blob/2.0.1/requirements/base.txt> and are concatenated with the dependencies provided in <https://github.com/apache/superset/blob/2.0.1/requirements/docker.txt>. This differs from version to version (2.0.1 shown here).
+The `constraints-<version>.txt` files come from e.g. <https://github.com/apache/superset/blob/x.y.z/requirements/base.txt> and are concatenated with the dependencies provided in <https://github.com/apache/superset/blob/x.y.z/requirements/docker.txt>, where that file exists (i.e. <4.1.0). This differs from version to version (4.1.4 shown here):
 
-In some cases `apispec[yaml]==3.3.2` needed to be adjusted to `apispec==3.3.2` due to `ERROR: Constraints cannot have extras`.
+In some cases `apispec[yaml]==6.3.0` needed to be adjusted to `apispec==6.3.0` due to `ERROR: Constraints cannot have extras`.
+
+If the constraints file contains an `-e file:.` directive, this can be commented out as we are install Superset using uv from PyPI and do not need to edit it subsequently.

superset/boil-config.toml

@@ -10,25 +10,24 @@ authlib-version = "1.2.1"
 python-version = "3.9"
 uv-version = "0.7.3"
 
-[versions."4.1.1".local-images]
+[versions."4.1.2".local-images]
 "shared/statsd-exporter" = "0.28.0"
 stackable-base = "1.0.0"
 vector = "0.49.0"
 
-[versions."4.1.1".build-arguments]
+[versions."4.1.2".build-arguments]
 cyclonedx-bom-version = "6.0.0"
 # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
 authlib-version = "1.2.1"
-# 3.11 support was merged in January 2025 (two months after 4.1.1 release), 3.10 is not available in our UBI image, so we need to stay on 3.9 for now
 python-version = "3.9"
 uv-version = "0.7.3"
 
-[versions."4.1.2".local-images]
+[versions."4.1.4".local-images]
 "shared/statsd-exporter" = "0.28.0"
 stackable-base = "1.0.0"
 vector = "0.49.0"
 
-[versions."4.1.2".build-arguments]
+[versions."4.1.4".build-arguments]
 cyclonedx-bom-version = "6.0.0"
 # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
 authlib-version = "1.2.1"

superset/stackable/constraints/4.1.1/build-constraints.txt renamed to superset/stackable/constraints/4.1.4/build-constraints.txt

@@ -1,4 +1,6 @@
-# from https://raw.githubusercontent.com/apache/superset/refs/tags/4.1.1/requirements/base.txt
+# from https://raw.githubusercontent.com/apache/superset/refs/tags/4.1.4/requirements/base.txt
+#-e file:.
+#    # via -r requirements/base.in
 alembic==1.13.1
     # via flask-migrate
 amqp==5.2.0
@@ -139,6 +141,8 @@ greenlet==3.0.3
     # via shillelagh
 gunicorn==22.0.0
     # via apache-superset
+h11==0.16.0
+    # via wsproto
 hashids==1.3.1
     # via apache-superset
 holidays==0.25
@@ -338,7 +342,7 @@ sqlalchemy-utils==0.38.3
     # via
     #   apache-superset
     #   flask-appbuilder
-sqlglot==25.24.0
+sqlglot==26.11.1
     # via apache-superset
 sqlparse==0.5.0
     # via apache-superset