diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cad322f1..e053f2d0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ All notable changes to this project will be documented in this file. `check-permissions-ownership.sh` provided in stackable-base image ([#1043]). - java: Add JDK 24 ([#1097]). - ci: Add golang image to mirror workflow ([#1103]). +- omid: bump version to 1.1.3 ([#1105]) - hbase: add 2.6.2 and upgrade dependencies ([#1101]) ### Changed @@ -85,6 +86,7 @@ All notable changes to this project will be documented in this file. - hadoop: Remove `3.3.4` and `3.4.0` ([#1099]). - opa: Remove `0.67.1` ([#1103]). - opa: Remove legacy bundle-builder from container build ([#1103]). +- omid: Remove 1.1.3-SNAPSHOT ([#1105]). - hbase: Remove 2.4.18 ([#1101]) - druid: Remove `30.0.0` ([#1110]). - nifi: Remove `2.2.0` ([#1114]). @@ -119,6 +121,7 @@ All notable changes to this project will be documented in this file. [#1101]: https://github.com/stackabletech/docker-images/pull/1101 [#1102]: https://github.com/stackabletech/docker-images/pull/1102 [#1103]: https://github.com/stackabletech/docker-images/pull/1103 +[#1105]: https://github.com/stackabletech/docker-images/pull/1105 [#1106]: https://github.com/stackabletech/docker-images/pull/1106 [#1107]: https://github.com/stackabletech/docker-images/pull/1107 [#1108]: https://github.com/stackabletech/docker-images/pull/1108 diff --git a/omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index a5d55124a..000000000 --- a/omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c0faa62430ebcb80b0c2dba2acfbbe072e246ad4 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 | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/pom.xml b/pom.xml -index b7f4e4755..1b6a2825a 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -458,6 +458,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ package -+ -+ makeBom -+ -+ -+ -+ -+ - - - diff --git a/omid/stackable/patches/1.1.0/patchable.toml b/omid/stackable/patches/1.1.0/patchable.toml deleted file mode 100644 index 9fc718c99..000000000 --- a/omid/stackable/patches/1.1.0/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "3b9e16b7537adbc90a7403507fb8aabd8d1fab0c" -mirror = "https://github.com/stackabletech/phoenix-omid.git" diff --git a/omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch deleted file mode 100644 index 39e49bf61..000000000 --- a/omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 058c598a2729a9f16a5229b9e50ebb6734ede082 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 | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/pom.xml b/pom.xml -index f9dc9e602..f2ab95317 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -498,6 +498,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ package -+ -+ makeBom -+ -+ -+ -+ -+ - - - diff --git a/omid/stackable/patches/1.1.1/patchable.toml b/omid/stackable/patches/1.1.1/patchable.toml deleted file mode 100644 index 5f9cf06a6..000000000 --- a/omid/stackable/patches/1.1.1/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -base = "cd546d58d93f380fec9bf65dbfa618f53493f662" -mirror = "https://github.com/stackabletech/phoenix-omid.git" diff --git a/omid/stackable/patches/1.1.3-SNAPSHOT/0001-Add-CycloneDX-plugin.patch b/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch similarity index 91% rename from omid/stackable/patches/1.1.3-SNAPSHOT/0001-Add-CycloneDX-plugin.patch rename to omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch index efe0481ee..95612913c 100644 --- a/omid/stackable/patches/1.1.3-SNAPSHOT/0001-Add-CycloneDX-plugin.patch +++ b/omid/stackable/patches/1.1.3/0001-Add-CycloneDX-plugin.patch @@ -1,4 +1,4 @@ -From 1296e08c2d202b6b6a4efc5da8670ecd07c7a66c Mon Sep 17 00:00:00 2001 +From 92704fc8ae1615d6b4fb6958c08d691089f21186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Tue, 18 Mar 2025 21:37:35 +0100 Subject: Add CycloneDX plugin @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml -index 9656bdbe..7a2b114f 100644 +index a63c2505..51555d30 100644 --- a/pom.xml +++ b/pom.xml @@ -556,6 +556,23 @@ diff --git a/omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml b/omid/stackable/patches/1.1.3/patchable.toml similarity index 54% rename from omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml rename to omid/stackable/patches/1.1.3/patchable.toml index b69b3f86c..820a8dd97 100644 --- a/omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml +++ b/omid/stackable/patches/1.1.3/patchable.toml @@ -1,2 +1,2 @@ -base = "c3e4da626fdb27060fd139a809e057965e52d163" +base = "eb686f11f67e21d1a76361003c14135d97367691" mirror = "https://github.com/stackabletech/phoenix-omid.git" diff --git a/omid/versions.py b/omid/versions.py index 6ae6947b5..294432d52 100644 --- a/omid/versions.py +++ b/omid/versions.py @@ -6,7 +6,7 @@ "jmx_exporter": "1.2.0", }, { - "product": "1.1.3-SNAPSHOT", + "product": "1.1.3", "java-base": "11", "java-devel": "11", "jmx_exporter": "1.2.0",