prepare 1.5.0 RC1

2026-06-14 14:50:14 +02:00
6 changed files with 135 additions and 32 deletions
--- a/build.xml
+++ b/build.xml
@ -29,13 +29,18 @@ under the License.
      resource="org/apache/ant/antunit/antlib.xml">
      <classpath>
        <path refid="classpath.test"/>
-        <pathelement location="${build.classes}"/>
        <pathelement location="${antlib.location}"/>
      </classpath>
    </typedef>
  </target>

-  <target name="ready-for-bin-dist" depends="create-antlib-sbom,common.ready-for-bin-dist"/>
+  <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="after-src-dist" depends="src-sboms"/>
  <target name="after-bin-dist" depends="bin-sboms"/>
--- a/changes.xml
+++ b/changes.xml
@ -37,10 +37,7 @@
    <title>Apache AntUnit</title>
  </properties>

-  <release version="1.5.1" date="unreleased">
-  </release>
-
-  <release version="1.5.0" date="2026-07-19">
+  <release version="1.5.0" date="unreleased">
    <action type="add">
      Allow the AntUnit task to use a different classloader when
      running the test by means of a nested classpath or a
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 08aa3efdbec177de04e5a9d7f9a5ca787d612a4e
+Subproject commit 4bc0835ac521a9b64a623a94225cfdbcce708193
--- a/cyclonedx.xml
+++ b/cyclonedx.xml
@ -19,26 +19,94 @@ under the License.
 -->
 <project name="cyclonedx" xmlns:ivy="antlib:org.apache.ivy.ant">

-  <target name="define-cyclonedx-components"
-          depends="define-core-ant-components"
-          if="can.use.cyclonedx">
+  <target name="define-cyclonedx-components" depends="fetch-cyclonedx">
+    <!-- common definitions for SBOMs -->
+    <cdx:organization
+        name="Apache Ant Project Management Committee"
+        id="ant-pmc"
+        xmlns:cdx="antlib:org.apache.ant.cyclonedx">
+      <url url="https://ant.apache.org/"/>
+    </cdx:organization>
+    <cdx:license
+        licenseId="Apache-2.0"
+        id="apache-2"
+        xmlns:cdx="antlib:org.apache.ant.cyclonedx">
+      <url url="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
+    </cdx:license>
+    <cdx:externalreferenceset
+        id="ant-common-refs"
+        xmlns:cdx="antlib:org.apache.ant.cyclonedx">
+      <externalReference
+          type="LICENSE"
+          url="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
+      <externalReference
+          type="MAILING_LIST"
+          url="https://ant.apache.org/mail.html"/>
+      <externalReference
+          type="SECURITY_CONTACT"
+          url="https://www.apache.org/security/"/>
+      <externalReference
+          type="rfc-9116"
+          url="https://ant.apache.org/.well-known/security.txt"/>
+    </cdx:externalreferenceset>
    <cdx:externalreferenceset
        id="antlib-ext-refs"
        xmlns:cdx="antlib:org.apache.ant.cyclonedx">
      <externalReference
          type="VCS"
          url="https://gitbox.apache.org/repos/asf/ant-antlibs-antunit.git"/>
+      <externalReference
+          type="BUILD_SYSTEM"
+          url="https://ci-builds.apache.org/job/Ant/job/AntUnit/"/>
      <externalReference
          type="ISSUE_TRACKER"
          url="https://bz.apache.org/bugzilla/buglist.cgi?component=AntUnit&amp;product=Ant"/>
+      <externalReference
+          type="WEBSITE"
+          url="https://ant.apache.org/antlibs/antunit/"/>
+      <externalReference
+          type="DISTRIBUTION"
+          url="https://ant.apache.org/antlibs/bindownload.cgi"/>
+      <externalReference
+          type="SOURCE_DISTRIBUTION"
+          url="https://ant.apache.org/antlibs/srcdownload.cgi"/>
+    </cdx:externalreferenceset>
+    <cdx:externalreferenceset
+        id="ant-ext-refs"
+        xmlns:cdx="antlib:org.apache.ant.cyclonedx">
+      <externalReference
+          type="VCS"
+          url="https://gitbox.apache.org/repos/asf/ant.git"/>
+      <externalReference
+          type="BUILD_SYSTEM"
+          url="https://ci-builds.apache.org/job/Ant/"/>
+      <externalReference
+          type="ISSUE_TRACKER"
+          url="https://bz.apache.org/bugzilla/buglist.cgi?product=Ant"/>
+      <externalReference
+          type="WEBSITE"
+          url="https://ant.apache.org/"/>
+      <externalReference
+          type="ADVISORIES"
+          url="https://ant.apache.org/security.html#Apache%20Ant%20Security%20Vulnerabilities"/>
+      <externalReference
+          type="DOCUMENTATION"
+          url="https://ant.apache.org/manual/"/>
+      <externalReference
+          type="DISTRIBUTION"
+          url="https://ant.apache.org/bindownload.cgi"/>
+      <externalReference
+          type="SOURCE_DISTRIBUTION"
+          url="https://ant.apache.org/srcdownload.cgi"/>
+      <externalReference
+          type="RELEASE_NOTES"
+          url="https://github.com/apache/ant/blob/master/WHATSNEW"/>
    </cdx:externalreferenceset>
  </target>

-  <target name="create-antlib-sbom"
-          depends="define-cyclonedx-components,antlib"
-          if="can.use.cyclonedx">
+  <target name="create-antlib-sbom" depends="define-cyclonedx-components,antlib">
    <uptodate property="antlib-sbom-ok"
-              targetfile="${build.lib}/${artifact.stub}.cdx.json">
+              targetfile="${build.lib}/${artifact.stub}-cyclonedx.json">
      <srcresources>
        <file file="${jarname}"/>
        <file file="ivy.xml"/>
@ -46,7 +114,7 @@ under the License.
      </srcresources>
    </uptodate>
    <cdx:componentbom
-        bomName="${artifact.stub}.cdx"
+        bomName="${artifact.stub}-cyclonedx"
        outputdirectory="${build.lib}"
        format="all"
        useComponentSupplier="true"
@ -65,13 +133,33 @@ under the License.
        <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="junit"/>
      </component>
-      <additionalComponent refid="ant"/>
-      <additionalComponent refid="ant-launcher"/>
+      <additionalComponent
+          name="ant"
+          group="org.apache.ant"
+          version="1.10.13"
+          isExternal="true"
+          id="ant">
+        <supplier refid="ant-pmc"/>
+        <license refid="apache-2"/>
+        <externalReferenceSet refid="ant-common-refs"/>
+        <externalReferenceSet refid="ant-ext-refs"/>
+        <dependency componentRef="ant-launcher"/>
+      </additionalComponent>
+      <additionalComponent
+          name="ant-launcher"
+          group="org.apache.ant"
+          version="1.10.13"
+          isExternal="true"
+          id="ant-launcher">
+        <supplier refid="ant-pmc"/>
+        <license refid="apache-2"/>
+        <externalReferenceSet refid="ant-common-refs"/>
+        <externalReferenceSet refid="ant-ext-refs"/>
+      </additionalComponent>
      <additionalComponent
          id="junit"
          name="junit"
@ -106,9 +194,7 @@ under the License.
    </cdx:componentbom>
  </target>

-  <target name="after-dist"
-          depends="define-cyclonedx-components"
-          if="can.use.cyclonedx">
+  <target name="after-dist" depends="define-cyclonedx-components">
    <macrodef name="distributionbom" backtrace="false">
      <attribute name="version"/>
      <attribute name="archiveName"/>
@ -128,7 +214,7 @@ under the License.
      <sequential
        xmlns:cdx="antlib:org.apache.ant.cyclonedx">
        <cdx:componentbom
-            bomName="@{archiveName}.cdx"
+            bomName="@{archiveName}.cyclonedx"
            outputdirectory="@{outputDirectory}"
            format="@{format}"
            useComponentManufacturer="@{useComponentManufacturer}"
@ -174,7 +260,6 @@ under the License.
            <supplier refid="ant-pmc"/>
            <license refid="apache-2"/>
            <externalReferenceSet refid="ant-common-refs"/>
-            <externalReferenceSet refid="antlibs-common-ext-refs"/>
            <externalReferenceSet refid="antlib-ext-refs"/>
            <moreComponentChildren/>
          </componentChildren>
@ -228,7 +313,7 @@ under the License.
    </macrodef>
  </target>

-  <target name="src-sboms" depends="after-dist" if="can.use.cyclonedx">
+  <target name="src-sboms" depends="after-dist">
    <create-tarball-boms
        distdir="${src.dist.dir}"
        distbase="${dist.base}"
@ -237,7 +322,7 @@ under the License.
        binarysource="Source Distribution"/>
  </target>

-  <target name="bin-sboms" depends="after-dist" if="can.use.cyclonedx">
+  <target name="bin-sboms" depends="after-dist">
    <create-tarball-boms
        distdir="${bin.dist.dir}"
        distbase="${dist.base}"
@ -246,10 +331,23 @@ under the License.
        binarysource="Binary Distribution">
      <component>
        <sbomLink>
-          <file file="${bin.dist.dir}/${artifact.stub}.cdx.json"/>
+          <file file="${bin.dist.dir}/${artifact.stub}-cyclonedx.json"/>
        </sbomLink>
        <file file="${bin.dist.dir}/${artifact.stub}.jar"/>
      </component>
    </create-tarball-boms>
  </target>
+
+  <target name="fetch-cyclonedx" depends="resolve" if="with.ivy">
+    <ivy:cachepath organisation="org.apache.ant"
+                   module="ant-cyclonedx"
+                   revision="0.1"
+                   inline="true"
+                   conf="default"
+                   pathid="cyclonedx.classpath"
+                   log="download-only"/>
+    <typedef uri="antlib:org.apache.ant.cyclonedx"
+             resource="org/apache/ant/cyclonedx/antlib.xml"
+             classpathref="cyclonedx.classpath"/>
+  </target>
 </project>
--- a/ivy.xml
+++ b/ivy.xml
@ -55,10 +55,14 @@
              e:classifier="ivy"/>
    <artifact name="${artifact.name}" type="ivy.asc" ext="xml.asc"
              e:classifier="ivy"/>
-    <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"/>
+    <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"/>
  </publications>
  <dependencies>
    <dependency org="junit" name="junit" rev="4.13.2" conf="default"/>
--- a/version.properties
+++ b/version.properties
@ -12,5 +12,4 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-artifact.version=1.5.1alpha
-ant.core.version=1.10.13
+artifact.version=1.5.0