diff --git a/CHANGELOG.md b/CHANGELOG.md index e1996c752..b18686a8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,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 3.9.2 ([#1093]). [#1025]: https://github.com/stackabletech/docker-images/pull/1025 [#1027]: https://github.com/stackabletech/docker-images/pull/1027 @@ -83,6 +84,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 [#1097]: https://github.com/stackabletech/docker-images/pull/1097 [#1098]: https://github.com/stackabletech/docker-images/pull/1098 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 067e9d3f9..d38b73b96 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.2.0", - }, { "product": "3.9.3", "java-base": "17",