From e38891055a42ad9694da2d672ec62f45023284e9 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 4 Jun 2026 08:44:49 +0200
Subject: [PATCH] archiveUrl is wrong

---
 cyclonedx.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cyclonedx.xml b/cyclonedx.xml
index aaf42e4..3e055e0 100644
--- a/cyclonedx.xml
+++ b/cyclonedx.xml
@@ -235,6 +235,7 @@ under the License.
     <macrodef name="create-tarball-bom">
       <attribute name="distdir"/>
       <attribute name="distbase"/>
+      <attribute name="subdir"/>
       <attribute name="binsrc"/>
       <attribute name="binarysource"/>
       <attribute name="ext"/>
@@ -244,7 +245,7 @@ under the License.
             outputdirectory="@{distbase}"
             version="${artifact.version}"
             archiveName="${dist.name}-@{binsrc}.@{ext}"
-            archiveUrl="https://archive.apache.org/dist/ant/antlibs/antunit/${dist.name}-@{binsrc}.@{ext}"
+            archiveUrl="https://archive.apache.org/dist/ant/antlibs/antunit/@{subdir}/${dist.name}-@{binsrc}.@{ext}"
             archiveLocation="@{distbase}/${dist.name}-@{binsrc}.@{ext}"
             description="Apache AntUnit @{binarysource}"
             publisher="The Apache Software Foundation"
@@ -270,6 +271,7 @@ under the License.
     <macrodef name="create-tarball-boms">
       <attribute name="distdir"/>
       <attribute name="distbase"/>
+      <attribute name="subdir"/>
       <attribute name="binsrc"/>
       <attribute name="binarysource"/>
       <element name="componentChildren" implicit="true" optional="true"/>
@@ -277,6 +279,7 @@ under the License.
         <create-tarball-bom
             distdir="@{distdir}"
             distbase="@{distbase}"
+            subdir="@{subdir}"
             binsrc="@{binsrc}"
             binarysource="@{binarysource}"
             ext="tar.gz">
@@ -285,6 +288,7 @@ under the License.
         <create-tarball-bom
             distdir="@{distdir}"
             distbase="@{distbase}"
+            subdir="@{subdir}"
             binsrc="@{binsrc}"
             binarysource="@{binarysource}"
             ext="tar.bz2">
@@ -293,6 +297,7 @@ under the License.
         <create-tarball-bom
             distdir="@{distdir}"
             distbase="@{distbase}"
+            subdir="@{subdir}"
             binsrc="@{binsrc}"
             binarysource="@{binarysource}"
             ext="zip">
@@ -306,6 +311,7 @@ under the License.
     <create-tarball-boms
         distdir="${src.dist.dir}"
         distbase="${dist.base}"
+        subdir="source"
         binsrc="src"
         binarysource="Source Distribution"/>
   </target>
@@ -314,6 +320,7 @@ under the License.
     <create-tarball-boms
         distdir="${bin.dist.dir}"
         distbase="${dist.base}"
+        subdir="binaries"
         binsrc="bin"
         binarysource="Binary Distribution">
       <component>