This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-props.git
The following commit(s) were added to refs/heads/master by this push:
new 5277974 needs Java9+ to create SBOMs
5277974 is described below
commit 52779742ceea7674fb4fd316088a4e045ed61850
Author: Stefan Bodewig <[email protected]>
AuthorDate: Sun Jul 26 18:34:24 2026 +0200
needs Java9+ to create SBOMs
---
common | 2 +-
cyclonedx.xml | 15 ++++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/common b/common
index e5aede2..08aa3ef 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e5aede23ca435d31bd804e2e8e08b5d30cce68ff
+Subproject commit 08aa3efdbec177de04e5a9d7f9a5ca787d612a4e
diff --git a/cyclonedx.xml b/cyclonedx.xml
index 0bf0ca9..f07b094 100644
--- a/cyclonedx.xml
+++ b/cyclonedx.xml
@@ -19,7 +19,9 @@ under the License.
-->
<project name="cyclonedx" xmlns:ivy="antlib:org.apache.ivy.ant">
- <target name="define-cyclonedx-components"
depends="define-core-ant-components">
+ <target name="define-cyclonedx-components"
+ depends="define-core-ant-components"
+ if="can.use.cyclonedx">
<cdx:externalreferenceset
id="antlib-ext-refs"
xmlns:cdx="antlib:org.apache.ant.cyclonedx">
@@ -33,7 +35,8 @@ under the License.
</target>
<target name="create-antlib-sbom"
-
depends="define-cyclonedx-components,antlib,define-core-ant-components">
+
depends="define-cyclonedx-components,antlib,define-core-ant-components"
+ if="can.use.cyclonedx">
<uptodate property="antlib-sbom-ok"
targetfile="${build.lib}/${artifact.stub}.cdx.json">
<srcresources>
@@ -72,7 +75,9 @@ under the License.
</cdx:componentbom>
</target>
- <target name="after-dist" depends="define-cyclonedx-components">
+ <target name="after-dist"
+ depends="define-cyclonedx-components"
+ if="can.use.cyclonedx">
<macrodef name="distributionbom" backtrace="false">
<attribute name="version"/>
<attribute name="archiveName"/>
@@ -192,7 +197,7 @@ under the License.
</macrodef>
</target>
- <target name="src-sboms" depends="after-dist">
+ <target name="src-sboms" depends="after-dist" if="can.use.cyclonedx">
<create-tarball-boms
distdir="${src.dist.dir}"
distbase="${dist.base}"
@@ -201,7 +206,7 @@ under the License.
binarysource="Source Distribution"/>
</target>
- <target name="bin-sboms" depends="after-dist">
+ <target name="bin-sboms" depends="after-dist" if="can.use.cyclonedx">
<create-tarball-boms
distdir="${bin.dist.dir}"
distbase="${dist.base}"
