From 24268f6da06221a89fc355483b5e03ba9fc9de53 Mon Sep 17 00:00:00 2001
From: Neil C Smith <neilcsmith@apache.org>
Date: Tue, 7 Apr 2026 14:01:59 +0100
Subject: [PATCH] Upgrade the bundled Ant version to 1.10.16

---
 extide/o.apache.tools.ant.module/arch.xml     |  2 +-
 extide/o.apache.tools.ant.module/build.xml    | 10 ++--
 ...15-license.txt => ant-1.10.16-license.txt} |  6 +--
 ...0.15-notice.txt => ant-1.10.16-notice.txt} |  2 +-
 .../external/binaries-list                    |  2 +-
 .../external/build.xml                        | 48 +++++++++----------
 .../nbproject/project.properties              |  2 +-
 7 files changed, 36 insertions(+), 36 deletions(-)
 rename extide/o.apache.tools.ant.module/external/{ant-1.10.15-license.txt => ant-1.10.16-license.txt} (99%)
 rename extide/o.apache.tools.ant.module/external/{ant-1.10.15-notice.txt => ant-1.10.16-notice.txt} (83%)

diff --git a/extide/o.apache.tools.ant.module/arch.xml b/extide/o.apache.tools.ant.module/arch.xml
index 999c48eed7bc..fce48fa8207b 100644
--- a/extide/o.apache.tools.ant.module/arch.xml
+++ b/extide/o.apache.tools.ant.module/arch.xml
@@ -314,7 +314,7 @@
             <li>
                 <api group="java" name="Ant" type="import" category="third" url="https://ant.apache.org">
                     Ant itself, of course.
-                    1.8.0+ is required, 1.10.15 recommended (and currently bundled); some features may be limited to newer versions.
+                    1.8.0+ is required, 1.10.16 recommended (and currently bundled); some features may be limited to newer versions.
                 </api>
             </li>
         </ol>
diff --git a/extide/o.apache.tools.ant.module/build.xml b/extide/o.apache.tools.ant.module/build.xml
index b0b90b1d5daf..8ef1f42392c4 100644
--- a/extide/o.apache.tools.ant.module/build.xml
+++ b/extide/o.apache.tools.ant.module/build.xml
@@ -54,18 +54,18 @@
     </target>
 
     <target name="netbeans-extra" depends="jar-bridge">
-        <unzip src="external/apache-ant-1.10.15-bin.zip" dest="build"/>
+        <unzip src="external/apache-ant-1.10.16-bin.zip" dest="build"/>
         <mkdir dir="${cluster}/ant/lib"/>
         <copy todir="${cluster}/ant/lib">
-            <fileset dir="build/apache-ant-1.10.15/lib" includes="*.jar"/>
+            <fileset dir="build/apache-ant-1.10.16/lib" includes="*.jar"/>
         </copy>
         <mkdir dir="${cluster}/ant/bin"/>
         <copy todir="${cluster}/ant/bin">
-            <fileset dir="build/apache-ant-1.10.15/bin"/>
+            <fileset dir="build/apache-ant-1.10.16/bin"/>
         </copy>
         <mkdir dir="${cluster}/ant/etc"/>
         <copy todir="${cluster}/ant/etc">
-            <fileset dir="build/apache-ant-1.10.15/etc"/>
+            <fileset dir="build/apache-ant-1.10.16/etc"/>
         </copy>
     </target>
 
@@ -84,7 +84,7 @@
             <fileset dir="${cluster}">
                 <include name="ant/lib/*.jar"/>
             </fileset>
-            <mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.15.jar"/>
+            <mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.10.16.jar"/>
         </copy>
         <copy file="${cluster}/ant/nblib/bridge.jar" tofile="${dir}/org-apache-tools-ant-module-bridge.jar"/>
         <!-- XXX ought to only do this in case jnlp.sign.jars=true -->
diff --git a/extide/o.apache.tools.ant.module/external/ant-1.10.15-license.txt b/extide/o.apache.tools.ant.module/external/ant-1.10.16-license.txt
similarity index 99%
rename from extide/o.apache.tools.ant.module/external/ant-1.10.15-license.txt
rename to extide/o.apache.tools.ant.module/external/ant-1.10.16-license.txt
index 42cc44bd8fb4..7e4f8fd6c4fc 100644
--- a/extide/o.apache.tools.ant.module/external/ant-1.10.15-license.txt
+++ b/extide/o.apache.tools.ant.module/external/ant-1.10.16-license.txt
@@ -1,10 +1,10 @@
 Name: Apache Ant
 Origin: Apache Software Foundation
-Version: 1.10.15
-Files: apache-ant-1.10.15-bin.zip
+Version: 1.10.16
+Files: apache-ant-1.10.16-bin.zip
 Description: Ant build tool.
 License: Apache-2.0-ant
-URL: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.15-bin.zip
+URL: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.16-bin.zip
 
 /*
  *                                 Apache License
diff --git a/extide/o.apache.tools.ant.module/external/ant-1.10.15-notice.txt b/extide/o.apache.tools.ant.module/external/ant-1.10.16-notice.txt
similarity index 83%
rename from extide/o.apache.tools.ant.module/external/ant-1.10.15-notice.txt
rename to extide/o.apache.tools.ant.module/external/ant-1.10.16-notice.txt
index e9d221aa9653..c5de537d255d 100644
--- a/extide/o.apache.tools.ant.module/external/ant-1.10.15-notice.txt
+++ b/extide/o.apache.tools.ant.module/external/ant-1.10.16-notice.txt
@@ -1,5 +1,5 @@
 Apache Ant
-Copyright 1999-2024 The Apache Software Foundation
+Copyright 1999-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
diff --git a/extide/o.apache.tools.ant.module/external/binaries-list b/extide/o.apache.tools.ant.module/external/binaries-list
index 2ec11cfa19b9..a7d3e5346e83 100644
--- a/extide/o.apache.tools.ant.module/external/binaries-list
+++ b/extide/o.apache.tools.ant.module/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-1B460A543CAF0B2087FEF210C7B4813909901FDC https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.15-bin.zip apache-ant-1.10.15-bin.zip
+9B5A81EF394C1C9BFFABC55AD25147FC41C9F784 https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.16-bin.zip apache-ant-1.10.16-bin.zip
diff --git a/extide/o.apache.tools.ant.module/external/build.xml b/extide/o.apache.tools.ant.module/external/build.xml
index 9a26f4d5a5f3..8cf4c3fa98f6 100644
--- a/extide/o.apache.tools.ant.module/external/build.xml
+++ b/extide/o.apache.tools.ant.module/external/build.xml
@@ -24,31 +24,31 @@
         <mkdir dir="lib"/>
         <copy todir="lib">
             <fileset dir=".">
-                <include name="ant-antlr-1.10.15.jar" />
-                <include name="ant-apache-bcel-1.10.15.jar" />
-                <include name="ant-apache-bsf-1.10.15.jar" />
-                <include name="ant-apache-log4j-1.10.15.jar" />
-                <include name="ant-apache-oro-1.10.15.jar" />
-                <include name="ant-apache-regexp-1.10.15.jar" />
-                <include name="ant-apache-resolver-1.10.15.jar" />
-                <include name="ant-apache-xalan2-1.10.15.jar" />
-                <include name="ant-commons-logging-1.10.15.jar" />
-                <include name="ant-commons-net-1.10.15.jar" />
-                <include name="ant-jai-1.10.15.jar" />
-                <include name="ant-javamail-1.10.15.jar" />
-                <include name="ant-jdepend-1.10.15.jar" />
-                <include name="ant-jmf-1.10.15.jar" />
-                <include name="ant-jsch-1.10.15.jar" />
-                <include name="ant-junit-1.10.15.jar" />
-                <include name="ant-junit4-1.10.15.jar" />
-                <include name="ant-launcher-1.10.15.jar" />
-                <include name="ant-netrexx-1.10.15.jar" />
-                <include name="ant-swing-1.10.15.jar" />
-                <include name="ant-testutil-1.10.15.jar" />
-                <include name="ant-xz-1.10.15.jar" />
-                <include name="ant-1.10.15.jar" />
+                <include name="ant-antlr-1.10.16.jar" />
+                <include name="ant-apache-bcel-1.10.16.jar" />
+                <include name="ant-apache-bsf-1.10.16.jar" />
+                <include name="ant-apache-log4j-1.10.16.jar" />
+                <include name="ant-apache-oro-1.10.16.jar" />
+                <include name="ant-apache-regexp-1.10.16.jar" />
+                <include name="ant-apache-resolver-1.10.16.jar" />
+                <include name="ant-apache-xalan2-1.10.16.jar" />
+                <include name="ant-commons-logging-1.10.16.jar" />
+                <include name="ant-commons-net-1.10.16.jar" />
+                <include name="ant-jai-1.10.16.jar" />
+                <include name="ant-javamail-1.10.16.jar" />
+                <include name="ant-jdepend-1.10.16.jar" />
+                <include name="ant-jmf-1.10.16.jar" />
+                <include name="ant-jsch-1.10.16.jar" />
+                <include name="ant-junit-1.10.16.jar" />
+                <include name="ant-junit4-1.10.16.jar" />
+                <include name="ant-launcher-1.10.16.jar" />
+                <include name="ant-netrexx-1.10.16.jar" />
+                <include name="ant-swing-1.10.16.jar" />
+                <include name="ant-testutil-1.10.16.jar" />
+                <include name="ant-xz-1.10.16.jar" />
+                <include name="ant-1.10.16.jar" />
             </fileset>
-            <globmapper from="*-1.10.15.jar" to="*.jar"/>
+            <globmapper from="*-1.10.16.jar" to="*.jar"/>
         </copy>
     </target>
     <target name="clean">
diff --git a/extide/o.apache.tools.ant.module/nbproject/project.properties b/extide/o.apache.tools.ant.module/nbproject/project.properties
index d567390351f8..ece6ab19765a 100644
--- a/extide/o.apache.tools.ant.module/nbproject/project.properties
+++ b/extide/o.apache.tools.ant.module/nbproject/project.properties
@@ -26,7 +26,7 @@ extra.module.files=\
     ant/lib/,\
     ant/bin/,\
     ant/etc/
-extra.license.files=external/ant-1.10.15-license.txt
+extra.license.files=external/ant-1.10.16-license.txt
 nbm.executable.files=\
     ant/bin/ant,\
     ant/bin/antRun,\