From 2581114e55211f57f8eb1eaaa6cc5790a4e1cc66 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Wed, 22 Jul 2026 16:39:48 +0200 Subject: [PATCH] chore: Remove Omid 1.1.2 which we forgot to remove earlier --- CHANGELOG.md | 6 +++ omid/boil-config.toml | 7 ---- .../1.1.2/0001-Add-CycloneDX-plugin.patch | 37 ------------------- omid/stackable/patches/1.1.2/patchable.toml | 2 - 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 omid/stackable/patches/1.1.2/0001-Add-CycloneDX-plugin.patch delete mode 100644 omid/stackable/patches/1.1.2/patchable.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index aebc81854..961f1b29c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Removed + +- omid: remove 1.1.2 ([#1593]). + +[#1593]: https://github.com/stackabletech/docker-images/pull/1593 + ## [26.7.0] - 2026-07-21 ## [26.7.0-rc2] - 2026-07-20 diff --git a/omid/boil-config.toml b/omid/boil-config.toml index 6989cfe86..c71f5ce48 100644 --- a/omid/boil-config.toml +++ b/omid/boil-config.toml @@ -1,13 +1,6 @@ [metadata.registries] "oci.stackable.tech" = { namespace = "sdp" } -[versions."1.1.2".local-images] -java-base = "11" -java-devel = "11" - -[versions."1.1.2".build-arguments] -jmx-exporter-version = "1.3.0" - [versions."1.1.3".local-images] java-base = "11" java-devel = "11" diff --git a/omid/stackable/patches/1.1.2/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.2/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 91b47f135..000000000 --- a/omid/stackable/patches/1.1.2/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 673d11cdf641c71c1d62b692ad68b37c894d4956 Mon Sep 17 00:00:00 2001 -From: Lukas Voetmand -Date: Sun, 8 Sep 2024 15:50:23 +0200 -Subject: Add CycloneDX plugin - ---- - pom.xml | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/pom.xml b/pom.xml -index eeaf883cd..3a6281219 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -563,6 +563,23 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ package -+ -+ makeBom -+ -+ -+ -+ - - - diff --git a/omid/stackable/patches/1.1.2/patchable.toml b/omid/stackable/patches/1.1.2/patchable.toml deleted file mode 100644 index 418cf0637..000000000 --- a/omid/stackable/patches/1.1.2/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "88812c9e127063f3b3016262f81ea3e8b48ec157" -mirror = "https://github.com/stackabletech/phoenix-omid.git"