Convert Trino to patchable

nightkr · nightkr · commit 2dd16f83717d · 2025-02-19T11:58:57.000+01:00
diff --git a/trino/stackable/patches/451/0001-Add-CycloneDX-plugin.patch b/trino/stackable/patches/451/0001-Add-CycloneDX-plugin.patch
@@ -1,5 +1,14 @@
+From cbad32c6095469bb7c15e45d3b740ee35db47253 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+Date: Fri, 6 Sep 2024 17:53:52 +0200
+Subject: Add CycloneDX plugin
+
+---
+ pom.xml | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
 diff --git a/pom.xml b/pom.xml
-index 1c13fda..ceabf34 100644
+index 1c13fdab898..ceabf345e96 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2642,6 +2642,25 @@
diff --git a/trino/stackable/patches/451/patchable.toml b/trino/stackable/patches/451/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/trinodb/trino.git"
+base = "2c974f7cb1d71e1f9f466941a317190a474fc432"
diff --git a/trino/stackable/patches/455/0001-Add-CycloneDX-plugin.patch b/trino/stackable/patches/455/0001-Add-CycloneDX-plugin.patch
@@ -1,5 +1,14 @@
+From c91df97de99bfaf1d1740374170d6cb53e24b0af Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+Date: Fri, 6 Sep 2024 17:53:52 +0200
+Subject: Add CycloneDX plugin
+
+---
+ pom.xml | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
 diff --git a/pom.xml b/pom.xml
-index 41ca158..f2ed3f5 100644
+index 41ca1580021..f2ed3f54f40 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2681,6 +2681,24 @@
diff --git a/trino/stackable/patches/455/patchable.toml b/trino/stackable/patches/455/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/trinodb/trino.git"
+base = "e212460ea0aa663f0de9b16fecd480c4ad6490cc"
diff --git a/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch b/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
@@ -1,14 +1,14 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Larsen <nick.larsen@stackable.tech>
-Date: Mon, 10 Feb 2025 12:16:43 +0100
-Subject: Add cyclonedx plugin
+From 88bcb8d5ff689504f112b8b149a282a01e6b4212 Mon Sep 17 00:00:00 2001
+From: Lukas Voetmand <lukas.voetmand@stackable.tech>
+Date: Fri, 6 Sep 2024 17:53:52 +0200
+Subject: Add CycloneDX plugin
 
 ---
  pom.xml | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index a1604d5ebe..3f9f794504 100644
+index a1604d5ebec..3f9f7945046 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2814,6 +2814,24 @@
@@ -36,8 +36,3 @@ index a1604d5ebe..3f9f794504 100644
          </plugins>
      </build>
  
-
-base-commit: 05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf
--- 
-2.40.1
-

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+upstream = "https://github.com/trinodb/trino.git"`
	`2`	`+base = "2c974f7cb1d71e1f9f466941a317190a474fc432"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+upstream = "https://github.com/trinodb/trino.git"`
	`2`	`+base = "e212460ea0aa663f0de9b16fecd480c4ad6490cc"`