From e5c9cb30f1ec1d87e039bc271d18d1a0c82f03b1 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 16:20:11 +0200 Subject: [PATCH 1/4] chore: Changelog formatting --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c45bb7a26..2dda8f892 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,8 +35,8 @@ All notable changes to this project will be documented in this file. ### Changed - ubi-rust-builder: Bump Rust toolchain to 1.85.0, cargo-cyclonedx to 0.5.7, and cargo-auditable to 0.6.6 ([#1050]). -- spark-k8s: Include spark-connect jars. Replace OpenJDK with Temurin JDK. Cleanup. ([#1034]) -- spark-connect-client: Image is now completely based on spark-k8s and includes JupyterLab and other demo dependencies ([#1071]) +- spark-k8s: Include spark-connect jars. Replace OpenJDK with Temurin JDK. Cleanup ([#1034]). +- spark-connect-client: Image is now completely based on spark-k8s and includes JupyterLab and other demo dependencies ([#1071]). ### Fixed From f3d0b6f2f072dfea3e145b2828f1328102a956a4 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 16:22:47 +0200 Subject: [PATCH 2/4] chore(zookeeper): Remove 2.9.2 --- zookeeper/stackable/patches/3.9.2/.gitkeep | 0 .../3.9.2/0001-Add-CycloneDX-plugin.patch | 34 ------------------- .../stackable/patches/3.9.2/patchable.toml | 2 -- zookeeper/versions.py | 10 ------ 4 files changed, 46 deletions(-) delete mode 100644 zookeeper/stackable/patches/3.9.2/.gitkeep delete mode 100644 zookeeper/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch delete mode 100644 zookeeper/stackable/patches/3.9.2/patchable.toml diff --git a/zookeeper/stackable/patches/3.9.2/.gitkeep b/zookeeper/stackable/patches/3.9.2/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/zookeeper/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch b/zookeeper/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index a37700a52..000000000 --- a/zookeeper/stackable/patches/3.9.2/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0ac6dd909cbcb2d6d16ec7120ad65d5874ea0e8e Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Fri, 6 Sep 2024 17:53:52 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pom.xml b/pom.xml -index 743b87f7..3873e403 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.2/patchable.toml b/zookeeper/stackable/patches/3.9.2/patchable.toml deleted file mode 100644 index f3ebf6062..000000000 --- a/zookeeper/stackable/patches/3.9.2/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -upstream = "https://github.com/apache/zookeeper.git" -base = "e454e8c7283100c7caec6dcae2bc82aaecb63023" diff --git a/zookeeper/versions.py b/zookeeper/versions.py index f7b7387fd..c0b1e2324 100644 --- a/zookeeper/versions.py +++ b/zookeeper/versions.py @@ -1,14 +1,4 @@ versions = [ - { - "product": "3.9.2", - "java-base": "17", - # NOTE (@NickLarsenNZ): Builds fail on Java 17, with the output: - # [ERROR] Failed to execute goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs (spotbugs) on project - # zookeeper: Execution spotbugs of goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs failed: Java - # returned: 1 -> [Help 1] - "java-devel": "11", - "jmx_exporter": "1.1.0", - }, { "product": "3.9.3", "java-base": "17", From 2f780dbdb8c88849c6e8d2634a2a512fc0e425ff Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 16:27:03 +0200 Subject: [PATCH 3/4] chore: Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5b6ce61b..69e0d3a17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ All notable changes to this project will be documented in this file. - ci: Remove Nexus steps from build, mirror and release workflows ([#1056]). Also remove the old release workflow. +- zookeeper: Remove 2.9.2 ([#1093]). [#1025]: https://github.com/stackabletech/docker-images/pull/1025 [#1027]: https://github.com/stackabletech/docker-images/pull/1027 @@ -81,6 +82,7 @@ All notable changes to this project will be documented in this file. [#1055]: https://github.com/stackabletech/docker-images/pull/1055 [#1056]: https://github.com/stackabletech/docker-images/pull/1056 [#1090]: https://github.com/stackabletech/docker-images/pull/1090 +[#1093]: https://github.com/stackabletech/docker-images/pull/1093 ## [25.3.0] - 2025-03-21 From 2916cf1bf7d13da4f24a2554d208496bf6983b40 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 16:59:34 +0200 Subject: [PATCH 4/4] chore: Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69e0d3a17..128a161f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,7 +61,7 @@ All notable changes to this project will be documented in this file. - ci: Remove Nexus steps from build, mirror and release workflows ([#1056]). Also remove the old release workflow. -- zookeeper: Remove 2.9.2 ([#1093]). +- zookeeper: Remove 3.9.2 ([#1093]). [#1025]: https://github.com/stackabletech/docker-images/pull/1025 [#1027]: https://github.com/stackabletech/docker-images/pull/1027