From 1700775c5ee97da7730b1ce7f9880f2636e92056 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 7 May 2025 13:45:50 +0200 Subject: [PATCH 1/2] chore(omid): bump to version 1.1.3 --- .../1.1.0/0001-Add-CycloneDX-plugin.patch | 38 ------------------- omid/stackable/patches/1.1.0/patchable.toml | 2 - .../1.1.1/0001-Add-CycloneDX-plugin.patch | 38 ------------------- omid/stackable/patches/1.1.1/patchable.toml | 2 - .../0001-Add-CycloneDX-plugin.patch | 4 +- .../{1.1.3-SNAPSHOT => 1.1.3}/patchable.toml | 2 +- omid/versions.py | 2 +- 7 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 omid/stackable/patches/1.1.0/0001-Add-CycloneDX-plugin.patch delete mode 100644 omid/stackable/patches/1.1.0/patchable.toml delete mode 100644 omid/stackable/patches/1.1.1/0001-Add-CycloneDX-plugin.patch delete mode 100644 omid/stackable/patches/1.1.1/patchable.toml rename omid/stackable/patches/{1.1.3-SNAPSHOT => 1.1.3}/0001-Add-CycloneDX-plugin.patch (91%) rename omid/stackable/patches/{1.1.3-SNAPSHOT => 1.1.3}/patchable.toml (52%) 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 7441631bd..000000000 --- a/omid/stackable/patches/1.1.0/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -upstream = "https://github.com/apache/phoenix-omid.git" -base = "3b9e16b7537adbc90a7403507fb8aabd8d1fab0c" 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 00d6fd49f..000000000 --- a/omid/stackable/patches/1.1.1/patchable.toml +++ /dev/null @@ -1,2 +0,0 @@ -upstream = "https://github.com/apache/phoenix-omid.git" -base = "cd546d58d93f380fec9bf65dbfa618f53493f662" 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 52% rename from omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml rename to omid/stackable/patches/1.1.3/patchable.toml index 656044995..d55cd0ad8 100644 --- a/omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml +++ b/omid/stackable/patches/1.1.3/patchable.toml @@ -1,2 +1,2 @@ upstream = "https://github.com/apache/phoenix-omid.git" -base = "c3e4da626fdb27060fd139a809e057965e52d163" +base = "eb686f11f67e21d1a76361003c14135d97367691" 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", From 3358c70fbe812c8deb198be07d5315185b8c1496 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 7 May 2025 13:49:56 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af84216e0..2ecfb52ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,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]) ### Changed @@ -73,6 +74,7 @@ All notable changes to this project will be documented in this file. - Remove ubi8-rust-builder image ([#1091]). - opa: Remove `0.67.1` ([#1103]). - opa: Remove legacy bundle-builder from container build ([#1103]). +- omid: Remove 1.1.3-SNAPSHOT ([#1105]). [#1025]: https://github.com/stackabletech/docker-images/pull/1025 [#1027]: https://github.com/stackabletech/docker-images/pull/1027 @@ -99,6 +101,7 @@ All notable changes to this project will be documented in this file. [#1098]: https://github.com/stackabletech/docker-images/pull/1098 [#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 ## [25.3.0] - 2025-03-21