Ensure o.a.tools.ant.util FileUtils is initialized before JavaEnvUtils

#2605

Author: merks

ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java

@@ -52,6 +52,7 @@
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.TaskAdapter;
 import org.apache.tools.ant.XmlLogger;
+import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import org.eclipse.ant.core.AntCorePlugin;
 import org.eclipse.ant.core.AntCorePreferences;
@@ -88,6 +89,9 @@ public class InternalAntRunner {
 	private static boolean isSecurityManagerAllowed() {
 		String sm = System.getProperty("java.security.manager"); //$NON-NLS-1$
 		if (sm == null) { // default is 'disallow' since 18 and was 'allow' before
+			// There is a circularity problem if JavaEnvUtils is initialized before FileUtils on Windows
+			// https://github.com/eclipse-platform/eclipse.platform/issues/2605
+			FileUtils.getFileUtils();
 			return !JavaEnvUtils.isAtLeastJavaVersion("18"); //$NON-NLS-1$
 		}
 		// Value is either 'disallow' or 'allow' or specifies the SecurityManager class to set

ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java

@@ -64,6 +64,9 @@ public class InternalAntRunner {
 	private static boolean isSecurityManagerAllowed() {
 		String sm = System.getProperty("java.security.manager"); //$NON-NLS-1$
 		if (sm == null) { // default is 'disallow' since 18 and was 'allow' before
+			// There is a circularity problem if JavaEnvUtils is initialized before FileUtils on Windows
+			// https://github.com/eclipse-platform/eclipse.platform/issues/2605
+			FileUtils.getFileUtils();
 			return !JavaEnvUtils.isAtLeastJavaVersion("18"); //$NON-NLS-1$
 		}
 		// Value is either 'disallow' or 'allow' or specifies the SecurityManager class to set

ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModel.java

@@ -49,6 +49,7 @@
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.TaskAdapter;
 import org.apache.tools.ant.UnknownElement;
+import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import org.eclipse.ant.core.AntCorePlugin;
 import org.eclipse.ant.core.AntCorePreferences;
@@ -95,6 +96,9 @@ public class AntModel implements IAntModel {
 	private static boolean isSecurityManagerAllowed() {
 		String sm = System.getProperty("java.security.manager"); //$NON-NLS-1$
 		if (sm == null) { // default is 'disallow' since 18 and was 'allow' before
+			// There is a circularity problem if JavaEnvUtils is initialized before FileUtils on Windows
+			// https://github.com/eclipse-platform/eclipse.platform/issues/2605
+			FileUtils.getFileUtils();
 			return !JavaEnvUtils.isAtLeastJavaVersion("18"); //$NON-NLS-1$
 		}
 		// Value is either 'disallow' or 'allow' or specifies the SecurityManager class to set