From 3ccb10aeb5fc1eea1d25680924af1eb11c0443c4 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 1 Oct 2025 09:55:36 +0200 Subject: [PATCH 1/4] chore(zookeeper): Update image for 25.11.0 --- zookeeper/boil-config.toml | 9 ++++- .../3.9.4/0001-Add-CycloneDX-plugin.patch | 34 +++++++++++++++++++ .../stackable/patches/3.9.4/patchable.toml | 2 ++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch create mode 100644 zookeeper/stackable/patches/3.9.4/patchable.toml diff --git a/zookeeper/boil-config.toml b/zookeeper/boil-config.toml index 64ab0416d..6c1fb792c 100644 --- a/zookeeper/boil-config.toml +++ b/zookeeper/boil-config.toml @@ -3,4 +3,11 @@ java-base = "17" java-devel = "11" [versions."3.9.3".build-arguments] -jmx-exporter-version = "1.3.0" +jmx-exporter-version = "1.4.0" + +[versions."3.9.4".local-images] +java-base = "17" +java-devel = "11" + +[versions."3.9.4".build-arguments] +jmx-exporter-version = "1.4.0" \ No newline at end of file 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 new file mode 100644 index 000000000..0bd6070fc --- /dev/null +++ b/zookeeper/stackable/patches/3.9.4/0001-Add-CycloneDX-plugin.patch @@ -0,0 +1,34 @@ +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 new file mode 100644 index 000000000..2099babb5 --- /dev/null +++ b/zookeeper/stackable/patches/3.9.4/patchable.toml @@ -0,0 +1,2 @@ +mirror = "https://github.com/stackabletech/zookeeper.git" +base = "7246445ec281f3dbf53dc54e970c914f39713903" From 79f5c73217763d113165e9bff574ce382cae687a Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 1 Oct 2025 09:59:10 +0200 Subject: [PATCH 2/4] add changelog entry --- CHANGELOG.md | 3 +++ zookeeper/boil-config.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 650a2a381..6205663b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file. - spark: Add `4.0.1` ([#1286]). - spark-connect-client: Add `4.0.1` ([#1286]). - trino/trino-storage-connector: Add `477` ([#1285]). +- zookeeper: Add `3.9.4` ([#1292]). ### Changed @@ -38,6 +39,7 @@ All notable changes to this project will be documented in this file. - opa: Deprecate `1.4.2` ([#1279]). - trino-cli: Bump to 477 ([#1285]). - tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]). +- zookeeper: Deprecate `3.9.3` ([#1292]). ### Removed @@ -77,6 +79,7 @@ All notable changes to this project will be documented in this file. [#1285]: https://github.com/stackabletech/docker-images/pull/1285 [#1286]: https://github.com/stackabletech/docker-images/pull/1286 [#1290]: https://github.com/stackabletech/docker-images/pull/1290 +[#1292]: https://github.com/stackabletech/docker-images/pull/1292 ## [25.7.0] - 2025-07-23 diff --git a/zookeeper/boil-config.toml b/zookeeper/boil-config.toml index 6c1fb792c..c4f43981b 100644 --- a/zookeeper/boil-config.toml +++ b/zookeeper/boil-config.toml @@ -10,4 +10,4 @@ java-base = "17" java-devel = "11" [versions."3.9.4".build-arguments] -jmx-exporter-version = "1.4.0" \ No newline at end of file +jmx-exporter-version = "1.4.0" From 4807ffe45d1db23c2b0aade4c544588762c600a0 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 1 Oct 2025 10:01:34 +0200 Subject: [PATCH 3/4] update issue template --- .github/ISSUE_TEMPLATE/update-product-zookeeper.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md index 6959a14df..14ee548e3 100644 --- a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md +++ b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md @@ -28,9 +28,11 @@ Add/Change/Remove anything that isn't applicable anymore ## Update tasks - [ ] Update `boil-config.toml` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions). -- [ ] Upload new version (see `zookeeper/upload_new_zookeeper_version.sh`). - [ ] Update `boil-config.toml` to the latest supported version of JVM (base and devel). - [ ] Update other dependencies if applicable (eg: jmx_exporter, etc). +- [ ] Initialize new product versions with patchable and add patches if applicable. +- [ ] Delete old patch directories. +- [ ] Check the corresponding operator (getting_started / kuttl / supported-versions) for usage of the versions. - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below. - [ ] Update the version in demos. Add the PR(s) to the list below. From ac4246dc72ef6d30b7eaaee1a62bc4b00ca9311f Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 1 Oct 2025 10:10:51 +0200 Subject: [PATCH 4/4] remove deprecation changelog entries --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15fe357b6..2a5866e03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,12 +36,9 @@ All notable changes to this project will be documented in this file. - stackable-devel: Bump ubi9 base image and update cargo-auditable to `0.7.0` ([#1253]). - vector: Bump to `0.49.0` ([#1258]). - airflow: Bump uvicorn dependency to `0.37.0` ([#1264]). -- druid: Deprecate `33.0.0` ([#1263]). -- opa: Deprecate `1.4.2` ([#1279]). - trino-cli: Bump to 477 ([#1285]). - tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]). - testing-tools: Update keycloak dependency to `26.3.5` and `python:3.12-slim-bullseye` base image ([#1289]). -- zookeeper: Deprecate `3.9.3` ([#1292]). ### Removed