From decb759a8f0f8a9d28fd75b7f37e5f064e7a1c14 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 22 Feb 2024 12:14:34 +0100
Subject: [PATCH] [dist] Make SBOM optional in assembly descriptor

fix dist sbom
---
 pmd-dist/pom.xml                              |  7 +++++++
 .../src/main/resources/assemblies/pmd-bin.xml | 20 ++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index facb2c6dc0..f43dc7d212 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -18,6 +18,13 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.cyclonedx</groupId>
+                <artifactId>cyclonedx-maven-plugin</artifactId>
+                <configuration>
+                    <outputName>pmd-${project.version}-cyclonedx</outputName>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
diff --git a/pmd-dist/src/main/resources/assemblies/pmd-bin.xml b/pmd-dist/src/main/resources/assemblies/pmd-bin.xml
index f33bf93348..8e5f78f5f1 100644
--- a/pmd-dist/src/main/resources/assemblies/pmd-bin.xml
+++ b/pmd-dist/src/main/resources/assemblies/pmd-bin.xml
@@ -51,20 +51,16 @@
             <directoryMode>0755</directoryMode>
             <fileMode>0644</fileMode>
         </fileSet>
-    </fileSets>
 
-    <files>
-        <file>
-            <source>target/bom.xml</source>
+        <fileSet>
+            <includes>
+                <include>pmd-*-cyclonedx.xml</include>
+                <include>pmd-*-cyclonedx.json</include>
+            </includes>
+            <directory>target</directory>
             <outputDirectory>sbom</outputDirectory>
-            <destName>pmd-${project.version}-cyclonedx.xml</destName>
-        </file>
-        <file>
-            <source>target/bom.json</source>
-            <outputDirectory>sbom</outputDirectory>
-            <destName>pmd-${project.version}-cyclonedx.json</destName>
-        </file>
-    </files>
+        </fileSet>
+    </fileSets>
 
     <dependencySets>
         <!-- jar dependencies go to lib/ -->