diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eee8175f..101ab87e9 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]). @@ -54,7 +55,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 @@ -69,6 +71,7 @@ All notable changes to this project will be documented in this file. [#1635]: https://github.com/stackabletech/docker-images/pull/1635 [#1638]: https://github.com/stackabletech/docker-images/pull/1638 [#1641]: https://github.com/stackabletech/docker-images/pull/1641 +[#1662]: https://github.com/stackabletech/docker-images/pull/1662 ## [26.7.0] - 2026-07-21 diff --git a/zookeeper/boil-config.toml b/zookeeper/boil-config.toml index 680d4bae8..e6db91e18 100644 --- a/zookeeper/boil-config.toml +++ b/zookeeper/boil-config.toml @@ -1,19 +1,17 @@ [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] +[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.4/0001-Add-CycloneDX-plugin.patch b/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch similarity index 86% rename from zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch rename to zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch index 0bd6070fc..b8116c0a4 100644 --- a/zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch +++ b/zookeeper/stackable/patches/3.9.6/0001-Add-CycloneDX-plugin.patch @@ -1,4 +1,4 @@ -From 24644dd2f8463f972965d14021a7b071d8feaf81 Mon Sep 17 00:00:00 2001 +From e54aa44d6224d8c4f8f4073855d1fae98f9c6c03 Mon Sep 17 00:00:00 2001 From: xeniape Date: Tue, 30 Sep 2025 15:24:05 +0200 Subject: Add CycloneDX plugin @@ -8,10 +8,10 @@ Subject: Add CycloneDX plugin 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index 860ffb97..5355571a 100644 +index 58ba43b4..efdb3be9 100644 --- a/pom.xml +++ b/pom.xml -@@ -925,7 +925,7 @@ +@@ -926,7 +926,7 @@ org.cyclonedx cyclonedx-maven-plugin @@ -20,7 +20,7 @@ index 860ffb97..5355571a 100644 -@@ -1200,6 +1200,11 @@ +@@ -1201,6 +1201,11 @@ org.cyclonedx cyclonedx-maven-plugin diff --git a/zookeeper/stackable/patches/3.9.4/patchable.toml b/zookeeper/stackable/patches/3.9.6/patchable.toml similarity index 53% rename from zookeeper/stackable/patches/3.9.4/patchable.toml rename to zookeeper/stackable/patches/3.9.6/patchable.toml index 2099babb5..7f2da30df 100644 --- a/zookeeper/stackable/patches/3.9.4/patchable.toml +++ b/zookeeper/stackable/patches/3.9.6/patchable.toml @@ -1,2 +1,2 @@ mirror = "https://github.com/stackabletech/zookeeper.git" -base = "7246445ec281f3dbf53dc54e970c914f39713903" +base = "a355171b081b5b60749db8f19cca1528b0df936f"