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/02/22 09:40:46 UTC

[camel] branch main updated (0adb1d091ff -> c207293313b)

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

acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 0adb1d091ff CAMEL-19062 - Clean up Parent POM - Jakarta Transaction API
     new 096a2e693e3 Upgrade CycloneDX maven plugin to version 2.7.5
     new c207293313b Upgrade CycloneDX maven plugin to version 2.7.5 - Use Output directory configuration

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)


[camel] 02/02: Upgrade CycloneDX maven plugin to version 2.7.5 - Use Output directory configuration

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c207293313b4792e22c1c1b20bdb8ef6928aff12
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 22 10:20:04 2023 +0100

    Upgrade CycloneDX maven plugin to version 2.7.5 - Use Output directory configuration
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 pom.xml | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index f751d300cc4..8aeadf32e9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,6 @@
         <gmavenplus-plugin-version>1.11.1</gmavenplus-plugin-version>
         <groovy-version>3.0.15</groovy-version>
         <cyclonedx-maven-plugin-version>2.7.5</cyclonedx-maven-plugin-version>
-        <antrun-maven-plugin-version>3.1.0</antrun-maven-plugin-version>
 
         <camel.javadoc.offline>false</camel.javadoc.offline>
     </properties>
@@ -856,6 +855,7 @@
                    <inherited>false</inherited>
                    <configuration>
                         <outputName>camel-sbom</outputName>
+                        <outputDirectory>${project.basedir}/camel-sbom/</outputDirectory>
                    </configuration>
                    <executions>
                        <execution>
@@ -866,26 +866,6 @@
                       </execution>
                    </executions>
                 </plugin>
-                <plugin>
-                     <groupId>org.apache.maven.plugins</groupId>
-                     <artifactId>maven-antrun-plugin</artifactId>
-                     <version>${antrun-maven-plugin-version}</version>
-                     <inherited>false</inherited>
-                     <executions>
-                         <execution>
-                             <phase>package</phase>
-                             <configuration>
-                                 <target>
-                                     <copy file="${project.build.directory}/camel-sbom.json" todir="${project.basedir}/camel-sbom/" />
-                                     <copy file="${project.build.directory}/camel-sbom.xml" todir="${project.basedir}/camel-sbom/" />
-                                 </target>
-                             </configuration>
-                             <goals>
-                                 <goal>run</goal>
-                             </goals>
-                         </execution>
-                   </executions>
-                </plugin>
             </plugins>
             </build>
         </profile>


[camel] 01/02: Upgrade CycloneDX maven plugin to version 2.7.5

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 096a2e693e35ec7ae3135e13bbcdc1745184cc96
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 22 10:10:58 2023 +0100

    Upgrade CycloneDX maven plugin to version 2.7.5
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 22da9bfe0bf..f751d300cc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
         <mycila-license-version>3.0</mycila-license-version>
         <gmavenplus-plugin-version>1.11.1</gmavenplus-plugin-version>
         <groovy-version>3.0.15</groovy-version>
-        <cyclonedx-maven-plugin-version>2.7.4</cyclonedx-maven-plugin-version>
+        <cyclonedx-maven-plugin-version>2.7.5</cyclonedx-maven-plugin-version>
         <antrun-maven-plugin-version>3.1.0</antrun-maven-plugin-version>
 
         <camel.javadoc.offline>false</camel.javadoc.offline>