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 e6ed5aa user common setup for SBOM
e6ed5aa is described below
commit e6ed5aa2efa74bea02fe1296b1dd75e9695f56b5
Author: Stefan Bodewig <[email protected]>
AuthorDate: Fri Jun 19 18:21:13 2026 +0200
user common setup for SBOM
---
build.xml | 102 +++++------------------------------------------------
common | 2 +-
version.properties | 1 +
3 files changed, 11 insertions(+), 94 deletions(-)
diff --git a/build.xml b/build.xml
index 3756f04..3372fea 100644
--- a/build.xml
+++ b/build.xml
@@ -28,7 +28,7 @@ under the License.
</copy>
</target>
- <target name="define-cyclonedx-components" depends="antlib">
+ <target name="fetch-cyclonedx" depends="antlib">
<typedef uri="antlib:org.apache.ant.cyclonedx"
resource="org/apache/ant/cyclonedx/antlib.xml">
<classpath>
@@ -36,35 +36,10 @@ under the License.
<pathelement location="${jarname}"/>
</classpath>
</typedef>
- <!-- 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>
+
+ <target name="define-cyclonedx-components"
+ depends="define-core-ant-components">
<cdx:externalreferenceset
id="antlib-ext-refs"
xmlns:cdx="antlib:org.apache.ant.cyclonedx">
@@ -77,49 +52,9 @@ under the License.
<externalReference
type="ISSUE_TRACKER"
url="https://bz.apache.org/bugzilla/buglist.cgi?component=CycloneDX%20Antlib&product=Ant"/>
- <externalReference
- type="WEBSITE"
- url="https://ant.apache.org/antlibs/cyclonedx/"/>
<externalReference
type="DOCUMENTATION"
url="https://ant.apache.org/antlibs/cyclonedx/manual/"/>
- <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>
@@ -152,34 +87,14 @@ 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="ant-launcher"/>
<dependency componentRef="cyclonedx-core"/>
</component>
- <additionalComponent
- name="ant"
- group="org.apache.ant"
- version="1.10.17"
- 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.17"
- 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"/>
<additionalComponent
publisher="OWASP Foundation"
group="org.cyclonedx"
@@ -368,6 +283,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>
diff --git a/common b/common
index 0a4c07a..2d73d59 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0a4c07a07a44bb60f90e368f7851da3deee3e35b
+Subproject commit 2d73d593815a9a6009a1bc89743bfdc7d7de0d8e
diff --git a/version.properties b/version.properties
index 4c5e1e2..5152f52 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=0.2alpha
+ant.core.version=1.10.17
