diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java index fceb191e..8c51fbc0 100644 --- a/src/main/java/org/codehaus/plexus/util/FileUtils.java +++ b/src/main/java/org/codehaus/plexus/util/FileUtils.java @@ -1174,7 +1174,7 @@ public static void forceDelete(final String file) throws IOException { */ public static void forceDelete(final File file) throws IOException { if (file.isDirectory()) { - deleteDirectory(file); + org.apache.commons.io.FileUtils.deleteDirectory(file); } else { /* * NOTE: Always try to delete the file even if it appears to be non-existent. This will ensure that a @@ -1321,7 +1321,7 @@ public static void forceMkdir(final File file) throws IOException { * @throws IOException if any */ public static void deleteDirectory(final String directory) throws IOException { - deleteDirectory(new File(directory)); + org.apache.commons.io.FileUtils.deleteDirectory(new File(directory)); } /** diff --git a/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java b/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java index 5d12b620..16d8eb8b 100644 --- a/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java +++ b/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java @@ -432,7 +432,7 @@ void regexExcludeWithNegativeLookahead() throws IOException { File dir = new File(testDir, "regex-dir"); try { - FileUtils.deleteDirectory(dir); + org.apache.commons.io.FileUtils.deleteDirectory(dir); } catch (IOException ignored) { } @@ -471,7 +471,7 @@ void regexWithSlashInsideCharacterClass() throws IOException { File dir = new File(testDir, "regex-dir"); try { - FileUtils.deleteDirectory(dir); + org.apache.commons.io.FileUtils.deleteDirectory(dir); } catch (IOException ignored) { } diff --git a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java index ec19eb5b..ae044977 100644 --- a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java @@ -89,7 +89,7 @@ void setUp() throws Exception { getTestDirectory().mkdirs(); createFile(testFile1, testFile1Size); createFile(testFile2, testFile2Size); - FileUtils.deleteDirectory(getTestDirectory()); + org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory()); getTestDirectory().mkdirs(); createFile(testFile1, testFile1Size); createFile(testFile2, testFile2Size); @@ -942,7 +942,7 @@ void removeExtensionWithPaths() { void copyDirectoryStructureWithAEmptyDirectoryStructure() throws Exception { File from = new File(getTestDirectory(), "from"); - FileUtils.deleteDirectory(from); + org.apache.commons.io.FileUtils.deleteDirectory(from); assertTrue(from.mkdirs()); @@ -963,7 +963,7 @@ void copyDirectoryStructureWithAPopulatedStructure() throws Exception { // Make a structure to copy File from = new File(getTestDirectory(), "from"); - FileUtils.deleteDirectory(from); + org.apache.commons.io.FileUtils.deleteDirectory(from); File fRoot = new File(from, "root.txt"); @@ -1026,7 +1026,7 @@ void copyDirectoryStructureIfModified() throws Exception { // Make a structure to copy File from = new File(getTestDirectory(), "from"); - FileUtils.deleteDirectory(from); + org.apache.commons.io.FileUtils.deleteDirectory(from); File fRoot = new File(from, "root.txt"); @@ -1108,7 +1108,7 @@ void copyDirectoryStructureToSelf() throws Exception { // Make a structure to copy File toFrom = new File(getTestDirectory(), "tofrom"); - FileUtils.deleteDirectory(toFrom); + org.apache.commons.io.FileUtils.deleteDirectory(toFrom); File fRoot = new File(toFrom, "root.txt"); @@ -1505,7 +1505,7 @@ void deleteDirectoryWithValidFileSymlink() throws Exception { File symlink = new File(getTestDirectory(), "fileSymlink"); createSymlink(symlink, symlinkTarget); try { - FileUtils.deleteDirectory(getTestDirectory()); + org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory()); } finally { /* * Ensure to cleanup problematic symlink or "mvn clean" will fail @@ -1527,7 +1527,7 @@ void deleteDirectoryWithValidDirSymlink() throws Exception { File symlink = new File(getTestDirectory(), "dirSymlink"); createSymlink(symlink, symlinkTarget); try { - FileUtils.deleteDirectory(getTestDirectory()); + org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory()); } finally { /* * Ensure to cleanup problematic symlink or "mvn clean" will fail @@ -1548,7 +1548,7 @@ void deleteDirectoryWithDanglingSymlink() throws Exception { File symlink = new File(getTestDirectory(), "danglingSymlink"); createSymlink(symlink, symlinkTarget); try { - FileUtils.deleteDirectory(getTestDirectory()); + org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory()); } finally { /* * Ensure to cleanup problematic symlink or "mvn clean" will fail