This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-cyclonedx.git
The following commit(s) were added to refs/heads/main by this push:
new 9576d5e CycloneDX Spec prefers .cdx.json
9576d5e is described below
commit 9576d5e232e3e2e712fb4e2e4a6f8836fa6c4346
Author: Stefan Bodewig <[email protected]>
AuthorDate: Fri Jun 19 21:38:36 2026 +0200
CycloneDX Spec prefers .cdx.json
https://cyclonedx.org/specification/overview/#recognized-file-patterns
---
build.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index 3372fea..59215cd 100644
--- a/build.xml
+++ b/build.xml
@@ -60,7 +60,7 @@ under the License.
<target name="create-antlib-sbom" depends="define-cyclonedx-components">
<uptodate property="antlib-sbom-ok"
- targetfile="${build.lib}/${artifact.stub}-cyclonedx.json">
+ targetfile="${build.lib}/${artifact.stub}.cdx.json">
<srcresources>
<file file="${jarname}"/>
<file file="ivy.xml"/>
@@ -68,7 +68,7 @@ under the License.
</srcresources>
</uptodate>
<cdx:componentbom
- bomName="${artifact.stub}-cyclonedx"
+ bomName="${artifact.stub}.cdx"
outputdirectory="${build.lib}"
format="all"
useComponentSupplier="true"
@@ -212,7 +212,7 @@ under the License.
<target name="ready-for-bin-dist"
depends="create-antlib-sbom,common.ready-for-bin-dist">
<resources id="additional-bin-patterns">
<fileset dir="${build.lib}">
- <include name="${artifact.stub}-cyclonedx*"/>
+ <include name="${artifact.stub}.cdx*"/>
</fileset>
</resources>
</target>
@@ -237,7 +237,7 @@ under the License.
<sequential
xmlns:cdx="antlib:org.apache.ant.cyclonedx">
<cdx:componentbom
- bomName="@{archiveName}.cyclonedx"
+ bomName="@{archiveName}.cdx"
outputdirectory="@{outputDirectory}"
format="@{format}"
useComponentManufacturer="@{useComponentManufacturer}"
@@ -355,7 +355,7 @@ under the License.
binarysource="Binary Distribution">
<component>
<sbomLink createBomExternalReference="false">
- <file file="${bin.dist.dir}/${artifact.stub}-cyclonedx.json"/>
+ <file file="${bin.dist.dir}/${artifact.stub}.cdx.json"/>
</sbomLink>
<file file="${bin.dist.dir}/${artifact.stub}.jar"/>
</component>
@@ -371,7 +371,7 @@ under the License.
binarysource="Binary Distribution Including Dependencies">
<component>
<sbomLink createBomExternalReference="false">
- <file file="${bin.dist.dir}/${artifact.stub}-cyclonedx.json"/>
+ <file file="${bin.dist.dir}/${artifact.stub}.cdx.json"/>
</sbomLink>
<file file="${bin.dist.dir}/${artifact.stub}.jar"/>
</component>
