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 2025/09/30 18:11:34 UTC
(db-jdo) branch main updated: JDO-847: create SBOM files for api module (#108)
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
The following commit(s) were added to refs/heads/main by this push:
new e1120ec3 JDO-847: create SBOM files for api module (#108)
e1120ec3 is described below
commit e1120ec39b8ba7c7480cbc0f0772717fc319f425
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Tue Sep 30 20:11:29 2025 +0200
JDO-847: create SBOM files for api module (#108)
---
README.md | 5 -----
api/pom.xml | 8 ++++++++
parent-pom/pom.xml | 12 +++++++++---
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index b29d2f38..781d8bbd 100644
--- a/README.md
+++ b/README.md
@@ -191,8 +191,3 @@ There are two profiles to support code formatting using the maven fmt-maven-plug
The formatting of the code is checked automatically through the GitHub actions for every PR and/or push on master.
-### SBOM Support
-
-In order to create SBOM files using the cyclonedx-maven-plugin and the spdx-maven-plugin please call
-
- mvn clean cyclonedx:makeBom spdx:createSPDX
diff --git a/api/pom.xml b/api/pom.xml
index 732ed5b9..782a3586 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -114,6 +114,14 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.spdx</groupId>
+ <artifactId>spdx-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
<reporting>
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index f2ae179d..526a3b05 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -182,7 +182,7 @@
<version.maven-bundle-plugin>5.1.9</version.maven-bundle-plugin>
<version.fmt-maven-plugin>2.25</version.fmt-maven-plugin>
<version.cyclonedx-maven-plugin>2.9.1</version.cyclonedx-maven-plugin>
- <version.spdx-maven-plugin>0.7.4</version.spdx-maven-plugin>
+ <version.spdx-maven-plugin>1.0.3</version.spdx-maven-plugin>
</properties>
<dependencyManagement>
@@ -278,7 +278,6 @@
</dependencyManagement>
<build>
-
<pluginManagement>
<plugins>
<plugin>
@@ -305,12 +304,13 @@
<id>build-sbom-cyclonedx</id>
<phase>package</phase>
<goals>
- <goal>makeAggregateBom</goal>
+ <goal>makeBom</goal>
</goals>
</execution>
</executions>
<configuration>
<outputName>${project.artifactId}-${project.version}-cyclonedx</outputName>
+ <outputFormat>json</outputFormat>
</configuration>
</plugin>
<plugin>
@@ -329,6 +329,12 @@
<configuration>
<outputFormat>JSON</outputFormat>
<spdxFile>${project.build.directory}/${project.artifactId}-${project.version}-spdx.json</spdxFile>
+ <defaultFileCopyright>Copyright (c) 2005-2025 The Apache Software Foundation</defaultFileCopyright>
+ <defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
+ <defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
+ <licenseDeclared>Apache-2.0</licenseDeclared>
+ <includeTestScope>false</includeTestScope>
+ <sbomType>consolidated</sbomType>
</configuration>
</plugin>
</plugins>