diff --git a/ReleaseInstructions b/ReleaseInstructions
index f87c65ad5f..b89e642eef 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -158,7 +158,7 @@ Note: This document was adapted from the one created in the context of
b. Using gpg
$ for i in distribution/*/*.zip distribution/*/*.gz distribution/*/*.bz2 distribution/*/*.xz; do gpg --use-agent --detach-sign --armor $i; done
- $ for i in java-repository/org/apache/ant/ant*/*/*.jar java-repository/org/apache/ant/ant*/*/*.pom; do gpg --use-agent --detach-sign --armor $i; done
+ $ for i in java-repository/org/apache/ant/ant*/*/*.jar java-repository/org/apache/ant/ant*/*/*.pom java-repository/org/apache/ant/ant*/*/*-cyclonedx.*; do gpg --use-agent --detach-sign --armor $i; done
11. Convert the part of the WHATSNEW file covering the changes
since the last release into HTML for the README file on the
diff --git a/build.xml b/build.xml
index 5fd0edecfb..12a5c5d287 100644
--- a/build.xml
+++ b/build.xml
@@ -46,7 +46,7 @@
-
+
@@ -193,7 +193,7 @@
-
+
@@ -440,16 +440,16 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
@@ -748,7 +748,7 @@
-
+
@@ -1030,7 +1030,7 @@
Create the essential distribution that can run Apache Ant
===================================================================
-->
-
@@ -1415,6 +1415,12 @@
+
+
+
+
+
+
@@ -1984,19 +1990,19 @@ ${antunit.reports}
+ unless="apache-bsf.present"/>
+ unless="apache-bsf.present"/>
+ unless="apache-bsf.present"/>
+ unless="apache-bsf.present"/>
@@ -2020,7 +2026,7 @@ ${antunit.reports}
+ unless="apache-resolver.present"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fetch.xml b/fetch.xml
index d223ecb8d1..da05846478 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -388,8 +388,14 @@ Set -Ddest=LOCATION on the command line
+
+
+
+
+ javamail,jakartamail,jspc,jai,xz,junit-engine-vintage,junit-engine-jupiter,netrexx,cyclonedx-core-java"/>
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 99e63d1097..00d3a6d1f3 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -42,6 +42,7 @@ bsh.version=2.0b5
commons-net.version=3.10.0
commons-logging.version=1.1
commons-logging-api.version=${commons-logging.version}
+cyclonedx-core-java.version=12.2.0
js.version=20.1.0
js-scriptengine.version=${js.version}
# Note - When updating the hamcrest version here, make sure to also update the
diff --git a/release/ivy.xml b/release/ivy.xml
index 1b414d9c7a..940f13d4d9 100644
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@ -31,156 +31,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+