This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-common.git
The following commit(s) were added to refs/heads/master by this push:
new 633b516 cyclonedx -> cdx and a few more tweaks
633b516 is described below
commit 633b516480636cae18ef360df023192f48240fe7
Author: Stefan Bodewig <[email protected]>
AuthorDate: Fri Jun 19 22:15:03 2026 +0200
cyclonedx -> cdx and a few more tweaks
---
.gitignore | 1 +
ReleaseInstructions | 2 +-
build.xml | 3 +++
seed-new-antlib.xml | 4 ++++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index faa00e1..1309d41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/lib/
/target/
/distribution/
+/dist-bin/
diff --git a/ReleaseInstructions b/ReleaseInstructions
index f5b4a99..aefda4c 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -77,7 +77,7 @@ Note: this document is based on Ant core's
ReleaseInstructions file
10. Sign the distribution files using the following simple script
#!/bin/sh
- for i in `/usr/bin/find distribution \( -name "*.bz2" -o -name "*.zip" -o
-name "*.gz" -o -name "*.cyclonedx.json" -o -name "*.cyclonedx.xml" \)`
+ for i in `/usr/bin/find distribution \( -name "*.bz2" -o -name "*.zip" -o
-name "*.gz" -o -name "*.cdx.json" -o -name "*.cdx.xml" \)`
do
echo "Signing " $i
gpg --use-agent --detach-sign --armor $i
diff --git a/build.xml b/build.xml
index 6b512eb..105fe5e 100644
--- a/build.xml
+++ b/build.xml
@@ -351,6 +351,9 @@
</fileset>
<fileset file="${jarname}*"/>
<fileset file="${target.pom}"/>
+ <fileset dir="${build.lib}">
+ <include name="${artifact.stub}.cdx*"/>
+ </fileset>
<resources refid="additional-bin-patterns"/>
</copy>
<copy todir="${bin.dist.dir}/javadoc">
diff --git a/seed-new-antlib.xml b/seed-new-antlib.xml
index 1fc060e..89373f6 100644
--- a/seed-new-antlib.xml
+++ b/seed-new-antlib.xml
@@ -240,6 +240,10 @@ artifact.version=${seed.antlib.version}alpha
e:classifier="ivy"/>
<artifact name="$${artifact.name}" type="ivy.asc" ext="xml.asc"
e:classifier="ivy"/>
+ <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.apache.ant" name="ant" rev="1.10.17"
conf="provided->default"/>
