diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java index 323581ce5..91a824a02 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; +import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -34,7 +35,6 @@ import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.settings.crypto.SettingsDecrypter; -import org.codehaus.plexus.util.FileUtils; /** * Get a fresh copy of the latest source from the configured scm url. diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java index a701f8251..1a32cf88f 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; +import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -32,7 +33,6 @@ import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.repository.ScmRepository; import org.apache.maven.settings.crypto.SettingsDecrypter; -import org.codehaus.plexus.util.FileUtils; /** * Get a fresh exported copy of the latest source from the configured scm url. diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java index 91bd82b4c..263f09f43 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/BranchMojoTest.java @@ -99,7 +99,7 @@ public void testBranch() throws Exception { File branchCheckoutDir = PlexusJUnit4TestCase.getTestFile("target/branches/mybranch"); if (branchCheckoutDir.exists()) { - FileUtils.deleteDirectory(branchCheckoutDir); + org.apache.commons.io.FileUtils.deleteDirectory(branchCheckoutDir); } checkoutMojo.setCheckoutDirectory(branchCheckoutDir); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java index 0628c02a0..aff0e63e5 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java @@ -94,7 +94,7 @@ public void testTag() throws Exception { File tagCheckoutDir = getTestFile("target/tags/mytag"); if (tagCheckoutDir.exists()) { - FileUtils.deleteDirectory(tagCheckoutDir); + org.apache.commons.io.FileUtils.deleteDirectory(tagCheckoutDir); } checkoutMojo.setCheckoutDirectory(tagCheckoutDir); diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java index db2081482..9ae8d30ac 100644 --- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java +++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java @@ -20,9 +20,9 @@ import java.io.File; +import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.scm.provider.git.GitScmTestUtils; -import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; import org.junit.Before; import org.junit.Test; diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java index 64069d870..843169cbb 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; @@ -36,7 +37,6 @@ import org.apache.maven.scm.provider.hg.command.HgCommandConstants; import org.apache.maven.scm.provider.hg.command.HgConsumer; import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository; -import org.codehaus.plexus.util.FileUtils; /** * @author thurner rupert diff --git a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java index adc0ed2fd..453ce0cc4 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgRepoUtils.java @@ -56,7 +56,7 @@ public static String getScmUrl() throws Exception { public static void initRepo() throws Exception { // Prepare tmp directory if (WORKING_DIR.exists()) { - FileUtils.deleteDirectory(WORKING_DIR); + org.apache.commons.io.FileUtils.deleteDirectory(WORKING_DIR); if (WORKING_DIR.exists()) { throw new IOException(WORKING_DIR.getAbsolutePath() + " wasn't deleted."); diff --git a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java index d35f0c2c4..7312c26d7 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommand.java @@ -72,7 +72,7 @@ protected CheckOutScmResult executeCheckOutCommand( try { if (baseDestination.exists()) { - FileUtils.deleteDirectory(baseDestination); + org.apache.commons.io.FileUtils.deleteDirectory(baseDestination); } if (!baseDestination.mkdirs()) { diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java index d3cbbabfc..a79ab266c 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java @@ -64,7 +64,7 @@ public void initRepo() throws Exception { */ @Test public void testMetadata() throws Exception { - FileUtils.deleteDirectory(getWorkingCopy()); + org.apache.commons.io.FileUtils.deleteDirectory(getWorkingCopy()); CheckOutScmResult result = checkOut(getWorkingCopy(), getScmRepository()); diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java index 1964f3c83..8ce7aec62 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java @@ -64,7 +64,7 @@ public void initRepo() throws Exception { */ @Test public void testDeletion() throws Exception { - FileUtils.deleteDirectory(getUpdatingCopy()); + org.apache.commons.io.FileUtils.deleteDirectory(getUpdatingCopy()); ScmRepository repository = makeScmRepository(getScmUrl()); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java index 3fabe14b8..0dde933d1 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandNoBranchTest.java @@ -56,7 +56,7 @@ public void testCheckinNoBranch() throws Exception { File repoOriginal = new File("src/test/resources/repository_no_branch"); File repo = getTestFile("target/git_copy"); - FileUtils.deleteDirectory(repo); + org.apache.commons.io.FileUtils.deleteDirectory(repo); FileUtils.copyDirectoryStructure(repoOriginal, repo); ScmRepository scmRepository = getScmManager() @@ -89,7 +89,7 @@ public void testCheckinNoBranch() throws Exception { } protected CheckOutScmResult checkoutRepo(ScmRepository scmRepository) throws Exception { - FileUtils.deleteDirectory(workingDirectory); + org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory); CheckOutScmResult result = getScmManager().checkOut(scmRepository, new ScmFileSet(workingDirectory), (ScmVersion) null); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java index a6c2ebaf6..c174d6b97 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java @@ -240,7 +240,7 @@ public void testSignedCheckin() throws Exception { // ---------------------------------------------------------------------- private CheckOutScmResult checkoutRepoInto(File workingCopy, ScmRepository scmRepository) throws Exception { - FileUtils.deleteDirectory(workingCopy); + org.apache.commons.io.FileUtils.deleteDirectory(workingCopy); workingCopy.mkdir(); CheckOutScmResult result = diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java index 55f50a9ce..ad2483850 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeCheckOutCommandNoBranchTest.java @@ -20,12 +20,12 @@ import java.io.File; +import org.apache.commons.io.FileUtils; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.ScmVersion; import org.apache.maven.scm.command.checkout.CheckOutScmResult; import org.apache.maven.scm.repository.ScmRepository; -import org.codehaus.plexus.util.FileUtils; import org.junit.Before; import org.junit.Test; diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java index 1c604a6d0..a50e84f46 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java @@ -44,7 +44,7 @@ public void testCommandRemoveWithFile() throws Exception { assertCommandLine("git rm -- toto.xml", workingDirectory, cl); - FileUtils.deleteDirectory(workingDirectory); + org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory); } @Test @@ -58,7 +58,7 @@ public void testCommandRemoveWithDirectory() throws Exception { assertCommandLine("git rm -r -- toto", workingDirectory, cl); - FileUtils.deleteDirectory(workingDirectory); + org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory); } @Test @@ -76,7 +76,7 @@ public void testCommandRemoveWithTwoDirectory() throws Exception { assertCommandLine("git rm -r -- toto tata", workingDirectory, cl); - FileUtils.deleteDirectory(workingDirectory); + org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory); } private File createTempDirectory() throws IOException { diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java index 43d0e1ac1..74d43f799 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java @@ -40,7 +40,7 @@ private GitScmTestUtils() {} public static void initRepo(File repository, File workingDirectory, File assertionDirectory) throws IOException { initRepo("src/test/repository/", repository, workingDirectory); - FileUtils.deleteDirectory(assertionDirectory); + org.apache.commons.io.FileUtils.deleteDirectory(assertionDirectory); Assert.assertTrue(assertionDirectory.mkdirs()); } @@ -49,7 +49,7 @@ public static void initRepo(String source, File repository, File workingDirector // Copy the repository to target File src = PlexusJUnit4TestCase.getTestFile(source); - FileUtils.deleteDirectory(repository); + org.apache.commons.io.FileUtils.deleteDirectory(repository); Assert.assertTrue(repository.mkdirs()); @@ -61,7 +61,7 @@ public static void initRepo(String source, File repository, File workingDirector FileUtils.copyDirectoryStructure(dotGitDirectory, new File(repository, ".git")); } - FileUtils.deleteDirectory(workingDirectory); + org.apache.commons.io.FileUtils.deleteDirectory(workingDirectory); Assert.assertTrue(workingDirectory.mkdirs()); } @@ -78,7 +78,7 @@ public static void deleteAllDirectories(File startDirectory, String pattern) thr File child = childs[i]; if (child.isDirectory()) { if (child.getName().equals(pattern)) { - FileUtils.deleteDirectory(child); + org.apache.commons.io.FileUtils.deleteDirectory(child); } else { deleteAllDirectories(child, pattern); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java index d13411010..f063ae08f 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java @@ -146,7 +146,7 @@ public void testCommitNoVerify() throws Exception { } private CheckOutScmResult checkoutRepoInto(File workingCopy, ScmRepository scmRepository) throws Exception { - FileUtils.deleteDirectory(workingCopy); + org.apache.commons.io.FileUtils.deleteDirectory(workingCopy); workingCopy.mkdir(); CheckOutScmResult result = getScmManager().checkOut(scmRepository, new ScmFileSet(workingCopy), null); diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java index eb08205eb..ad27fd94e 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java @@ -20,12 +20,12 @@ import java.io.File; +import org.apache.commons.io.FileUtils; import org.apache.maven.scm.ScmRevision; import org.apache.maven.scm.ScmTestCase; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository; import org.apache.maven.scm.repository.ScmRepository; -import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.cli.Commandline; import org.junit.Before; import org.junit.Test; diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java index 2d87cd02d..0a6fe3b41 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/src/main/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java @@ -22,8 +22,8 @@ import java.io.FileInputStream; import java.io.InputStream; +import org.apache.commons.io.FileUtils; import org.apache.maven.scm.ScmTestCase; -import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java index 8cf1294d7..bab209881 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java @@ -264,7 +264,7 @@ public static void makeFile(File basedir, String fileName, String contents) thro } protected void deleteDirectory(File directory) throws IOException { - FileUtils.deleteDirectory(directory); + org.apache.commons.io.FileUtils.deleteDirectory(directory); } public static Date getDate(int year, int month, int day) {