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-ivy.git
commit 65461344717ad9764e8c1d86730168b51b2c0bc8 Author: Stefan Bodewig <[email protected]> AuthorDate: Sun Jul 26 18:16:49 2026 +0200 building SBOMs requires Java 9+ --- build-release.xml | 14 +++++++++----- build.xml | 4 ++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build-release.xml b/build-release.xml index 36651076..f2f39f6b 100644 --- a/build-release.xml +++ b/build-release.xml @@ -655,7 +655,7 @@ </generate-tagsdoc> </target> - <target name="define-cyclonedx-components"> + <target name="define-cyclonedx-components" if="jdk9+"> <ivy:cachepath organisation="org.apache.ant" module="ant-cyclonedx" revision="${ant-cyclonedx.version}" @@ -744,7 +744,7 @@ </cdx:externalreferenceset> </target> - <target name="jar-sbom" depends="define-cyclonedx-components,jar"> + <target name="jar-sbom" depends="define-cyclonedx-components,jar" if="jdk9+"> <cdx:componentbom bomName="ivy-${build.version}.cdx" outputdirectory="${artifacts.build.dir}/jars" @@ -937,7 +937,9 @@ </cdx:componentbom> </target> - <target name="prepare-distribution-sboms" depends="define-cyclonedx-components"> + <target name="prepare-distribution-sboms" + depends="define-cyclonedx-components" + if="jdk9+"> <macrodef name="create-tarball-bom"> <attribute name="binsrc"/> <attribute name="binarysource"/> @@ -1010,12 +1012,14 @@ </target> <target name="src-tarball-sboms" - depends="snapshot-src,prepare-distribution-sboms"> + depends="snapshot-src,prepare-distribution-sboms" + if="jdk9+"> <create-tarball-boms binsrc="src" binarysource="Source Distribution"/> </target> <target name="bin-tarball-sboms" - depends="snapshot-bin,prepare-distribution-sboms"> + depends="snapshot-bin,prepare-distribution-sboms" + if="jdk9+"> <create-tarball-boms binsrc="bin" binarysource="Binary Distribution"> <component> diff --git a/build.xml b/build.xml index 421ea598..b11a1a07 100644 --- a/build.xml +++ b/build.xml @@ -24,6 +24,10 @@ <property name="final.name" value="ivy.jar"/> + <condition property="jdk9+"> + <javaversion atleast="9"/> + </condition> + <target name="init-ivy-user-home" unless="ivy.use.local.home"> <condition property="ivy.home" value="${env.IVY_HOME}"> <isset property="env.IVY_HOME"/>
