This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch cyclonedx
in repository https://gitbox.apache.org/repos/asf/ant-ivy.git
The following commit(s) were added to refs/heads/cyclonedx by this push:
new c0601d92 extract files to build dir instead of /tmp
c0601d92 is described below
commit c0601d9258711541ccbf2e4b2310a10e78df51d6
Author: Stefan Bodewig <[email protected]>
AuthorDate: Sun Jun 7 14:58:34 2026 +0200
extract files to build dir instead of /tmp
---
build-release.xml | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/build-release.xml b/build-release.xml
index d1ecf6e2..0116d241 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -944,12 +944,6 @@
</target>
<target name="prepare-distribution-sboms"
depends="define-cyclonedx-components">
- <property name="ant.auto.tmpdir" value="${ant.tmpdir}"
- unless:set="ant.auto.tmpdir" xmlns:unless="ant:unless"
- if:set="ant.tmpdir" xmlns:if="ant:if"/>
- <property name="ant.auto.tmpdir" value="${java.io.tmpdir}"
- unless:set="ant.auto.tmpdir" xmlns:unless="ant:unless"/>
-
<macrodef name="create-tarball-bom">
<attribute name="binsrc"/>
<attribute name="binarysource"/>
@@ -991,8 +985,8 @@
<attribute name="binarysource"/>
<element name="componentChildren" implicit="true" optional="true"/>
<sequential>
- <mkdir dir="${ant.auto.tmpdir}/@{binsrc}"/>
- <unzip dest="${ant.auto.tmpdir}/@{binsrc}"
+ <mkdir dir="${build.dir}/sbom/@{binsrc}"/>
+ <unzip dest="${build.dir}/sbom/@{binsrc}"
src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-@{binsrc}.zip"/>
<create-tarball-bom
binsrc="@{binsrc}"
@@ -1002,7 +996,7 @@
<componentChildren/>
</moreComponentChildren>
<archiveContent>
- <fileset dir="${ant.auto.tmpdir}/@{binsrc}" defaultexcludes="no"/>
+ <fileset dir="${build.dir}/sbom/@{binsrc}" defaultexcludes="no"/>
</archiveContent>
</create-tarball-bom>
<create-tarball-bom
@@ -1013,10 +1007,10 @@
<componentChildren/>
</moreComponentChildren>
<archiveContent>
- <fileset dir="${ant.auto.tmpdir}/@{binsrc}" defaultexcludes="no"/>
+ <fileset dir="${build.dir}/sbom/@{binsrc}" defaultexcludes="no"/>
</archiveContent>
</create-tarball-bom>
- <delete dir="${ant.auto.tmpdir}/@{binsrc}"/>
+ <delete dir="${build.dir}/sbom/@{binsrc}"/>
</sequential>
</macrodef>
</target>