From c15305d6a55fdeb315f11afebb61e32774f414ca Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 16 Sep 2026 12:46:12 +0200 Subject: [PATCH 1/4] chore(zookeeper): Remove 3.9.4 --- zookeeper/boil-config.toml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/zookeeper/boil-config.toml b/zookeeper/boil-config.toml index 680d4bae8..3ec96703d 100644 --- a/zookeeper/boil-config.toml +++ b/zookeeper/boil-config.toml @@ -1,15 +1,6 @@ [metadata.registries] "oci.stackable.tech" = { namespace = "sdp" } -# Deprecated since 26.7.0 -[versions."3.9.4".local-images] -java-base = "17" -java-devel = "11" -"shared/logback" = "1.3.15" # https://github.com/apache/zookeeper/blob/release-3.9.4/pom.xml#L554 - -[versions."3.9.4".build-arguments] -jmx-exporter-version = "1.4.0" - [versions."3.9.5".local-images] java-base = "17" java-devel = "17" From aa94b15e8e83760c5531ed370901b08582a0b2f6 Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 16 Sep 2026 12:49:11 +0200 Subject: [PATCH 2/4] chore: Add changelog entry --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f70b55842..5195815d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,8 @@ All notable changes to this project will be documented in this file. ### Removed -- omid: remove 1.1.2 ([#1593]). +- zookeeper: Remove 3.9.4 ([#1662]). +- omid: Remove 1.1.2 ([#1593]). - ci: Remove SLSA build provenance generation for published image indexes ([#1596]). [#1593]: https://github.com/stackabletech/docker-images/pull/1593 @@ -66,6 +67,7 @@ All notable changes to this project will be documented in this file. [#1630]: https://github.com/stackabletech/docker-images/pull/1630 [#1635]: https://github.com/stackabletech/docker-images/pull/1635 [#1638]: https://github.com/stackabletech/docker-images/pull/1638 +[#1662]: https://github.com/stackabletech/docker-images/pull/1662 ## [26.7.0] - 2026-07-21 From bfa18228b5c02f9c4578a8232350e2c4a0150251 Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 16 Sep 2026 12:51:15 +0200 Subject: [PATCH 3/4] chore(zookeeper): Remove old 3.9.4 patches --- .../3.9.4/0001-Add-CycloneDX-plugin.patch | 34 ------------------- .../stackable/patches/3.9.4/patchable.toml | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch delete mode 100644 zookeeper/stackable/patches/3.9.4/patchable.toml diff --git a/zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch b/zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 0bd6070fc..000000000 --- a/zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 24644dd2f8463f972965d14021a7b071d8feaf81 Mon Sep 17 00:00:00 2001 -From: xeniape -Date: Tue, 30 Sep 2025 15:24:05 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pom.xml b/pom.xml -index 860ffb97..5355571a 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -925,7 +925,7 @@ - - org.cyclonedx - cyclonedx-maven-plugin -- 2.7.9 -+ 2.8.0 - - - -@@ -1200,6 +1200,11 @@ - - org.cyclonedx - cyclonedx-maven-plugin -+ -+ application -+ 1.5 -+ false -+ - - - diff --git a/zookeeper/stackable/patches/3.9.4/patchable.toml b/zookeeper/stackable/patches/3.9.4/patchable.toml deleted file mode 100644 index 2099babb5..000000000 --- a/zookeeper/stackable/patches/3.9.4/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -mirror = "https://github.com/stackabletech/zookeeper.git" -base = "7246445ec281f3dbf53dc54e970c914f39713903" From 3d11fdf72ac72e9c8b999c17d6c685e1899bdbcb Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 16 Sep 2026 13:49:43 +0200 Subject: [PATCH 4/4] feat(zookeeper): Add 3.9.6 --- CHANGELOG.md | 1 + zookeeper/boil-config.toml | 11 ++++-- .../3.9.6/0001-Add-CycloneDX-plugin.patch | 34 +++++++++++++++++++ .../stackable/patches/3.9.6/patchable.toml | 2 ++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch create mode 100644 zookeeper/stackable/patches/3.9.6/patchable.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index 5195815d9..49707442f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ### Added +- zookeeper: Add 3.9.6 ([#1662]). - airflow, superset, druid, nifi: Add SBOMs for the frontend (npm) dependencies ([#1600]). - nifi: Backport NIFI-15958 to log periodic progress while waiting for the content archive scan and provenance re-index, for `2.6.0`, `2.7.2`, and `2.9.0` ([#1611]). - hbase: Add an SBOM for the web UI (npm) dependencies, which are unpacked from webjars and therefore not covered by the CycloneDX Maven plugin ([#1620]). diff --git a/zookeeper/boil-config.toml b/zookeeper/boil-config.toml index 3ec96703d..e6db91e18 100644 --- a/zookeeper/boil-config.toml +++ b/zookeeper/boil-config.toml @@ -1,10 +1,17 @@ [metadata.registries] "oci.stackable.tech" = { namespace = "sdp" } +[build-arguments] +jmx-exporter-version = "1.4.0" + +# Deprecated in 26.11.0 [versions."3.9.5".local-images] java-base = "17" java-devel = "17" "shared/logback" = "1.3.15" # https://github.com/apache/zookeeper/blob/release-3.9.5/pom.xml#L554 -[versions."3.9.5".build-arguments] -jmx-exporter-version = "1.4.0" +# LTS since 26.11.0 +[versions."3.9.6".local-images] +java-base = "17" +java-devel = "17" +"shared/logback" = "1.3.15" # https://github.com/apache/zookeeper/blob/release-3.9.6/pom.xml#L554 diff --git a/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch b/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch new file mode 100644 index 000000000..b8116c0a4 --- /dev/null +++ b/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch @@ -0,0 +1,34 @@ +From e54aa44d6224d8c4f8f4073855d1fae98f9c6c03 Mon Sep 17 00:00:00 2001 +From: xeniape +Date: Tue, 30 Sep 2025 15:24:05 +0200 +Subject: Add CycloneDX plugin + +--- + pom.xml | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/pom.xml b/pom.xml +index 58ba43b4..efdb3be9 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -926,7 +926,7 @@ + + org.cyclonedx + cyclonedx-maven-plugin +- 2.7.9 ++ 2.8.0 + + + +@@ -1201,6 +1201,11 @@ + + org.cyclonedx + cyclonedx-maven-plugin ++ ++ application ++ 1.5 ++ false ++ + + + diff --git a/zookeeper/stackable/patches/3.9.6/patchable.toml b/zookeeper/stackable/patches/3.9.6/patchable.toml new file mode 100644 index 000000000..7f2da30df --- /dev/null +++ b/zookeeper/stackable/patches/3.9.6/patchable.toml @@ -0,0 +1,2 @@ +mirror = "https://github.com/stackabletech/zookeeper.git" +base = "a355171b081b5b60749db8f19cca1528b0df936f"