diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 660b9bef3b..bb631fcc8f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -52,6 +52,7 @@ Benjamin Burgess
 Benoit Moussaud
 Bernd Dutkowski
 Bernhard Rosenkraenzer
+Björn Kautler
 Brad Clark
 Brant Langer Gurganus
 Brian Curnow
@@ -144,6 +145,7 @@ Erik Hatcher
 Erik Langenbach
 Erik Meade
 Ernst de Haan
+Evan Saulpaugh
 Francesco Steccanella
 Frank Harnack
 Frank Somers
@@ -170,6 +172,7 @@ Greg Roodt
 Greg Schueler
 Grégoire Vatry
 Günther Kögel
+Hannes Wellmann
 Harish Prabandham
 Haroon Rafique
 Helder Pereira
@@ -243,6 +246,7 @@ Kevin Greiner
 Kevin Jackson
 Kevin Ross
 Kevin Z. Grey
+Kien Dang
 Kim Hansen
 Kirk Wylie
 Kristian Rosenvold
@@ -405,6 +409,7 @@ Sean P. Kane
 Sebastian Kantha
 Sebastian Ratz
 Sebastien Arod
+Sebastien Ballet
 Shiraz Kanga
 Simeon Fitch
 Simon Law
@@ -441,11 +446,11 @@ Thomas Starlinger
 Tim Boemker
 Tim Drury
 Tim Fennell
+TJ Rothwell
 Tim Stephenson
 Tim Whittington
 Timoteo Ohara
 Timothy Gerard Endres
-TJ Rothwell
 Tom Ball
 Tom Brus
 Tom Cunningham
@@ -454,6 +459,7 @@ Tom Eugelink
 Tom May
 Tomasz Bech
 Tomasz Kowalczewski
+Tomodachi94
 Tomáš Zezula
 Tony Gravagno
 Trejkaz Xaoza
diff --git a/WHATSNEW b/WHATSNEW
index e7af9c4299..a512e2f629 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,12 +1,42 @@
 Changes from Ant 1.10.15 TO Ant 1.10.16
 =======================================
 
+Changes that could break older environments:
+-------------------------------------------
+
+ * <xslt> now uses the same logic to compare file timestamps when
+   determining whether a target file is out-of-date with respect to
+   the source file or stylesheet that most other tasks use. This means
+   it will assume a default timestamp granularity that depends on the
+   current operating system.
+   A new granularity attribute allows you to override the assumed
+   granularity.
+   Under certain edge cases this means xslt will now not process files
+   it would have processed before (when the timestamps of source or
+   stylesheet are very close or even equal to the timestamp of the
+   target). In this case you can set granularity to 0 to get back to
+   the behavior of 1.10.15.
+   Bugzilla Report 65756
+
 Fixed bugs:
 -----------
 
  * <scp> now properly handles IPv6 addresses as hostnames.
    Bugzilla Report 59160
 
+ * javac task has been fixed to generate the "-classpath" option
+   only when there are any classpath elements present.
+   Bugzilla Report 69586
+
+Other changes:
+--------------
+
+ * Ant will no longer set a java.lang.SecurityManager at runtime
+   if the "java.security.manager" system property is set to
+   "disallow".
+   Github Pull Request #216
+
+
 Changes from Ant 1.10.14 TO Ant 1.10.15
 =======================================
 
diff --git a/build.xml b/build.xml
index 36abf45032..638873a39f 100644
--- a/build.xml
+++ b/build.xml
@@ -1211,8 +1211,7 @@
       <fileset dir="${lib.dir}">
         <include name="optional/junit-3.8.2.jar"/>
         <include name="optional/junit-4.13.2.jar"/>
-        <include name="optional/hamcrest-core-1.3.jar"/>
-        <include name="optional/hamcrest-library-1.3.jar"/>
+        <include name="optional/hamcrest-3.0.jar"/>
         <include name="README"/>
         <include name="libraries.properties"/>
       </fileset>
diff --git a/contributors.xml b/contributors.xml
index eb44cf58fd..8b9c3974b5 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -235,6 +235,10 @@
     <first>Bernhard</first>
     <last>Rosenkraenzer</last>
   </name>
+  <name>
+    <first>Björn</first>
+    <last>Kautler</last>
+  </name>
   <name>
     <first>Brad</first>
     <last>Clark</last>
@@ -607,6 +611,10 @@
     <first>Ernst</first>
     <last>de Haan</last>
   </name>
+  <name>
+    <first>Evan</first>
+    <last>Saulpaugh</last>
+  </name>
   <name>
     <first>Francesco</first>
     <last>Steccanella</last>
@@ -712,6 +720,10 @@
     <first>Günther</first>
     <last>Kögel</last>
   </name>
+  <name>
+    <first>Hannes</first>
+    <last>Wellmann</last>
+  </name>
   <name>
     <first>Harish</first>
     <last>Prabandham</last>
@@ -1014,6 +1026,10 @@
     <middle>Z.</middle>
     <last>Grey</last>
   </name>
+  <name>
+    <first>Kien</first>
+    <last>Dang</last>
+  </name>
   <name>
     <first>Kim</first>
     <last>Hansen</last>
@@ -1673,6 +1689,10 @@
     <first>Sebastien</first>
     <last>Arod</last>
   </name>
+  <name>
+    <first>Sebastien</first>
+    <last>Ballet</last>
+  </name>
   <name>
     <first>Shiraz</first>
     <last>Kanga</last>
@@ -1870,6 +1890,10 @@
     <first>Tomasz</first>
     <last>Kowalczewski</last>
   </name>
+  <name>
+    <first>Tomodachi94</first>
+    <last></last>
+  </name>
   <name>
     <first>Tomáš</first>
     <last>Zezula</last>
diff --git a/fetch.xml b/fetch.xml
index 599b8f298d..3b09c7e632 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -234,7 +234,7 @@ Set -Ddest=LOCATION on the command line
           description="load JUnit libraries"
           depends="init">
     <f2 project="junit"/>
-    <f2 project="org.hamcrest" archive="hamcrest-library"/>
+    <f2 project="org.hamcrest" archive="hamcrest"/>
   </target>
 
   <target name="junitlauncher"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 8be814b7c0..86fba5a19e 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -44,12 +44,11 @@ commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
 js.version=20.1.0
 js-scriptengine.version=${js.version}
-# Note - When updating the hamcrest versions here, make sure to also update the
-# "src-dist" target in build.xml to copy the correct hamcrest jars
+# Note - When updating the hamcrest version here, make sure to also update the
+# "src-dist" target in build.xml to copy the correct hamcrest jar
 # into the source distribution. Also update the hamcrest dependency
 # version in src/etc/poms/pom.xml.
-hamcrest-core.version=1.3
-hamcrest-library.version=${hamcrest-core.version}
+hamcrest.version=3.0
 jai-core.version=1.1.3
 jai-codec.version=1.1.3
 netrexx.version=2.05
diff --git a/lib/optional/LICENSE.hamcrest.txt b/lib/optional/LICENSE.hamcrest.txt
index 4ccbb6662a..1cd535da59 100644
--- a/lib/optional/LICENSE.hamcrest.txt
+++ b/lib/optional/LICENSE.hamcrest.txt
@@ -1,17 +1,28 @@
-[Hamcrest links to http://opensource.org/licenses/BSD-3-Clause from
-http://hamcrest.org/JavaHamcrest/ as its license, but doesn't state
-the copyright owner]
+BSD 3-Clause License
 
-Copyright (c) <YEAR>, <OWNER>
+Copyright (c) 2000-2024, www.hamcrest.org
 
-All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/optional/hamcrest-3.0.jar b/lib/optional/hamcrest-3.0.jar
new file mode 100644
index 0000000000..763ffd9bb5
Binary files /dev/null and b/lib/optional/hamcrest-3.0.jar differ
diff --git a/lib/optional/hamcrest-core-1.3.jar b/lib/optional/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16e3d..0000000000
Binary files a/lib/optional/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/lib/optional/hamcrest-library-1.3.jar b/lib/optional/hamcrest-library-1.3.jar
deleted file mode 100644
index 9eac80d7ba..0000000000
Binary files a/lib/optional/hamcrest-library-1.3.jar and /dev/null differ
diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html
index 247f2dd299..3e09e3bb5d 100644
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@ -111,7 +111,8 @@ <h4 id="os">os</h4>
   <li><q>windows</q>&mdash;for all versions of Microsoft Windows</li>
   <li><q>dos</q>&mdash;for all Microsoft DOS based operating systems including Microsoft Windows and
     OS/2</li>
-  <li><q>mac</q>&mdash;for all Apple Macintosh systems prior to Mac OS X</li>
+  <li><q>mac</q>&mdash;for all Apple Macintosh systems and likely Mac
+    OS X as well (may not detect MacOS X on all JVMs)</li>
   <li><q>unix</q>&mdash;for all Unix(-like) operating systems, including Linux and Mac OS
       X/macOS</li>
   <li><q>netware</q>&mdash;for Novell NetWare</li>
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index 9f0a16c68c..6ce33f8c9a 100644
--- a/manual/Tasks/style.html
+++ b/manual/Tasks/style.html
@@ -231,6 +231,15 @@ <h3>Parameters</h3>
       1.8.0</em>.</td>
     <td>No; default is <q>true</q></td>
   </tr>
+  <tr>
+    <td>granularity</td>
+    <td>The number of milliseconds leeway to give before deciding a
+      file is out of date with respect of the source file or stylesheet. This is
+      needed because not every file system supports tracking the last modified time to the
+      millisecond level. This can also be useful if source and target files live on separate
+      machines with clocks being out of sync. <em>since Ant 1.10.16</em>.</td>
+    <td>No; default is 1 second, or 2 seconds on DOS systems</td>
+  </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
diff --git a/manual/running.html b/manual/running.html
index 7248cd11aa..ae2d01b804 100644
--- a/manual/running.html
+++ b/manual/running.html
@@ -662,6 +662,10 @@ <h2 id="viajava">Running Ant via Java</h2>
 the <samp>ant-launcher.jar</samp>.
 </p>
 
+<p>Note that both classes will terminate the running VM when the build
+  is finished and thus are not well suited as programmatic entry
+  points.</p>
+
 <p id="viaant">
 Ant can be started in Ant via the <code>&lt;java&gt;</code> command.
 Here is an example:
diff --git a/src/etc/junit-frames-saxon.xsl b/src/etc/junit-frames-saxon.xsl
index 1b2084ed0e..0f49f0aaf6 100644
--- a/src/etc/junit-frames-saxon.xsl
+++ b/src/etc/junit-frames-saxon.xsl
@@ -66,7 +66,7 @@
 
     -->
     <xsl:param name="output.dir" select="'.'"/>
-    <xsl:param name="TITLE">Unit Test Results.</xsl:param>
+    <xsl:param name="TITLE">Unit Test Results</xsl:param>
 
 
     <xsl:template match="testsuites">
@@ -298,7 +298,7 @@
                 </xsl:choose>
             </xsl:variable>
             <head>
-                <title>Unit Test Results: <xsl:value-of select="$title"/></title>
+                <title><xsl:value-of select="$TITLE"/>: <xsl:value-of select="$title"/></title>
                 <xsl:call-template name="create.stylesheet.link">
                     <xsl:with-param name="package.name"/>
                 </xsl:call-template>
@@ -364,7 +364,7 @@
         <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
         <html>
             <head>
-                <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
+                <title><xsl:value-of select="$TITLE"/>: <xsl:value-of select="$class.name"/></title>
                 <xsl:call-template name="create.stylesheet.link">
                     <xsl:with-param name="package.name" select="$package.name"/>
                 </xsl:call-template>
@@ -615,7 +615,7 @@
     <xsl:template match="testsuites" mode="overview.packages">
         <html>
             <head>
-                <title>Unit Test Results: Summary</title>
+                <title><xsl:value-of select="$TITLE"/>: Summary</title>
                 <xsl:call-template name="create.stylesheet.link">
                     <xsl:with-param name="package.name"/>
                 </xsl:call-template>
diff --git a/src/etc/junit-frames-xalan1.xsl b/src/etc/junit-frames-xalan1.xsl
index bc41a7cd80..39db782e5e 100644
--- a/src/etc/junit-frames-xalan1.xsl
+++ b/src/etc/junit-frames-xalan1.xsl
@@ -33,7 +33,7 @@
 
 -->
 <xsl:param name="output.dir" select="'.'"/>
-
+<xsl:param name="TITLE">Unit Test Results</xsl:param>
 
 <xsl:template match="testsuites">
     <!-- create the index.html -->
@@ -127,7 +127,7 @@
 <xsl:template name="index.html">
 <html>
     <head>
-        <title>Unit Test Results.</title>
+        <title><xsl:value-of select="$TITLE"/></title>
     </head>
     <frameset cols="20%,80%">
         <frameset rows="30%,70%">
@@ -207,7 +207,7 @@ h6 {
     <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
     <html>
         <head>
-          <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
+          <title><xsl:value-of select="$TITLE"/>: <xsl:value-of select="$class.name"/></title>
             <xsl:call-template name="create.stylesheet.link">
                 <xsl:with-param name="package.name" select="$package.name"/>
             </xsl:call-template>
@@ -432,7 +432,7 @@ h6 {
 <xsl:template match="testsuites" mode="overview.packages">
     <html>
         <head>
-            <title>Unit Test Results: Summary</title>
+            <title><xsl:value-of select="$TITLE"/>: Summary</title>
             <xsl:call-template name="create.stylesheet.link">
                 <xsl:with-param name="package.name"/>
             </xsl:call-template>
@@ -589,7 +589,7 @@ h6 {
 
 <!-- Page HEADER -->
 <xsl:template name="pageHeader">
-    <h1>Unit Test Results</h1>
+    <h1><xsl:value-of select="$TITLE"/></h1>
     <table width="100%">
     <tr>
         <td align="left"></td>
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 732e040366..85504992f0 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -32,7 +32,7 @@
 
 -->
 <xsl:param name="output.dir" select="'.'"/>
-<xsl:param name="TITLE">Unit Test Results.</xsl:param>
+<xsl:param name="TITLE">Unit Test Results</xsl:param>
 
 
 <xsl:template match="testsuites">
@@ -79,7 +79,7 @@
         <xsl:with-param name="type" select="'errors'"/>
       </xsl:apply-templates>
     </redirect:write>
-    
+
     <!-- create the alltests-skipped.html at the root -->
     <redirect:write file="{$output.dir}/alltests-skipped.html">
       <xsl:apply-templates select="." mode="all.tests">
@@ -264,7 +264,7 @@ h6 {
 	    </xsl:choose>
 	</xsl:variable>
 	<head>
-	    <title>Unit Test Results: <xsl:value-of select="$title"/></title>
+	    <title><xsl:value-of select="$TITLE"/>: <xsl:value-of select="$title"/></title>
 	    <xsl:call-template name="create.stylesheet.link">
                 <xsl:with-param name="package.name"/>
             </xsl:call-template>
@@ -330,7 +330,7 @@ h6 {
     <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
     <html>
         <head>
-          <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
+          <title><xsl:value-of select="$TITLE"/>: <xsl:value-of select="$class.name"/></title>
             <xsl:call-template name="create.stylesheet.link">
                 <xsl:with-param name="package.name" select="$package.name"/>
             </xsl:call-template>
@@ -581,7 +581,7 @@ h6 {
 <xsl:template match="testsuites" mode="overview.packages">
     <html>
         <head>
-            <title>Unit Test Results: Summary</title>
+            <title><xsl:value-of select="$TITLE"/>: Summary</title>
             <xsl:call-template name="create.stylesheet.link">
                 <xsl:with-param name="package.name"/>
             </xsl:call-template>
diff --git a/src/etc/junit-noframes-saxon.xsl b/src/etc/junit-noframes-saxon.xsl
index ce7efb8e0a..b72d5a93f4 100644
--- a/src/etc/junit-noframes-saxon.xsl
+++ b/src/etc/junit-noframes-saxon.xsl
@@ -58,7 +58,7 @@
    limitations under the License.
  -->
 
-<xsl:param name="TITLE">Unit Test Results.</xsl:param>
+<xsl:param name="TITLE">Unit Test Results</xsl:param>
 
 <!--
 
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index 0d03eb3a82..f9ece45e3d 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -22,7 +22,7 @@
    limitations under the License.
  -->
 
-<xsl:param name="TITLE">Unit Test Results.</xsl:param>
+<xsl:param name="TITLE">Unit Test Results</xsl:param>
 
 <!--
 
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index 9cf6c67280..f4babf1655 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -117,8 +117,8 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
+      <artifactId>hamcrest</artifactId>
+      <version>3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/testcases/taskdefs/optional/junitlauncher.xml b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
index c3e4b5651f..e2b031035c 100644
--- a/src/etc/testcases/taskdefs/optional/junitlauncher.xml
+++ b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
@@ -31,7 +31,7 @@
     <path id="junit.engine.vintage.classpath">
         <fileset dir="../../../../../lib/optional" includes="junit-vintage-engine*.jar"/>
         <fileset dir="../../../../../lib/optional" includes="junit-*.jar"/>
-        <fileset dir="../../../../../lib/optional" includes="hamcrest*.jar"/>
+        <fileset dir="../../../../../lib/optional" includes="hamcrest-*.jar"/>
         <fileset dir="../../../../../lib/optional" includes="opentest4j*.jar"/>
     </path>
 
diff --git a/src/etc/testcases/taskdefs/style/build.xml b/src/etc/testcases/taskdefs/style/build.xml
index 42ad93d92e..959e61646d 100644
--- a/src/etc/testcases/taskdefs/style/build.xml
+++ b/src/etc/testcases/taskdefs/style/build.xml
@@ -96,7 +96,7 @@
       <antcall target="copyXsl">
         <param name="xsl.value" value="new-value"/>
       </antcall>
-      <xslt in="data.xml" out="${output}/out.xml" style="tmp.xsl"/>
+      <xslt in="data.xml" out="${output}/out.xml" style="tmp.xsl" granularity="0"/>
       <delete file="tmp.xsl"/>
   </target>
 
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index b7f6479992..ff7b940c3d 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -1210,14 +1210,12 @@ private void scandir(final File dir, final TokenizedPath path, final boolean fas
             return;
         }
         if (!followSymlinks) {
-            final ArrayList<String> noLinks = new ArrayList<>();
+            final String[] noLinks = new String[newFiles.length];
+            int noLinksCount = 0;
             for (final String newFile : newFiles) {
-                final Path filePath;
-                if (dir == null) {
-                    filePath = Paths.get(newFile);
-                } else {
-                    filePath = Paths.get(dir.toPath().toString(), newFile);
-                }
+                final Path filePath = dir == null
+                                        ? Paths.get(newFile)
+                                        : dir.toPath().resolve(newFile);
                 if (Files.isSymbolicLink(filePath)) {
                     final String name = vpath + newFile;
                     final File file = new File(dir, newFile);
@@ -1228,10 +1226,10 @@ private void scandir(final File dir, final TokenizedPath path, final boolean fas
                     }
                     accountForNotFollowedSymlink(name, file);
                 } else {
-                    noLinks.add(newFile);
+                    noLinks[noLinksCount++] = newFile;
                 }
             }
-            newFiles = noLinks.toArray(new String[0]);
+            newFiles = noLinksCount == noLinks.length ? noLinks : Arrays.copyOf(noLinks, noLinksCount);
         } else {
             directoryNamesFollowed.addFirst(dir.getName());
         }
@@ -1788,16 +1786,17 @@ private synchronized void clearCaches() {
      */
     private TokenizedPattern[] fillNonPatternSet(final Map<String, TokenizedPath> map,
                                                  final String[] patterns) {
-        final List<TokenizedPattern> al = new ArrayList<>(patterns.length);
+        final TokenizedPattern[] al = new TokenizedPattern[patterns.length];
+        int alCount = 0;
         for (String pattern : patterns) {
             if (SelectorUtils.hasWildcards(pattern)) {
-                al.add(new TokenizedPattern(pattern));
+                al[alCount++] = new TokenizedPattern(pattern);
             } else {
                 final String s = isCaseSensitive() ? pattern : pattern.toUpperCase();
                 map.put(s, new TokenizedPath(s));
             }
         }
-        return al.toArray(new TokenizedPattern[0]);
+        return Arrays.copyOf(al, alCount);
     }
 
     /**
@@ -1814,12 +1813,9 @@ private TokenizedPattern[] fillNonPatternSet(final Map<String, TokenizedPath> ma
     private boolean causesIllegalSymlinkLoop(final String dirName, final File parent,
                                              final Deque<String> directoryNamesFollowed) {
         try {
-            final Path dirPath;
-            if (parent == null) {
-                dirPath = Paths.get(dirName);
-            } else {
-                dirPath = Paths.get(parent.toPath().toString(), dirName);
-            }
+            final Path dirPath = parent == null
+                                    ? Paths.get(dirName)
+                                    : parent.toPath().resolve(dirName);
             if (directoryNamesFollowed.size() >= maxLevelsOfSymlinks
                 && Collections.frequency(directoryNamesFollowed, dirName) >= maxLevelsOfSymlinks
                 && Files.isSymbolicLink(dirPath)) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 4851bacd7b..93e44b9f3d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -771,15 +771,16 @@ protected Map<Resource, String[]> scan(final Resource[] fromResources, final Fil
      */
     protected void buildMap(final File fromDir, final File toDir, final String[] names,
                             final FileNameMapper mapper, final Hashtable<String, String[]> map) {
-        String[] toCopy = null;
+        final String[] toCopy;
         if (forceOverwrite) {
-            final List<String> v = new ArrayList<>();
+            final String[] v = new String[names.length];
+            int added = 0;
             for (String name : names) {
                 if (mapper.mapFileName(name) != null) {
-                    v.add(name);
+                    v[added++] = name;
                 }
             }
-            toCopy = v.toArray(new String[0]);
+            toCopy = Arrays.copyOf(v, added);
         } else {
             final SourceFileScanner ds = new SourceFileScanner(this);
             toCopy = ds.restrict(names, fromDir, toDir, mapper, granularity);
@@ -816,15 +817,16 @@ protected void buildMap(final File fromDir, final File toDir, final String[] nam
     protected Map<Resource, String[]> buildMap(final Resource[] fromResources, final File toDir,
                            final FileNameMapper mapper) {
         final Map<Resource, String[]> map = new HashMap<>();
-        Resource[] toCopy;
+        final Resource[] toCopy;
         if (forceOverwrite) {
-            final List<Resource> v = new ArrayList<>();
+            final Resource[] v = new Resource[fromResources.length];
+            int added = 0;
             for (Resource rc : fromResources) {
                 if (mapper.mapFileName(rc.getName()) != null) {
-                    v.add(rc);
+                    v[added++] = rc;
                 }
             }
-            toCopy = v.toArray(new Resource[0]);
+            toCopy = Arrays.copyOf(v, added);
         } else {
             toCopy = ResourceUtils.selectOutOfDateSources(this, fromResources, mapper,
                     name -> new FileResource(toDir, name), granularity);
diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java
index 19f27fb4b9..e607a6a4a0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -257,10 +257,8 @@ protected void extractFile(FileUtils fileUtils, File srcF, File dir,
                                boolean isDirectory, FileNameMapper mapper)
                                throws IOException {
 
-        final boolean entryNameStartsWithPathSpec = !entryName.isEmpty()
-            && (entryName.charAt(0) == File.separatorChar
-                || entryName.charAt(0) == '/'
-                || entryName.charAt(0) == '\\');
+        final boolean entryNameStartsWithPathSpec =
+            FILE_UTILS.startsWithPathSeparator(entryName);
         if (stripAbsolutePathSpec && entryNameStartsWithPathSpec) {
             log("stripped absolute path spec from " + entryName,
                 Project.MSG_VERBOSE);
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 829ab00060..bdb6bb08da 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -55,6 +55,7 @@
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.Resources;
 import org.apache.tools.ant.types.resources.Union;
+import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.apache.tools.ant.util.ClasspathUtils;
 import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.util.FileUtils;
@@ -243,6 +244,13 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
      */
     private TraceConfiguration traceConfiguration;
 
+    /**
+     * Filesystem timestamp granularity in milliseconds.
+     *
+     * @since Ant 1.10.16
+     */
+    private long granularity = FILE_UTILS.getFileTimestampGranularity();
+
     /**
      * Whether to style all files in the included directories as well;
      * optional, default is true.
@@ -390,9 +398,7 @@ public void execute() throws BuildException {
                         stylesheet = alternative;
                     }
                 }
-                final FileResource fr = new FileResource();
-                fr.setProject(getProject());
-                fr.setFile(stylesheet);
+                final FileResource fr = new FileResource(getProject(), stylesheet);
                 styleResource = fr;
             } else {
                 styleResource = xslResource;
@@ -692,6 +698,19 @@ public TraceConfiguration getTraceConfiguration() {
         return traceConfiguration;
     }
 
+    /**
+     * Set the number of milliseconds leeway to give before deciding a
+     * target is out of date.
+     *
+     * <p>Default is 1 second, or 2 seconds on DOS systems.</p>
+     * @param granularity the granularity used to decide if a target is out of
+     *                    date.
+     * @since Ant 1.10.16
+     */
+    public void setGranularity(final long granularity) {
+        this.granularity = granularity;
+    }
+
     /**
      * Load processor here instead of in setProcessor - this will be
      * called from within execute, so we have access to the latest
@@ -830,9 +849,11 @@ private void process(final File baseDir, final String xmlFile, final File destDi
                 return;
             }
             outF = new File(destDir, outFileName[0]);
+            Resource outR = new FileResource(getProject(), outF);
 
-            if (force || inF.lastModified() > outF.lastModified()
-                    || styleSheetLastModified > outF.lastModified()) {
+            if (force
+                || SelectorUtils.isOutOfDate(inF, outF, granularity)
+                || SelectorUtils.isOutOfDate(stylesheet, outR, granularity)) {
                 ensureDirectoryFor(outF);
                 log("Processing " + inF + " to " + outF);
                 configureLiaison(stylesheet);
@@ -862,11 +883,13 @@ private void process(final File baseDir, final String xmlFile, final File destDi
     private void process(final File inFile, final File outFile, final Resource stylesheet) throws BuildException {
         try {
             final long styleSheetLastModified = stylesheet.getLastModified();
+            final Resource outResource = new FileResource(getProject(), outFile);
             log("In file " + inFile + " time: " + inFile.lastModified(), Project.MSG_DEBUG);
             log("Out file " + outFile + " time: " + outFile.lastModified(), Project.MSG_DEBUG);
             log("Style file " + xslFile + " time: " + styleSheetLastModified, Project.MSG_DEBUG);
-            if (force || inFile.lastModified() >= outFile.lastModified()
-                    || styleSheetLastModified >= outFile.lastModified()) {
+            if (force
+                || SelectorUtils.isOutOfDate(inFile, outFile, granularity)
+                || SelectorUtils.isOutOfDate(stylesheet, outResource, granularity)) {
                 ensureDirectoryFor(outFile);
                 log("Processing " + inFile + " to " + outFile, Project.MSG_INFO);
                 configureLiaison(stylesheet);
@@ -1242,9 +1265,7 @@ public void init() throws BuildException {
      */
     @Deprecated
     protected void configureLiaison(final File stylesheet) throws BuildException {
-        final FileResource fr = new FileResource();
-        fr.setProject(getProject());
-        fr.setFile(stylesheet);
+        final FileResource fr = new FileResource(getProject(), stylesheet);
         configureLiaison(fr);
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index cf3ec45f3f..5a2b4441fb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -304,8 +304,6 @@ protected Commandline setupJavacCommandlineSwitches(final Commandline cmd,
             cmd.createArgument().setFile(destDir);
         }
 
-        cmd.createArgument().setValue("-classpath");
-
         // Just add "sourcepath" to classpath (for JDK1.1)
         // as well as "bootclasspath" and "extdirs"
         if (!assumeJava1_2Plus()) {
@@ -317,9 +315,15 @@ protected Commandline setupJavacCommandlineSwitches(final Commandline cmd,
             }
             cp.append(classpath);
             cp.append(sourcepath);
+
+            cmd.createArgument().setValue("-classpath");
             cmd.createArgument().setPath(cp);
         } else {
-            cmd.createArgument().setPath(classpath);
+            if (!classpath.isEmpty()) {
+              cmd.createArgument().setValue("-classpath");
+              cmd.createArgument().setPath(classpath);
+            }
+
             // If the buildfile specifies sourcepath="", then don't
             // output any sourcepath.
             if (sourcepath.size() > 0) {
diff --git a/src/main/org/apache/tools/ant/types/ArchiveScanner.java b/src/main/org/apache/tools/ant/types/ArchiveScanner.java
index ead0005e86..f5ab9f95e2 100644
--- a/src/main/org/apache/tools/ant/types/ArchiveScanner.java
+++ b/src/main/org/apache/tools/ant/types/ArchiveScanner.java
@@ -28,6 +28,7 @@
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.FileResourceIterator;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * ArchiveScanner accesses the pattern matching algorithm in DirectoryScanner,
@@ -48,6 +49,8 @@ public abstract class ArchiveScanner extends DirectoryScanner {
 
     // CheckStyle:VisibilityModifier ON
 
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
     /**
      * The archive resource which should be scanned.
      */
@@ -257,11 +260,9 @@ public void init() {
     public boolean match(String path) {
         String vpath = path;
         if (!path.isEmpty()) {
-            vpath = path.replace('/', File.separatorChar)
-                    .replace('\\', File.separatorChar);
-            if (vpath.charAt(0) == File.separatorChar) {
-                vpath = vpath.substring(1);
-            }
+            vpath = FILE_UTILS.stripLeadingPathSeparator(path)
+                .replace('/', File.separatorChar)
+                .replace('\\', File.separatorChar);
         }
         return isIncluded(vpath) && !isExcluded(vpath);
     }
diff --git a/src/main/org/apache/tools/ant/types/resources/URLResource.java b/src/main/org/apache/tools/ant/types/resources/URLResource.java
index 1772b4532b..479d53f9c0 100644
--- a/src/main/org/apache/tools/ant/types/resources/URLResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/URLResource.java
@@ -183,7 +183,7 @@ public synchronized String getName() {
             return getRef().getName();
         }
         String name = getURL().getFile();
-        return name.isEmpty() ? name : name.substring(1);
+        return FILE_UTILS.stripLeadingPathSeparator(name);
     }
 
     /**
@@ -196,7 +196,7 @@ public synchronized String toString() {
     }
 
     /**
-     * Find out whether the URL exists .
+     * Find out whether the URL exists.
      * @return true if this resource exists.
      */
     public synchronized boolean isExists() {
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
index a6af9bcd85..af0f4afcc9 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
@@ -573,11 +573,30 @@ static String[] tokenizePathAsArray(String path) {
      *
      * @param src the original file
      * @param target the file being compared against
-     * @param granularity the amount in milliseconds of slack we will give in
+     * @param granularity the int amount in milliseconds of slack we will give in
      *        determining out of dateness
      * @return whether the target is out of date
      */
     public static boolean isOutOfDate(File src, File target, int granularity) {
+        return isOutOfDate(src, target, (long) granularity);
+    }
+
+    /**
+     * Returns dependency information on these two files. If src has been
+     * modified later than target, it returns true. If target doesn't exist,
+     * it likewise returns true. Otherwise, target is newer than src and
+     * is not out of date, thus the method returns false. It also returns
+     * false if the src file doesn't even exist, since how could the
+     * target then be out of date.
+     *
+     * @param src the original file
+     * @param target the file being compared against
+     * @param granularity the amount in milliseconds of slack we will give in
+     *        determining out of dateness
+     * @return whether the target is out of date
+     * @since Ant 1.10.16
+     */
+    public static boolean isOutOfDate(File src, File target, long granularity) {
         return src.exists() && (!target.exists()
                 || (src.lastModified() - granularity) > target.lastModified());
     }
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index 15dd90ddd1..087ab703d3 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -684,13 +684,13 @@ public static boolean isAbsolutePath(String filename) {
         if (filename.isEmpty()) {
             return false;
         }
+        if (!ON_DOS && !ON_NETWARE) {
+            return PRIMARY_INSTANCE.startsWithPathSeparator(filename);
+        }
         int len = filename.length();
         char sep = File.separatorChar;
         filename = filename.replace('/', sep).replace('\\', sep);
         char c = filename.charAt(0);
-        if (!ON_DOS && !ON_NETWARE) {
-            return c == sep;
-        }
         if (c == sep) {
             // CheckStyle:MagicNumber OFF
             if (!ON_DOS || len <= 4 || filename.charAt(1) != sep) {
@@ -859,7 +859,7 @@ public String toVMSPath(File f) {
         String osPath;
         String path = normalize(f.getAbsolutePath()).getPath();
         String name = f.getName();
-        boolean isAbsolute = path.charAt(0) == File.separatorChar;
+        boolean isAbsolute = startsWithPathSeparator(path);
         // treat directories specified using .DIR syntax as files
         // CheckStyle:MagicNumber OFF
         boolean isDirectory = f.isDirectory()
@@ -1959,4 +1959,31 @@ public static Optional<Boolean> isCaseSensitiveFileSystem(final Path path) {
         }
         return Optional.of(caseSensitive);
     }
+
+    /**
+     * Tests whether the given path starts with a path separator.
+     * @param path path to check.
+     * @return true if the path starts with a path separator.
+     * @since Ant 1.10.16
+     */
+    public boolean startsWithPathSeparator(String path) {
+        if (path == null || path.length() == 0) {
+            return false;
+        }
+        char c = path.charAt(0);
+        return c == File.pathSeparatorChar || c == '/' || c == '\\';
+    }
+
+    /**
+     * Strips a leading path separator from path that actually start
+     * with one.
+     * @param path the whose leading file separator should be stripped.
+     * @return path with the leading path separator stripped off if
+     * path starts with a path separator - or the unchanged path
+     * otherwise.
+     * @since Ant 1.10.16
+     */
+    public String stripLeadingPathSeparator(String path) {
+        return startsWithPathSeparator(path) ? path.substring(1) : path;
+    }
 }
diff --git a/src/main/org/apache/tools/ant/util/PermissionUtils.java b/src/main/org/apache/tools/ant/util/PermissionUtils.java
index 1e50217b2b..8e52a16fb2 100644
--- a/src/main/org/apache/tools/ant/util/PermissionUtils.java
+++ b/src/main/org/apache/tools/ant/util/PermissionUtils.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFileAttributeView;
@@ -219,7 +220,7 @@ public enum FileType {
          */
         public static FileType of(Path p) throws IOException {
             BasicFileAttributes attrs =
-                Files.readAttributes(p, BasicFileAttributes.class);
+                Files.readAttributes(p, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
             if (attrs.isRegularFile()) {
                 return FileType.REGULAR_FILE;
             } else if (attrs.isDirectory()) {
diff --git a/src/main/org/apache/tools/ant/util/SecurityManagerUtil.java b/src/main/org/apache/tools/ant/util/SecurityManagerUtil.java
index 836a7b872b..70eb85421c 100644
--- a/src/main/org/apache/tools/ant/util/SecurityManagerUtil.java
+++ b/src/main/org/apache/tools/ant/util/SecurityManagerUtil.java
@@ -25,7 +25,12 @@
  */
 public final class SecurityManagerUtil {
 
-    private static final boolean isJava18OrHigher = JavaEnvUtils.isAtLeastJavaVersion("18");
+    // Ant will not set the SecurityManager if Java version is 18 or higher.
+    // For versions lower than Java 18, Ant will not set the SecurityManager
+    // if the "java.security.manager" system property is set to "disallow".
+    private static final boolean IS_SET_SECURITYMANAGER_ALLOWED = !JavaEnvUtils.isAtLeastJavaVersion("18")
+            && !"disallow".equals(System.getProperty("java.security.manager"));
+
     private static final boolean sysPropWarnOnSecMgrUsage =
             Boolean.getBoolean(MagicNames.WARN_SECURITY_MANAGER_USAGE);
 
@@ -34,10 +39,7 @@ public final class SecurityManagerUtil {
      * otherwise}
      */
     public static boolean isSetSecurityManagerAllowed() {
-        if (isJava18OrHigher) {
-            return false;
-        }
-        return true;
+        return IS_SET_SECURITYMANAGER_ALLOWED;
     }
 
     /**
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
index 876afb82cd..7ee9dd1d02 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -20,7 +20,7 @@
 
   <path id="junit">
     <fileset dir="../../../../../../lib/optional" includes="junit*" />
-    <fileset dir="../../../../../../lib/optional" includes="hamcrest-core*" />
+    <fileset dir="../../../../../../lib/optional" includes="hamcrest-*" />
   </path>
 
   <macrodef name="empty-test">
diff --git a/src/tests/junit/org/apache/tools/ant/types/resources/URLResourceTest.java b/src/tests/junit/org/apache/tools/ant/types/resources/URLResourceTest.java
new file mode 100644
index 0000000000..84bf23dc25
--- /dev/null
+++ b/src/tests/junit/org/apache/tools/ant/types/resources/URLResourceTest.java
@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  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.
+ *
+ */
+
+package org.apache.tools.ant.types.resources;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class URLResourceTest {
+
+    /**
+     * @see "https://bz.apache.org/bugzilla/show_bug.cgi?id=69680"
+     */
+    @Test
+    public void getNameOnlyStripsLeadingPathSeparator() {
+        assertEquals("foo", new URLResource("file:/foo").getName());
+        assertEquals("foo", new URLResource("file://host/foo").getName());
+        assertEquals("file:/foo!/bar", new URLResource("jar:file:/foo!/bar").getName());
+    }
+}
diff --git a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java
index 5a168a5140..bdf1f32452 100644
--- a/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java
@@ -861,6 +861,24 @@ public void testCaseSensitiveFileSystem() throws Exception {
                 ? "sensitive" : "insensitive"), expectedCaseSensitivity, actualCaseSensitivity.get());
     }
 
+    @Test
+    public void testStartsWithPathSeparator() {
+        assertTrue(getFileUtils().startsWithPathSeparator("/foo"));
+        assertTrue(getFileUtils().startsWithPathSeparator("\\foo"));
+        assertFalse(getFileUtils().startsWithPathSeparator("c:\\foo"));
+        assertFalse(getFileUtils().startsWithPathSeparator("foo"));
+        assertFalse(getFileUtils().startsWithPathSeparator("file:/foo"));
+    }
+
+    @Test
+    public void testStripLeadingPathSeparator() {
+        assertEquals("foo", getFileUtils().stripLeadingPathSeparator("/foo"));
+        assertEquals("foo", getFileUtils().stripLeadingPathSeparator("\\foo"));
+        assertEquals("c:\\foo", getFileUtils().stripLeadingPathSeparator("c:\\foo"));
+        assertEquals("foo", getFileUtils().stripLeadingPathSeparator("foo"));
+        assertEquals("file:/foo", getFileUtils().stripLeadingPathSeparator("file:/foo"));
+    }
+
     /**
      * adapt file separators to local conventions
      */
diff --git a/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java
index 2cfa6baeb0..8152ae4779 100644
--- a/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java
@@ -25,11 +25,14 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.EnumSet;
 import java.util.Set;
 
+import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.TarResource;
 import org.apache.tools.ant.types.resources.ZipResource;
@@ -92,6 +95,16 @@ public void detectsFileTypeOfDirectoryFromResource() throws IOException {
                      PermissionUtils.FileType.of(new FileResource(folder.newFolder("ant.tst"))));
     }
 
+    @Test
+    public void detectsFileTypeOfSymbolicLinkFromPath() throws IOException {
+        if (Os.isFamily("unix")) {
+            Path symlink = folder.getRoot().toPath().resolve("link.tst");
+            Files.createSymbolicLink(symlink, folder.newFile("ant.tst").toPath());
+            assertEquals(PermissionUtils.FileType.SYMLINK,
+                         PermissionUtils.FileType.of(symlink));
+        }
+    }
+
     @Test
     public void getSetPermissionsWorksForFiles() throws IOException {
         File f = folder.newFile("ant.tst");