Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 1.1.3 snapshot version of Omid to allow scanning and importing into SecObserve #1033

Merged
merged 4 commits into from
Mar 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.

### 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]).
Expand Down
Original file line number Diff line number Diff line change
@@ -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>

2 changes: 2 additions & 0 deletions omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
upstream = "https://github.com/apache/phoenix-omid.git"
base = "c3e4da626fdb27060fd139a809e057965e52d163"
6 changes: 6 additions & 0 deletions omid/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
]