(ant) branch master updated: remove static reference fro JavaEnvUtis to FileUtils completely

[bodewig]

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.git


The following commit(s) were added to refs/heads/master by this push:
     new a8bc5d766 remove static reference fro JavaEnvUtis to FileUtils 
completely
a8bc5d766 is described below

commit a8bc5d766655f54c1e4889f2cf4c00f9ad81dbf3
Author: Stefan Bodewig <bode...@apache.org>
AuthorDate: Fri Apr 3 10:29:01 2026 +0200

    remove static reference fro JavaEnvUtis to FileUtils completely
---
 src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 
b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index e38002905..d1c47f1dd 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -47,9 +47,6 @@ public final class JavaEnvUtils {
     /** shortcut for System.getProperty("java.home") */
     private static final String JAVA_HOME = System.getProperty("java.home");
 
-    /** FileUtils instance for path normalization */
-    private static final FileUtils FILE_UTILS;
-
     /** Version of currently running VM. */
     private static String javaVersion;
 
@@ -230,8 +227,6 @@ public final class JavaEnvUtils {
         } catch (Throwable t) {
             // swallow as this simply doesn't seem to be Apache Harmony
         }
-
-        FILE_UTILS = FileUtils.getFileUtils();
     }
 
     /**
@@ -450,7 +445,7 @@ public final class JavaEnvUtils {
      * @return null if the executable cannot be found.
      */
     private static File findInDir(String dirName, String commandName) {
-        File dir = FILE_UTILS.normalize(dirName);
+        File dir = FileUtils.getFileUtils().normalize(dirName);
         File executable = null;
         if (dir.exists()) {
             executable = new File(dir, addExtension(commandName));
@@ -544,7 +539,7 @@ public final class JavaEnvUtils {
      */
     public static File createVmsJavaOptionFile(String[] cmds)
             throws IOException {
-        File script = FILE_UTILS.createTempFile(null, "ANT", ".JAVA_OPTS", 
null, false, true);
+        File script = FileUtils.getFileUtils().createTempFile(null, "ANT", 
".JAVA_OPTS", null, false, true);
         try (BufferedWriter out = new BufferedWriter(new FileWriter(script))) {
             for (String cmd : cmds) {
                 out.write(cmd);