You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/12/13 10:20:44 UTC

(camel) 03/03: CAMEL-20205 - Add SBOM to release and release-sbom script to LTS 4.0.x

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch CAMEL-20205
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a2d31aa106f3aa15253e560f57eab5894e978fa3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Dec 13 11:20:11 2023 +0100

    CAMEL-20205 - Add SBOM to release and release-sbom script to LTS 4.0.x
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java |  4 ++--
 pom.xml                                               | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
index be723b9007f..c5fba2e8752 100755
--- a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
@@ -19,8 +19,8 @@
 
 //JAVA 17+
 //REPOS central=https://repo1.maven.org/maven2,apache-snapshot=https://repository.apache.org/content/groups/snapshots/
-//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.0.1}@pom
-//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.0.1}
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.0.3}@pom
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.0.3}
 //DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.0.1}
 
 package main;
diff --git a/pom.xml b/pom.xml
index 18a5af81a52..2d42735a6a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
         <!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
         <project.build.outputTimestamp>2023-11-14T11:50:56Z</project.build.outputTimestamp>
 
-        <cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
+        <cyclonedx-maven-plugin-version>2.7.10</cyclonedx-maven-plugin-version>
         <flatten-maven-plugin-version>1.5.0</flatten-maven-plugin-version>
         <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
         <license-maven-plugin-version>4.2</license-maven-plugin-version>
@@ -750,6 +750,23 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.cyclonedx</groupId>
+                        <artifactId>cyclonedx-maven-plugin</artifactId>
+                        <version>${cyclonedx-maven-plugin-version}</version>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>makeAggregateBom</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <outputName>${project.artifactId}-${project.version}-sbom</outputName>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>