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


The following commit(s) were added to refs/heads/main by this push:
     new 66199c1  archiveUrl is wrong
66199c1 is described below

commit 66199c153c8fcec792b286ac569484a8bb8cb327
Author: Stefan Bodewig <[email protected]>
AuthorDate: Thu Jun 4 08:47:49 2026 +0200

    archiveUrl is wrong
---
 build.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 3f9915d..1619060 100644
--- a/build.xml
+++ b/build.xml
@@ -333,6 +333,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"/>
@@ -342,7 +343,7 @@ under the License.
             outputdirectory="@{distbase}"
             version="${artifact.version}"
             archiveName="${dist.name}-@{binsrc}.@{ext}"
-            
archiveUrl="https://archive.apache.org/dist/ant/antlibs/cyclonedx/${dist.name}-@{binsrc}.@{ext}";
+            
archiveUrl="https://archive.apache.org/dist/ant/antlibs/cyclonedx/@{subdir}/${dist.name}-@{binsrc}.@{ext}";
             archiveLocation="@{distbase}/${dist.name}-@{binsrc}.@{ext}"
             description="Apache CycloneDX Antlib @{binarysource}"
             publisher="The Apache Software Foundation"
@@ -368,6 +369,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"/>
@@ -375,6 +377,7 @@ under the License.
         <create-tarball-bom
             distdir="@{distdir}"
             distbase="@{distbase}"
+            subdir="@{subdir}"
             binsrc="@{binsrc}"
             binarysource="@{binarysource}"
             ext="tar.gz">
@@ -383,6 +386,7 @@ under the License.
         <create-tarball-bom
             distdir="@{distdir}"
             distbase="@{distbase}"
+            subdir="@{subdir}"
             binsrc="@{binsrc}"
             binarysource="@{binarysource}"
             ext="tar.bz2">
@@ -391,6 +395,7 @@ under the License.
         <create-tarball-bom
             distdir="@{distdir}"
             distbase="@{distbase}"
+            subdir="@{subdir}"
             binsrc="@{binsrc}"
             binarysource="@{binarysource}"
             ext="zip">
@@ -404,6 +409,7 @@ under the License.
     <create-tarball-boms
         distdir="${src.dist.dir}"
         distbase="${dist.base}"
+        subdir="source"
         binsrc="src"
         binarysource="Source Distribution"/>
   </target>
@@ -412,6 +418,7 @@ under the License.
     <create-tarball-boms
         distdir="${bin.dist.dir}"
         distbase="${dist.base}"
+        subdir="binaries"
         binsrc="bin"
         binarysource="Binary Distribution">
       <component>
@@ -427,6 +434,7 @@ under the License.
     <create-tarball-boms
         distdir="${bin.dist.dir}"
         distbase="${dist.base}"
+        subdir="binaries"
         binsrc="bin-withdeps"
         binarysource="Binary Distribution Including Dependencies">
       <component>

Reply via email to