natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

building SBOMs requires Java 9+

This commit is contained in:
Stefan Bodewig 2026-07-26 18:16:49 +02:00
parent eb29656412
commit 6546134471
No known key found for this signature in database
GPG Key ID: 23738DFD7C40DE43
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-release.xml
View File

@ -655,7 +655,7 @@
</generate-tagsdoc> </generate-tagsdoc>
</target> </target>
<target name="define-cyclonedx-components"> <target name="define-cyclonedx-components" if="jdk9+">
<ivy:cachepath organisation="org.apache.ant" <ivy:cachepath organisation="org.apache.ant"
module="ant-cyclonedx" module="ant-cyclonedx"
revision="${ant-cyclonedx.version}" revision="${ant-cyclonedx.version}"
@ -744,7 +744,7 @@
</cdx:externalreferenceset> </cdx:externalreferenceset>
</target> </target>
<target name="jar-sbom" depends="define-cyclonedx-components,jar"> <target name="jar-sbom" depends="define-cyclonedx-components,jar" if="jdk9+">
<cdx:componentbom <cdx:componentbom
bomName="ivy-${build.version}.cdx" bomName="ivy-${build.version}.cdx"
outputdirectory="${artifacts.build.dir}/jars" outputdirectory="${artifacts.build.dir}/jars"
@ -937,7 +937,9 @@
</cdx:componentbom> </cdx:componentbom>
</target> </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"> <macrodef name="create-tarball-bom">
<attribute name="binsrc"/> <attribute name="binsrc"/>
<attribute name="binarysource"/> <attribute name="binarysource"/>
@ -1010,12 +1012,14 @@
</target> </target>
<target name="src-tarball-sboms" <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"/> <create-tarball-boms binsrc="src" binarysource="Source Distribution"/>
</target> </target>
<target name="bin-tarball-sboms" <target name="bin-tarball-sboms"
depends="snapshot-bin,prepare-distribution-sboms"> depends="snapshot-bin,prepare-distribution-sboms"
if="jdk9+">
<create-tarball-boms binsrc="bin" <create-tarball-boms binsrc="bin"
binarysource="Binary Distribution"> binarysource="Binary Distribution">
<component> <component>

4
build.xml
View File

@ -24,6 +24,10 @@
<property name="final.name" value="ivy.jar"/> <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"> <target name="init-ivy-user-home" unless="ivy.use.local.home">
<condition property="ivy.home" value="${env.IVY_HOME}"> <condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME"/> <isset property="env.IVY_HOME"/>