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 16204eb1a5f819533020283f61a9d145131c30dc Author: Stefan Bodewig <[email protected]> AuthorDate: Fri May 22 09:47:14 2026 +0200 log something when you perform work --- src/main/org/apache/ant/cyclonedx/Component.java | 16 ++++++++++++++++ src/main/org/apache/ant/cyclonedx/ComponentBomTask.java | 3 +++ 2 files changed, 19 insertions(+) diff --git a/src/main/org/apache/ant/cyclonedx/Component.java b/src/main/org/apache/ant/cyclonedx/Component.java index 52b93e9..0a26fbb 100644 --- a/src/main/org/apache/ant/cyclonedx/Component.java +++ b/src/main/org/apache/ant/cyclonedx/Component.java @@ -21,6 +21,7 @@ import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.Union; +import org.apache.tools.ant.types.resources.URLProvider; import org.cyclonedx.Version; import org.cyclonedx.exception.ParseException; @@ -831,6 +832,7 @@ public class Component extends DataType { throw new BuildException("sbomLink requires exactly one nested resource"); } Resource sbom = sbomLink.iterator().next(); + logSbom(sbom); try (InputStream data = sbom.getInputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream()) { byte[] buf = new byte[4096]; @@ -849,6 +851,20 @@ public class Component extends DataType { } } + private void logSbom(Resource r) { + String name = r.getName(); + FileProvider fp = r.as(FileProvider.class); + if (fp != null) { + name = fp.getFile().getAbsolutePath(); + } else { + URLProvider up = r.as(URLProvider.class); + if (up != null) { + name = up.getURL().toExternalForm(); + } + } + log("reading SBOM from " + name, Project.MSG_VERBOSE); + } + /** * Represents a dependency of a component. */ diff --git a/src/main/org/apache/ant/cyclonedx/ComponentBomTask.java b/src/main/org/apache/ant/cyclonedx/ComponentBomTask.java index 929f2bc..351ef8b 100644 --- a/src/main/org/apache/ant/cyclonedx/ComponentBomTask.java +++ b/src/main/org/apache/ant/cyclonedx/ComponentBomTask.java @@ -366,6 +366,7 @@ public class ComponentBomTask extends Task { private void writeBom(Bom bom, Format format, File bomFile) throws IOException, GeneratorException { + log("creating CycloneDX SBOM " + bomFile); switch (format) { case JSON: writeJsonBom(bom, bomFile); @@ -373,6 +374,8 @@ public class ComponentBomTask extends Task { case XML: writeXmlBom(bom, bomFile); break; + default: + throw new BuildException("unsupported format " + format); } }
