This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ant-antlibs-cyclonedx.git
commit 4d48e6348e0e2af714fb5df03fbafc140834aa45 Author: Stefan Bodewig <[email protected]> AuthorDate: Mon Aug 17 18:53:34 2026 +0200 make Ivy SBOM creation the default --- build.xml | 177 ++------------------------------------------------------------ 1 file changed, 3 insertions(+), 174 deletions(-) diff --git a/build.xml b/build.xml index 6c17448..a13aa19 100644 --- a/build.xml +++ b/build.xml @@ -111,12 +111,12 @@ under the License. </cdx:externalreferenceset> </target> - <target name="create-antlib-sbom-ivy" + <target name="create-antlib-sbom" depends="define-cyclonedx-components" if="can.use.cyclonedx" xmlns:cdx="antlib:org.apache.ant.cyclonedx"> <uptodate property="antlib-sbom-ok" - targetfile="${build.lib}/${artifact.stub}.ivy.cdx.json"> + targetfile="${build.lib}/${artifact.stub}.cdx.json"> <srcresources> <file file="${jarname}"/> <file file="ivy.xml"/> @@ -124,7 +124,7 @@ under the License. </srcresources> </uptodate> <cdx:componentbom - bomName="${artifact.stub}.ivy.cdx" + bomName="${artifact.stub}.cdx" outputdirectory="${build.lib}" format="all" useComponentSupplier="true" @@ -178,177 +178,6 @@ under the License. </cdx:componentbom> </target> - <target name="create-antlib-sbom" - depends="define-cyclonedx-components" - if="can.use.cyclonedx" - xmlns:cdx="antlib:org.apache.ant.cyclonedx"> - <uptodate property="antlib-sbom-ok" - targetfile="${build.lib}/${artifact.stub}.cdx.json"> - <srcresources> - <file file="${jarname}"/> - <file file="ivy.xml"/> - <file file="build.xml"/> - </srcresources> - </uptodate> - <cdx:componentbom - bomName="${artifact.stub}.cdx" - outputdirectory="${build.lib}" - format="all" - useComponentSupplier="true" - useComponentManufacturer="true" - unless:set="antlib-sbom-ok" - xmlns:unless="ant:unless"> - <component - name="${artifact.name}" - group="org.apache.ant" - version="${artifact.version}" - description="Apache CycloneDX Antlib" - publisher="The Apache Software Foundation" - supplierIsManufacturer="true"> - <file file="${jarname}"/> - <supplier refid="ant-pmc"/> - <license refid="apache-2"/> - <externalReferenceSet refid="ant-common-refs"/> - <externalReferenceSet refid="antlibs-common-ext-refs"/> - <externalReferenceSet refid="antlib-ext-refs"/> - <dependency componentRef="ant"/> - <dependency componentRef="ant-launcher"/> - <dependency componentRef="cyclonedx-core"/> - <dependency componentRef="commons-codec"/> - <dependency componentRef="apache-ivy"/> - </component> - <additionalComponent refid="ant"/> - <additionalComponent refid="ant-launcher"/> - <additionalComponent - publisher="OWASP Foundation" - group="org.cyclonedx" - name="cyclonedx-core-java" - version="13.1.0" - description="The CycloneDX core module provides a model representation of the BOM along with utilities to assist in creating, parsing, and validating BOMs." - id="cyclonedx-core"> - <file file="${lib.dir.compile}/cyclonedx-core-java-13.1.0.jar"/> - <license refid="apache-2"/> - <externalReference - type="website" - url="https://github.com/CycloneDX/cyclonedx-core-java"/> - <externalReference - type="build-system" - url="https://github.com/CycloneDX/cyclonedx-core-java/actions"/> - <externalReference - type="distribution-intake" - url="https://oss.sonatype.org/service/local/staging/deploy/maven2/"/> - <externalReference - type="issue-tracker" - url="https://github.com/CycloneDX/cyclonedx-core-java/issues"/> - <externalReference - type="vcs" - url="https://github.com/CycloneDX/cyclonedx-core-java.git"/> - <dependency componentRef="commons-codec"/> - <dependency componentRef="commons-io"/> - <dependency componentRef="commons-lang3"/> - <dependency componentRef="commons-collections4"/> - <dependency componentRef="packageurl-java"/> - <dependency componentRef="jackson-dataformat-xml"/> - <dependency componentRef="json-schema-validator"/> - </additionalComponent> - <additionalComponent id="commons-codec"> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/commons-codec/commons-codec/1.22.1/commons-codec-1.22.1-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/commons-codec-1.22.1.jar"/> - </additionalComponent> - <additionalComponent id="commons-io"> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/commons-io/commons-io/2.22.0/commons-io-2.22.0-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/commons-io-2.22.0.jar"/> - </additionalComponent> - <additionalComponent id="commons-lang3"> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.20.0/commons-lang3-3.20.0-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/commons-lang3-3.20.0.jar"/> - </additionalComponent> - <additionalComponent id="commons-collections4"> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/org/apache/commons/commons-collections4/4.5.0/commons-collections4-4.5.0-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/commons-collections4-4.5.0.jar"/> - </additionalComponent> - <additionalComponent - group="com.github.package-url" - name="packageurl-java" - version="1.5.0" - description='The official Java implementation of the PackageURL specification. PackageURL (purl) is a minimal specification for describing a package via a "mostly universal" URL' - id="packageurl-java"> - <file file="${lib.dir.compile}/packageurl-java-1.5.0.jar"/> - <license licenseId="MIT"> - <url url="https://opensource.org/licenses/MIT"/> - </license> - </additionalComponent> - <additionalComponent id="jackson-dataformat-xml"> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.22.1/jackson-dataformat-xml-2.22.1-sbom-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/jackson-dataformat-xml-2.22.1.jar"/> - </additionalComponent> - <additionalComponent> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.22.1/jackson-core-2.22.1-sbom-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/jackson-core-2.22.1.jar"/> - </additionalComponent> - <additionalComponent> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.22/jackson-annotations-2.22-sbom-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/jackson-annotations-2.22.jar"/> - </additionalComponent> - <additionalComponent> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.22.1/jackson-databind-2.22.1-sbom-cyclonedx.json"/> - </cdx:sbomLink> - <file file="${lib.dir.compile}/jackson-databind-2.22.1.jar"/> - </additionalComponent> - <additionalComponent - group="com.fasterxml.woodstox" - name="woodstox-core" - version="7.2.0" - description='Woodstox is a high-performance XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs' - unknownDependencies="true"> - <file file="${lib.dir.compile}/woodstox-core-7.2.0.jar"/> - <license refid="apache-2"/> - </additionalComponent> - <additionalComponent - group="org.codehaus.woodstox" - name="stax2-api" - version="4.3.0" - description='Stax2 API is an extension to basic Stax 1.0 API that adds significant new functionality, such as full-featured bi-direction validation interface and high-performance Typed Access API.'> - <file file="${lib.dir.compile}/stax2-api-4.3.0.jar"/> - <license licenseId="BSD-2-Clause"> - <url url="http://www.opensource.org/licenses/bsd-license.php"/> - </license> - </additionalComponent> - <additionalComponent - group="com.networknt" - name="json-schema-validator" - version="2.0.4" - description='A json schema validator that supports draft v4, v6, v7, v2019-09 and v2020-12' - unknownDependencies="true" - id="json-schema-validator"> - <file file="${lib.dir.compile}/json-schema-validator-2.0.4.jar"/> - <license refid="apache-2"/> - </additionalComponent> - <additionalComponent id="apache-ivy"> - <cdx:sbomLink> - <url url="https://repo1.maven.org/maven2/org/apache/ivy/ivy/2.6.0/ivy-2.6.0.cdx.json"/> - </cdx:sbomLink> - <file file="ivy/ivy.jar"/> - </additionalComponent> - <license refid="apache-2"/> - </cdx:componentbom> - </target> - <target name="ready-for-bin-dist" depends="create-antlib-sbom,common.ready-for-bin-dist"/> <target name="after-dist"
