This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-props.git
The following commit(s) were added to refs/heads/master by this push:
new ab56351 upgrade commons, use extracted cyclonedx logic
ab56351 is described below
commit ab5635182e14b56b874af7fe75a1ce476b6fa34c
Author: Stefan Bodewig <[email protected]>
AuthorDate: Fri Jun 19 10:53:53 2026 +0200
upgrade commons, use extracted cyclonedx logic
---
common | 2 +-
cyclonedx.xml | 114 ++++-------------------------------------------------
version.properties | 1 +
3 files changed, 9 insertions(+), 108 deletions(-)
diff --git a/common b/common
index 193a290..61572be 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 193a2904ae07328a5960bfe2ee975814b26f0b16
+Subproject commit 61572be36ce8cce5314b3f16fa3e9c6c17b3e3fe
diff --git a/cyclonedx.xml b/cyclonedx.xml
index 66650ab..473ac52 100644
--- a/cyclonedx.xml
+++ b/cyclonedx.xml
@@ -19,36 +19,7 @@ under the License.
-->
<project name="cyclonedx" xmlns:ivy="antlib:org.apache.ivy.ant">
- <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>
+ <target name="define-cyclonedx-components"
depends="define-core-ant-components">
<cdx:externalreferenceset
id="antlib-ext-refs"
xmlns:cdx="antlib:org.apache.ant.cyclonedx">
@@ -61,50 +32,11 @@ under the License.
<externalReference
type="ISSUE_TRACKER"
url="https://bz.apache.org/bugzilla/buglist.cgi?component=Props+Antlib&product=Ant"/>
- <externalReference
- type="WEBSITE"
- url="https://ant.apache.org/antlibs/props/"/>
- <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">
+ <target name="create-antlib-sbom"
+
depends="define-cyclonedx-components,antlib,define-core-ant-components">
<uptodate property="antlib-sbom-ok"
targetfile="${build.lib}/${artifact.stub}-cyclonedx.json">
<srcresources>
@@ -133,32 +65,12 @@ 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"/>
</component>
- <additionalComponent
- name="ant"
- group="org.apache.ant"
- version="1.8.0"
- 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.8.0"
- 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 refid="ant"/>
+ <additionalComponent refid="ant-launcher"/>
<license refid="apache-2"/>
</cdx:componentbom>
</target>
@@ -229,6 +141,7 @@ 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>
@@ -306,17 +219,4 @@ under the License.
</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>
diff --git a/version.properties b/version.properties
index e7fa985..3762462 100644
--- a/version.properties
+++ b/version.properties
@@ -13,3 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
artifact.version=1.0Alpha
+ant.core.version=1.8.0
