Convert omid to patchable

nightkr · nightkr · commit 8f619f5a20db · 2025-02-18T14:50:28.000+01:00
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
@@ -1,5 +1,14 @@
+From c0faa62430ebcb80b0c2dba2acfbbe072e246ad4 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+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 b7f4e47..1b6a282 100644
+index b7f4e4755..1b6a2825a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -458,6 +458,24 @@
diff --git a/omid/stackable/patches/1.1.0/patchable.toml b/omid/stackable/patches/1.1.0/patchable.toml
@@ -0,0 +1,2 @@
+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
@@ -1,5 +1,14 @@
+From 058c598a2729a9f16a5229b9e50ebb6734ede082 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+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 f9dc9e6..f2ab953 100644
+index f9dc9e602..f2ab95317 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -498,6 +498,24 @@
diff --git a/omid/stackable/patches/1.1.1/patchable.toml b/omid/stackable/patches/1.1.1/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/phoenix-omid.git"
+base = "cd546d58d93f380fec9bf65dbfa618f53493f662"
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
@@ -1,5 +1,14 @@
+From 673d11cdf641c71c1d62b692ad68b37c894d4956 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+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 eeaf883..3a62812 100644
+index eeaf883cd..3a6281219 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -563,6 +563,23 @@
diff --git a/omid/stackable/patches/1.1.2/patchable.toml b/omid/stackable/patches/1.1.2/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/phoenix-omid.git"
+base = "88812c9e127063f3b3016262f81ea3e8b48ec157"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+upstream = "https://github.com/apache/phoenix-omid.git"`
	`2`	`+base = "3b9e16b7537adbc90a7403507fb8aabd8d1fab0c"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+upstream = "https://github.com/apache/phoenix-omid.git"`
	`2`	`+base = "cd546d58d93f380fec9bf65dbfa618f53493f662"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+upstream = "https://github.com/apache/phoenix-omid.git"`
	`2`	`+base = "88812c9e127063f3b3016262f81ea3e8b48ec157"`