-
-
Notifications
You must be signed in to change notification settings - Fork 7
Generate SBOMs during build #814
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
Merged
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
7a692fc
hbase / phoenix / hbase-operator-tools
dervoeti f589f4d
airflow / druid
dervoeti f97a0b5
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti febe345
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti 7df2a01
nifi
dervoeti 6f029bc
omid
dervoeti 0106c7d
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti 17b13c4
hadoop / hive / spark / trino
dervoeti 628bde6
fix: nifi cyclonedx plugin
dervoeti 812a564
fix: hive cyclonedx plugin
dervoeti 58ce811
superset / zookeeper
dervoeti 03d29da
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti 807e849
move instead of copy SBOMs
dervoeti da47fa7
fix: pre-commit lint fix
dervoeti cc94788
fix: simplified zookeeper patch file
dervoeti a4e0d71
fix: undo split of RUN command in Zookeeper Dockerfile
dervoeti aff22ac
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti cc42696
Merge branch 'main' of https://github.com/stackabletech/docker-images…
dervoeti 08d2e02
feat: patches for all other product versions
dervoeti 59ce2cc
fix: forgot cyclonedx config for druid 26
dervoeti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index c0f0654..133cbf8 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -1558,7 +1558,11 @@ | ||
<plugin> | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
- <version>2.7.5</version> | ||
+ <version>2.8.0</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index ff6ee97..8c99ed3 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -1646,7 +1646,11 @@ | ||
<plugin> | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
- <version>2.7.9</version> | ||
+ <version>2.8.0</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index 9051ed2..10a2c85 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -1728,7 +1728,11 @@ | ||
<plugin> | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
- <version>2.7.9</version> | ||
+ <version>2.8.0</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
hadoop/stackable/patches/3.3.4/008-patch-cyclonedx-plugin.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index f4e435c..f050218 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -116,6 +116,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
<dependency-check-maven.version>1.4.3</dependency-check-maven.version> | ||
<spotbugs.version>4.2.2</spotbugs.version> | ||
<spotbugs-maven-plugin.version>4.2.0</spotbugs-maven-plugin.version> | ||
+ <cyclonedx.version>2.8.0</cyclonedx.version> | ||
|
||
<shell-executable>bash</shell-executable> | ||
|
||
@@ -491,6 +492,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
<groupId>com.github.spotbugs</groupId> | ||
<artifactId>spotbugs-maven-plugin</artifactId> | ||
</plugin> | ||
+ <plugin> | ||
+ <groupId>org.cyclonedx</groupId> | ||
+ <artifactId>cyclonedx-maven-plugin</artifactId> | ||
+ <version>${cyclonedx.version}</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ <skipNotDeployed>false</skipNotDeployed> | ||
+ </configuration> | ||
+ <executions> | ||
+ <execution> | ||
+ <phase>package</phase> | ||
+ <goals> | ||
+ <goal>makeBom</goal> | ||
+ </goals> | ||
+ </execution> | ||
+ </executions> | ||
+ </plugin> | ||
</plugins> | ||
</build> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index aaa4203..de00177 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -116,7 +116,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
<dependency-check-maven.version>1.4.3</dependency-check-maven.version> | ||
<spotbugs.version>4.2.2</spotbugs.version> | ||
<spotbugs-maven-plugin.version>4.2.0</spotbugs-maven-plugin.version> | ||
- <cyclonedx.version>2.7.6</cyclonedx.version> | ||
+ <cyclonedx.version>2.8.0</cyclonedx.version> | ||
|
||
<shell-executable>bash</shell-executable> | ||
|
||
@@ -649,6 +649,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
<version>${cyclonedx.version}</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ <skipNotDeployed>false</skipNotDeployed> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> | ||
@@ -657,9 +662,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
</goals> | ||
</execution> | ||
</executions> | ||
- <configuration> | ||
- <outputFormat>xml</outputFormat> | ||
- </configuration> | ||
</plugin> | ||
</plugins> | ||
</build> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index 0a7a478..3ceaf7a 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -118,7 +118,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
<spotbugs-maven-plugin.version>4.2.0</spotbugs-maven-plugin.version> | ||
<jsonschema2pojo-maven-plugin.version>1.1.1</jsonschema2pojo-maven-plugin.version> | ||
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> | ||
- <cyclonedx.version>2.7.10</cyclonedx.version> | ||
+ <cyclonedx.version>2.8.0</cyclonedx.version> | ||
|
||
<shell-executable>bash</shell-executable> | ||
|
||
@@ -770,6 +770,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
<version>${cyclonedx.version}</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ <skipNotDeployed>false</skipNotDeployed> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> | ||
@@ -778,9 +783,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x | ||
</goals> | ||
</execution> | ||
</executions> | ||
- <configuration> | ||
- <outputFormat>xml</outputFormat> | ||
- </configuration> | ||
</plugin> | ||
</plugins> | ||
</build> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
hbase/stackable/patches/2.4.17/006-patch-cyclonedx-plugin.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index e7df337..566414e 100755 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -2337,7 +2337,11 @@ | ||
<plugin> | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
- <version>2.7.3</version> | ||
+ <version>2.8.0</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<goals> |
26 changes: 26 additions & 0 deletions
26
hbase/stackable/patches/2.4.18/06-patch-cyclonedx-plugin.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Bumps cyclonedx-maven-plugin to version 2.8.0 and tweaks its configuration | ||
|
||
From: dervoeti <lukas.voetmand@stackable.tech> | ||
|
||
|
||
--- | ||
pom.xml | 6 +++++- | ||
1 file changed, 5 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/pom.xml b/pom.xml | ||
index 8bd80e81e2..a437d5c819 100755 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -3011,7 +3011,11 @@ | ||
<plugin> | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
- <version>2.7.10</version> | ||
+ <version>2.8.0</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<goals> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,4 @@ | |
03-HBASE-28379.patch | ||
04-HBASE-28511.patch | ||
05-patch-updates.patch | ||
06-patch-cyclonedx-plugin.patch |
17 changes: 17 additions & 0 deletions
17
hbase/stackable/patches/2.6.0/05-patch-cyclonedx-plugin.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index 918cdaa..2a83794 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -3218,7 +3218,11 @@ | ||
<plugin> | ||
<groupId>org.cyclonedx</groupId> | ||
<artifactId>cyclonedx-maven-plugin</artifactId> | ||
- <version>2.7.10</version> | ||
+ <version>2.8.0</version> | ||
+ <configuration> | ||
+ <projectType>application</projectType> | ||
+ <schemaVersion>1.5</schemaVersion> | ||
+ </configuration> | ||
<executions> | ||
<execution> | ||
<goals> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,3 +3,4 @@ | |
02-HBASE-28567.patch | ||
03-patch-updates.patch | ||
04-include-dataformat-xml.patch | ||
05-patch-cyclonedx-plugin.patch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
hbase/stackable/patches/hbase-operator-tools/1.2.0/01-cyclonedx-plugin.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff --git a/pom.xml b/pom.xml | ||
index aba42b0..0288bde 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -396,6 +396,23 @@ | ||
<skipAssembly>true</skipAssembly> | ||
</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> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.