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/03/02 17:42:25 UTC

[camel-kamelets] 01/02: Upgrade to CycloneDX Maven plugin 2.7.5

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

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

commit 85d7399814d0deb0e170b3ba7c25ead57a95c496
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 2 18:41:06 2023 +0100

    Upgrade to CycloneDX Maven plugin 2.7.5
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 pom.xml | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 009a02a9..d94dacfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-groovy-plugin.version>2.1.1</maven-groovy-plugin.version>
         <apache-rat-plugin.version>0.14</apache-rat-plugin.version>
-	<cyclonedx-maven-plugin-version>2.7.4</cyclonedx-maven-plugin-version>
+	<cyclonedx-maven-plugin-version>2.7.5</cyclonedx-maven-plugin-version>
 
         <camel.version>4.0.0-M1</camel.version>
         <slf4j.version>1.7.36</slf4j.version>
@@ -130,7 +130,7 @@
             <id>apache.snapshots</id>
             <url>https://repository.apache.org/snapshots/</url>
             <name>Apache Snapshot Repo</name>
-            <snapshots>
+	    <snapshots>
                 <enabled>true</enabled>
             </snapshots>
             <releases>
@@ -448,6 +448,7 @@
                    <inherited>false</inherited>
                    <configuration>
                         <outputName>camel-kamelets-sbom</outputName>
+                        <outputDirectory>${project.basedir}/camel-kamelets-sbom/</outputDirectory>
                    </configuration>
                    <executions>
                        <execution>
@@ -458,26 +459,6 @@
                       </execution>
                    </executions>
                 </plugin>
-                <plugin>
-                     <groupId>org.apache.maven.plugins</groupId>
-                     <artifactId>maven-antrun-plugin</artifactId>
-                     <version>${maven-antrun-plugin.version}</version>
-                     <inherited>false</inherited>
-                     <executions>
-                         <execution>
-                             <phase>package</phase>
-                             <configuration>
-                                 <target>
-                                     <copy file="${project.build.directory}/camel-kamelets-sbom.json" todir="${project.basedir}/camel-kamelets-sbom/" />
-                                     <copy file="${project.build.directory}/camel-kamelets-sbom.xml" todir="${project.basedir}/camel-kamelets-sbom/" />
-                                 </target>
-                             </configuration>
-                             <goals>
-                                 <goal>run</goal>
-                             </goals>
-                         </execution>
-                   </executions>
-                </plugin>
             </plugins>
             </build>
         </profile>