From: Julien Carsique <julien.carsique@sonarsource.com>
Date: Wed, 13 Apr 2022 20:52:51 +0000 (+0200)
Subject: BUILD-1443 sbom plugin (#130)
X-Git-Tag: 4.8.0.2856~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e2e857b5f0d9848a97713e8efdb697aaa008bd20;p=sonar-scanner-cli.git

BUILD-1443 sbom plugin (#130)

* feat(BUILD-1436): sbom plugin
* feat(BUILD-1436): upgrade to parent 61.0.147

Co-authored-by: tomverin
Reviewed-by: dbmeneses
---

diff --git a/pom.xml b/pom.xml
index e2aa273..5867212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>60.0.52</version>
+    <version>61.0.147</version>
   </parent>
 
   <groupId>org.sonarsource.scanner.cli</groupId>
@@ -38,6 +38,10 @@
     <system>JIRA</system>
     <url>https://jira.sonarsource.com/browse/SQSCANNER</url>
   </issueManagement>
+  <ciManagement>
+    <system>cirrus-ci</system>
+    <url>https://cirrus-ci.com/github/SonarSource/sonar-scanner-cli</url>
+  </ciManagement>
 
   <properties>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -53,7 +57,7 @@
     <jre.dirname.macosx>jdk-11.0.14.1+1-jre/Contents/Home</jre.dirname.macosx>
 
     <!-- Release: enable publication to Bintray -->
-    <artifactsToPublish>${project.groupId}:${project.artifactId}:zip,${project.groupId}:${project.artifactId}:zip:linux,${project.groupId}:${project.artifactId}:zip:windows,${project.groupId}:${project.artifactId}:zip:macosx</artifactsToPublish>
+    <artifactsToPublish>${project.groupId}:${project.artifactId}:zip,${project.groupId}:${project.artifactId}:zip:linux,${project.groupId}:${project.artifactId}:zip:windows,${project.groupId}:${project.artifactId}:zip:macosx,${project.groupId}:${project.artifactId}:json:cyclonedx</artifactsToPublish>
 
     <maven.compiler.release>8</maven.compiler.release>
   </properties>
@@ -189,9 +193,21 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-	  <source>8</source>
+      	  <source>8</source>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.cyclonedx</groupId>
+        <artifactId>cyclonedx-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>makeAggregateBom</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>