You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2024/12/14 15:23:37 UTC

(db-jdo) branch JDO-847-2 updated: JDO-847: Create sbom files for JDO 3.2.1 release

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

mbo pushed a commit to branch JDO-847-2
in repository https://gitbox.apache.org/repos/asf/db-jdo.git


The following commit(s) were added to refs/heads/JDO-847-2 by this push:
     new a77a7cc8 JDO-847: Create sbom files for JDO 3.2.1 release
a77a7cc8 is described below

commit a77a7cc8463f4cf110998ccf2fb4b9a79218178d
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sat Dec 14 16:23:29 2024 +0100

    JDO-847: Create sbom files for JDO 3.2.1 release
    
    Configuration of cyclonedx und spdx maven plugin
---
 parent-pom/pom.xml | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index 2796517c..4b8fd688 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -164,6 +164,8 @@
 
     <properties>
         <project.build.outputTimestamp>1653504961</project.build.outputTimestamp>
+        <version.cyclonedx-maven-plugin>2.9.1</version.cyclonedx-maven-plugin>
+        <version.spdx-maven-plugin>0.7.4</version.spdx-maven-plugin>
     </properties>
 
     <dependencyManagement>
@@ -291,12 +293,37 @@
                 <plugin>
                     <groupId>org.cyclonedx</groupId>
                     <artifactId>cyclonedx-maven-plugin</artifactId>
-                    <version>2.9.1</version>
+                    <version>${version.cyclonedx-maven-plugin}</version>
+                    <executions>
+                        <execution>
+                            <id>build-sbom-cyclonedx</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>makeAggregateBom</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <outputName>${project.artifactId}-${project.version}-cyclonedx</outputName>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.spdx</groupId>
                     <artifactId>spdx-maven-plugin</artifactId>
-                    <version>0.7.4</version>
+                    <version>${version.spdx-maven-plugin}</version>
+                    <executions>
+                        <execution>
+                            <id>build-sbom-spdx</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>createSPDX</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <outputFormat>JSON</outputFormat>
+                        <spdxFile>${project.build.directory}/${project.artifactId}-${project.version}-spdx.json</spdxFile>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -346,4 +373,16 @@
             </plugin>
         </plugins>
     </reporting>
+
+    <profiles>
+        <profile>
+            <id>jdk8-plugin-fix-version</id>
+            <activation>
+                <jdk>[1.8,1.9)</jdk>
+            </activation>
+            <properties>
+                <version.spdx-maven-plugin>0.6.3</version.spdx-maven-plugin>
+            </properties>
+        </profile>
+    </profiles>
 </project>