Skip to content

Commit 586b4d0

Browse files
authored
fix: trino storage plugin SBOM (#1130)
fix: trino storage plugin SBOMs
1 parent fdbc082 commit 586b4d0

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

trino/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/patchable.toml /sta
1515
COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/patches/${PRODUCT} /stackable/src/trino/stackable/patches/${PRODUCT}
1616

1717
COPY --from=trino-storage-connector-image /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT}/target/trino-storage-${PRODUCT} /stackable/trino-server-${PRODUCT}/plugin/trino-storage-${PRODUCT}
18+
COPY --from=trino-storage-connector-image /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT}/target/bom.json /stackable/trino-server-${PRODUCT}/plugin/trino-storage-${PRODUCT}/trino-storage-${PRODUCT}.cdx.json
1819
COPY --from=trino-storage-connector-image /stackable/trino-storage-connector-${PRODUCT}-src.tar.gz /stackable
1920
COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/jmx /stackable/jmx
2021

trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 6af1b7fa0f62a4413f1fc072a46ce1be3594d7bc Mon Sep 17 00:00:00 2001
1+
From c14ba9cd92451a2c8a7ad7da2ff2e3f5cdbf2201 Mon Sep 17 00:00:00 2001
22
From: Lukas Voetmand <lukas.voetmand@stackable.tech>
33
Date: Fri, 6 Sep 2024 17:53:52 +0200
44
Subject: Add CycloneDX plugin
55

66
---
7-
pom.xml | 17 +++++++++++++++++
8-
1 file changed, 17 insertions(+)
7+
pom.xml | 18 ++++++++++++++++++
8+
1 file changed, 18 insertions(+)
99

1010
diff --git a/pom.xml b/pom.xml
11-
index 7304dac..5ba854d 100644
11+
index 7304dac..d73dacf 100644
1212
--- a/pom.xml
1313
+++ b/pom.xml
14-
@@ -544,6 +544,23 @@
14+
@@ -544,6 +544,24 @@
1515
</dependency>
1616
</dependencies>
1717
</plugin>
@@ -22,6 +22,7 @@ index 7304dac..5ba854d 100644
2222
+ <configuration>
2323
+ <projectType>application</projectType>
2424
+ <schemaVersion>1.5</schemaVersion>
25+
+ <skipNotDeployed>false</skipNotDeployed>
2526
+ </configuration>
2627
+ <executions>
2728
+ <execution>

trino/storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 4d6d55cbc2e05d9b64186885da86ac367070d0f1 Mon Sep 17 00:00:00 2001
1+
From 16f22c658fa54a9b4d7cc5ece65bcc92f104816d Mon Sep 17 00:00:00 2001
22
From: Lukas Voetmand <lukas.voetmand@stackable.tech>
33
Date: Fri, 6 Sep 2024 17:53:52 +0200
44
Subject: Add CycloneDX plugin
55

66
---
7-
pom.xml | 17 +++++++++++++++++
8-
1 file changed, 17 insertions(+)
7+
pom.xml | 18 ++++++++++++++++++
8+
1 file changed, 18 insertions(+)
99

1010
diff --git a/pom.xml b/pom.xml
11-
index 6471642..fc0f376 100644
11+
index 6471642..492e222 100644
1212
--- a/pom.xml
1313
+++ b/pom.xml
14-
@@ -555,6 +555,23 @@
14+
@@ -555,6 +555,24 @@
1515
</dependency>
1616
</dependencies>
1717
</plugin>
@@ -22,6 +22,7 @@ index 6471642..fc0f376 100644
2222
+ <configuration>
2323
+ <projectType>application</projectType>
2424
+ <schemaVersion>1.5</schemaVersion>
25+
+ <skipNotDeployed>false</skipNotDeployed>
2526
+ </configuration>
2627
+ <executions>
2728
+ <execution>

trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 1f5f2f18056f650b89f0399c188e3446975e1764 Mon Sep 17 00:00:00 2001
1+
From 3c2f4038b72ac3b62bc12c89d40d643a87796ee2 Mon Sep 17 00:00:00 2001
22
From: Lukas Voetmand <lukas.voetmand@stackable.tech>
33
Date: Fri, 6 Sep 2024 17:53:52 +0200
44
Subject: Add CycloneDX plugin
55

66
---
7-
pom.xml | 17 +++++++++++++++++
8-
1 file changed, 17 insertions(+)
7+
pom.xml | 18 ++++++++++++++++++
8+
1 file changed, 18 insertions(+)
99

1010
diff --git a/pom.xml b/pom.xml
11-
index ddd620e..bbfcb96 100644
11+
index ddd620e..62e60b5 100644
1212
--- a/pom.xml
1313
+++ b/pom.xml
14-
@@ -545,6 +545,23 @@
14+
@@ -545,6 +545,24 @@
1515
</dependency>
1616
</dependencies>
1717
</plugin>
@@ -22,6 +22,7 @@ index ddd620e..bbfcb96 100644
2222
+ <configuration>
2323
+ <projectType>application</projectType>
2424
+ <schemaVersion>1.6</schemaVersion>
25+
+ <skipNotDeployed>false</skipNotDeployed>
2526
+ </configuration>
2627
+ <executions>
2728
+ <execution>

0 commit comments

Comments
 (0)