Skip to content

Fixes for SBOM build time generation #828

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.

Sign up for GitHub

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

Merged
merged 22 commits into from
Sep 8, 2024
Merged

Fixes for SBOM build time generation #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7a692fc
hbase / phoenix / hbase-operator-tools
dervoeti Aug 7, 2024
f589f4d
airflow / druid
dervoeti Aug 13, 2024
f97a0b5
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti Aug 13, 2024
febe345
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti Aug 13, 2024
7df2a01
nifi
dervoeti Aug 13, 2024
6f029bc
omid
dervoeti Aug 13, 2024
0106c7d
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti Aug 13, 2024
17b13c4
hadoop / hive / spark / trino
dervoeti Aug 22, 2024
628bde6
fix: nifi cyclonedx plugin
dervoeti Aug 22, 2024
812a564
fix: hive cyclonedx plugin
dervoeti Aug 23, 2024
58ce811
superset / zookeeper
dervoeti Aug 24, 2024
03d29da
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti Aug 26, 2024
807e849
move instead of copy SBOMs
dervoeti Aug 27, 2024
da47fa7
fix: pre-commit lint fix
dervoeti Aug 30, 2024
cc94788
fix: simplified zookeeper patch file
dervoeti Aug 30, 2024
a4e0d71
fix: undo split of RUN command in Zookeeper Dockerfile
dervoeti Sep 1, 2024
aff22ac
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti Sep 5, 2024
cc42696
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti Sep 6, 2024
08d2e02
feat: patches for all other product versions
dervoeti Sep 6, 2024
59ce2cc
fix: forgot cyclonedx config for druid 26
dervoeti Sep 6, 2024
9a45eba
fix: forgot patches for omid, trino-storage, hbase-operator-tools and…
dervoeti Sep 6, 2024
9b80475
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti Sep 6, 2024
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
28 changes: 28 additions & 0 deletions hbase/stackable/patches/hbase-operator-tools/1.3.0-7c738fc/01-cyclonedx-plugin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/pom.xml b/pom.xml
index 3e05590..91292a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -536,6 +536,23 @@
</formats>
</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>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
28 changes: 28 additions & 0 deletions hbase/stackable/patches/phoenix/5.3.0-4afe457/01-cyclonedx-plugin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/pom.xml b/pom.xml
index e3d5b9a..503a8b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1833,6 +1833,23 @@
</execution>
</executions>
</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>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
29 changes: 29 additions & 0 deletions omid/stackable/patches/1.1.0/001-cyclonedx-plugin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/pom.xml b/pom.xml
index b7f4e47..1b6a282 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,6 +458,24 @@
</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>

<extensions>
29 changes: 29 additions & 0 deletions omid/stackable/patches/1.1.1/001-cyclonedx-plugin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/pom.xml b/pom.xml
index f9dc9e6..f2ab953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,6 +498,24 @@
</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>

<extensions>
28 changes: 28 additions & 0 deletions trino/stackable/patches/trino-storage/455/001-cyclonedx-plugin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/pom.xml b/pom.xml
index 6471642..fc0f376 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,6 +555,23 @@
</dependency>
</dependencies>
</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>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>