From dd50ea5b41941dbe562c110a15ed1085706a7fd5 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 20 Jun 2026 07:54:13 +0200
Subject: [PATCH] adjust ivy.xml

---
 build.xml |  8 +-------
 common    |  2 +-
 ivy.xml   | 12 ++++--------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index 46b64ce..606fae3 100644
--- a/build.xml
+++ b/build.xml
@@ -35,13 +35,7 @@ under the License.
     </typedef>
   </target>
 
-  <target name="ready-for-bin-dist" depends="create-antlib-sbom,common.ready-for-bin-dist">
-    <resources id="additional-bin-patterns">
-      <fileset dir="${build.lib}">
-        <include name="${artifact.stub}-cyclonedx*"/>
-      </fileset>
-    </resources>
-  </target>
+  <target name="ready-for-bin-dist" depends="create-antlib-sbom,common.ready-for-bin-dist"/>
 
   <target name="after-src-dist" depends="src-sboms"/>
   <target name="after-bin-dist" depends="bin-sboms"/>
diff --git a/common b/common
index b24e42f..633b516 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b24e42f26da431ca6c2a7c793f2fda855f8154d7
+Subproject commit 633b516480636cae18ef360df023192f48240fe7
diff --git a/ivy.xml b/ivy.xml
index baf3474..fc03195 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -55,14 +55,10 @@
               e:classifier="ivy"/>
     <artifact name="${artifact.name}" type="ivy.asc" ext="xml.asc"
               e:classifier="ivy"/>
-    <artifact name="${artifact.name}" type="cyclonedx.xml" ext="xml"
-              e:classifier="cyclonedx"/>
-    <artifact name="${artifact.name}" type="cyclonedx.xml.asc" ext="xml.asc"
-              e:classifier="cyclonedx"/>
-    <artifact name="${artifact.name}" type="cyclonedx.json" ext="json"
-              e:classifier="cyclonedx"/>
-    <artifact name="${artifact.name}" type="cyclonedx.json.asc" ext="json.asc"
-              e:classifier="cyclonedx"/>
+    <artifact name="${artifact.name}" type="cyclonedx.xml" ext="cdx.xml"/>
+    <artifact name="${artifact.name}" type="cyclonedx.xml.asc" ext="cdx.xml.asc"/>
+    <artifact name="${artifact.name}" type="cyclonedx.json" ext="cdx.json"/>
+    <artifact name="${artifact.name}" type="cyclonedx.json.asc" ext="cdx.json.asc"/>
   </publications>
   <dependencies>
     <dependency org="junit" name="junit" rev="4.13.2" conf="default"/>