Merge branch 'main' of https://github.com/stackabletech/docker-images into feat/move-patch-apply-logic-to-patchable

Author: dervoeti

CHANGELOG.md

@@ -4,8 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [25.3.0] - 2025-03-21
+
 ### Added
 
+- omid: Added 1.1.3-SNAPSHOT to allow for easier scanning pre-release
 - airflow: Add OPA support to Airflow ([#978]).
 - nifi: Activate `include-hadoop` profile for NiFi version 2.* ([#958]).
 - nifi: Add NiFi hadoop Azure and GCP libraries ([#943]).

omid/stackable/patches/1.1.3-SNAPSHOT/0001-Add-CycloneDX-plugin.patch

@@ -0,0 +1,37 @@
+From 1296e08c2d202b6b6a4efc5da8670ecd07c7a66c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6nke=20Liebau?= <[email protected]>
+Date: Tue, 18 Mar 2025 21:37:35 +0100
+Subject: Add CycloneDX plugin
+
+---
+ pom.xml | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index 9656bdbe..7a2b114f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -556,6 +556,23 @@
+                    </excludes>
+                 </configuration>
+             </plugin>
++            <plugin>
++                <groupId>org.cyclonedx</groupId>
++                <artifactId>cyclonedx-maven-plugin</artifactId>
++                <version>2.8.0</version>
++                <configuration>
++                    <projectType>application</projectType>
++                    <schemaVersion>1.5</schemaVersion>
++                </configuration>
++                <executions>
++                    <execution>
++                        <phase>package</phase>
++                        <goals>
++                            <goal>makeBom</goal>
++                        </goals>
++                    </execution>
++                </executions>
++            </plugin>
+ 
+         </plugins>
+ 

omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml

@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/phoenix-omid.git"
+base = "c3e4da626fdb27060fd139a809e057965e52d163"

omid/versions.py

@@ -5,4 +5,10 @@
         "java-devel": "11",
         "jmx_exporter": "1.1.0",
     },
+    {
+        "product": "1.1.3-SNAPSHOT",
+        "java-base": "11",
+        "java-devel": "11",
+        "jmx_exporter": "1.1.0",
+    },
 ]