needs Java9+ to build SBOMs
This commit is contained in:
parent
1a9e1d324e
commit
0ac5d3e1c1
2
common
2
common
|
|
@ -1 +1 @@
|
||||||
Subproject commit e5aede23ca435d31bd804e2e8e08b5d30cce68ff
|
Subproject commit 08aa3efdbec177de04e5a9d7f9a5ca787d612a4e
|
||||||
|
|
@ -19,7 +19,9 @@ under the License.
|
||||||
-->
|
-->
|
||||||
<project name="cyclonedx" xmlns:ivy="antlib:org.apache.ivy.ant">
|
<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
|
<cdx:externalreferenceset
|
||||||
id="antlib-ext-refs"
|
id="antlib-ext-refs"
|
||||||
xmlns:cdx="antlib:org.apache.ant.cyclonedx">
|
xmlns:cdx="antlib:org.apache.ant.cyclonedx">
|
||||||
|
|
@ -32,7 +34,9 @@ under the License.
|
||||||
</cdx:externalreferenceset>
|
</cdx:externalreferenceset>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="create-antlib-sbom" depends="define-cyclonedx-components,antlib">
|
<target name="create-antlib-sbom"
|
||||||
|
depends="define-cyclonedx-components,antlib"
|
||||||
|
if="can.use.cyclonedx">
|
||||||
<uptodate property="antlib-sbom-ok"
|
<uptodate property="antlib-sbom-ok"
|
||||||
targetfile="${build.lib}/${artifact.stub}.cdx.json">
|
targetfile="${build.lib}/${artifact.stub}.cdx.json">
|
||||||
<srcresources>
|
<srcresources>
|
||||||
|
|
@ -102,7 +106,9 @@ under the License.
|
||||||
</cdx:componentbom>
|
</cdx:componentbom>
|
||||||
</target>
|
</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">
|
<macrodef name="distributionbom" backtrace="false">
|
||||||
<attribute name="version"/>
|
<attribute name="version"/>
|
||||||
<attribute name="archiveName"/>
|
<attribute name="archiveName"/>
|
||||||
|
|
@ -222,7 +228,7 @@ under the License.
|
||||||
</macrodef>
|
</macrodef>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="src-sboms" depends="after-dist">
|
<target name="src-sboms" depends="after-dist" if="can.use.cyclonedx">
|
||||||
<create-tarball-boms
|
<create-tarball-boms
|
||||||
distdir="${src.dist.dir}"
|
distdir="${src.dist.dir}"
|
||||||
distbase="${dist.base}"
|
distbase="${dist.base}"
|
||||||
|
|
@ -231,7 +237,7 @@ under the License.
|
||||||
binarysource="Source Distribution"/>
|
binarysource="Source Distribution"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="bin-sboms" depends="after-dist">
|
<target name="bin-sboms" depends="after-dist" if="can.use.cyclonedx">
|
||||||
<create-tarball-boms
|
<create-tarball-boms
|
||||||
distdir="${bin.dist.dir}"
|
distdir="${bin.dist.dir}"
|
||||||
distbase="${dist.base}"
|
distbase="${dist.base}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue