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 71cb81d adjust ivy.xml
71cb81d is described below
commit 71cb81dde4d745937742733aaf58a5b284ed7516
Author: Stefan Bodewig <[email protected]>
AuthorDate: Sat Jun 20 07:52:15 2026 +0200
adjust ivy.xml
---
build.xml | 8 +-------
common | 2 +-
ivy.xml | 12 ++++--------
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index 59215cd..a8b4f59 100644
--- a/build.xml
+++ b/build.xml
@@ -209,13 +209,7 @@ under the License.
</cdx:componentbom>
</target>
- <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}.cdx*"/>
- </fileset>
- </resources>
- </target>
+ <target name="ready-for-bin-dist"
depends="create-antlib-sbom,common.ready-for-bin-dist"/>
<target name="after-dist" depends="define-cyclonedx-components">
<macrodef name="distributionbom" backtrace="false">
diff --git a/common b/common
index b24e42f..633b516 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b24e42f26da431ca6c2a7c793f2fda855f8154d7
+Subproject commit 633b516480636cae18ef360df023192f48240fe7
diff --git a/ivy.xml b/ivy.xml
index 9bac4d7..df30f0c 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -52,14 +52,10 @@
e:classifier="ivy"/>
<artifact name="${artifact.name}" type="ivy.asc" ext="xml.asc"
e:classifier="ivy"/>
- <artifact name="${artifact.name}" type="cyclonedx.xml" ext="xml"
- e:classifier="cyclonedx"/>
- <artifact name="${artifact.name}" type="cyclonedx.xml.asc" ext="xml.asc"
- e:classifier="cyclonedx"/>
- <artifact name="${artifact.name}" type="cyclonedx.json" ext="json"
- e:classifier="cyclonedx"/>
- <artifact name="${artifact.name}" type="cyclonedx.json.asc" ext="json.asc"
- e:classifier="cyclonedx"/>
+ <artifact name="${artifact.name}" type="cyclonedx.xml" ext="cdx.xml"/>
+ <artifact name="${artifact.name}" type="cyclonedx.xml.asc"
ext="cdx.xml.asc"/>
+ <artifact name="${artifact.name}" type="cyclonedx.json" ext="cdx.json"/>
+ <artifact name="${artifact.name}" type="cyclonedx.json.asc"
ext="cdx.json.asc"/>
</publications>
<dependencies>
<dependency org="org.cyclonedx" name="cyclonedx-core-java" rev="12.2.0"
conf="default"/>
