You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/10/27 12:01:06 UTC

git commit: extract deleteDirectory to method, so we can switch to other implementation if we want, like for JGit. Still doesn't solve Windows issue right now, though.

Updated Branches:
  refs/heads/master 2414017e0 -> a9d4eca81


extract deleteDirectory to method, so we can switch to other implementation if we want, like for JGit. Still doesn't solve Windows issue right now, though.


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/a9d4eca8
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/a9d4eca8
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/a9d4eca8

Branch: refs/heads/master
Commit: a9d4eca81e26bc997e10f9c6b012f1092585c942
Parents: 2414017
Author: rfscholte <rf...@apache.org>
Authored: Sun Oct 27 12:00:18 2013 +0100
Committer: rfscholte <rf...@apache.org>
Committed: Sun Oct 27 12:00:18 2013 +0100

----------------------------------------------------------------------
 .../command/branch/JGitBranchCommandTckTest.java     | 10 ++++++++++
 .../changelog/JGitChangeLogCommandTckTest.java       | 11 +++++++++++
 .../command/checkin/JGitCheckInCommandTckTest.java   | 11 +++++++++++
 .../command/checkout/JGitCheckOutCommandTckTest.java | 11 +++++++++++
 .../jgit/command/diff/JGitDiffCommandTckTest.java    | 11 +++++++++++
 .../remoteinfo/JGitRemoteInfoCommandTckTest.java     | 11 +++++++++++
 .../command/status/JGitStatusCommandTckTest.java     | 11 +++++++++++
 .../git/jgit/command/tag/JGitTagCommandTckTest.java  | 11 +++++++++++
 .../main/java/org/apache/maven/scm/ScmTestCase.java  | 15 ++++++++++-----
 .../scm/tck/command/branch/BranchCommandTckTest.java |  2 +-
 .../tck/command/checkout/CheckOutCommandTckTest.java | 11 +++++------
 .../maven/scm/tck/command/tag/TagCommandTckTest.java |  2 +-
 .../scm/tck/command/update/UpdateCommandTckTest.java |  5 ++---
 13 files changed, 106 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java
index fe03f1e..cad415e 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommandTckTest.java
@@ -19,8 +19,12 @@ package org.apache.maven.scm.provider.git.jgit.command.branch;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.branch.GitBranchCommandTckTest;
+import org.eclipse.jgit.util.FileUtils;
 
 /**
  * @author Dominik Bartholdi (imod)
@@ -37,4 +41,10 @@ public class JGitBranchCommandTckTest
         return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "jgit" );
     }
 
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java
index b8d72bb..4bf003e 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommandTckTest.java
@@ -1,7 +1,11 @@
 package org.apache.maven.scm.provider.git.jgit.command.changelog;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.changelog.GitChangeLogCommandTckTest;
+import org.eclipse.jgit.util.FileUtils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -36,4 +40,11 @@ public class JGitChangeLogCommandTckTest
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "jgit" );
     }
+
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java
index af2b90d..f708713 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandTckTest.java
@@ -19,8 +19,12 @@ package org.apache.maven.scm.provider.git.jgit.command.checkin;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.checkin.GitCheckInCommandTckTest;
+import org.eclipse.jgit.util.FileUtils;
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
@@ -36,4 +40,11 @@ public class JGitCheckInCommandTckTest
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "jgit" );
     }
+
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java
index f1b31b5..5e349f1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommandTckTest.java
@@ -20,8 +20,12 @@ package org.apache.maven.scm.provider.git.jgit.command.checkout;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.checkout.GitCheckOutCommandTckTest;
+import org.eclipse.jgit.util.FileUtils;
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
@@ -37,4 +41,11 @@ public class JGitCheckOutCommandTckTest
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "jgit" );
     }
+
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
index 02356e5..1477c32 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommandTckTest.java
@@ -19,8 +19,12 @@ package org.apache.maven.scm.provider.git.jgit.command.diff;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.diff.GitDiffCommandTckTest;
+import org.eclipse.jgit.util.FileUtils;
 
 public class JGitDiffCommandTckTest extends GitDiffCommandTckTest {
 
@@ -32,4 +36,11 @@ public class JGitDiffCommandTckTest extends GitDiffCommandTckTest {
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "jgit" );
     }
+
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java
index a801528..e932032 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommandTckTest.java
@@ -19,11 +19,15 @@ package org.apache.maven.scm.provider.git.jgit.command.remoteinfo;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
 import org.apache.maven.scm.provider.ScmProviderRepository;
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.remoteinfo.AbstractGitRemoteInfoCommandTckTest;
 import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.eclipse.jgit.util.FileUtils;
 
 /**
  * 
@@ -58,4 +62,11 @@ public class JGitRemoteInfoCommandTckTest extends AbstractGitRemoteInfoCommandTc
     {
         return new GitScmProviderRepository( getScmUrl().substring( "scm:jgit:".length() ) );
     }
+
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
index b99bff2..eedeb4d 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/status/JGitStatusCommandTckTest.java
@@ -19,8 +19,12 @@ package org.apache.maven.scm.provider.git.jgit.command.status;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.status.GitStatusCommandTckTest;
+import org.eclipse.jgit.util.FileUtils;
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Strubergr</a>
@@ -36,4 +40,11 @@ public class JGitStatusCommandTckTest
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "jgit" );
     }
+
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java
index 6b32dd3..30501d6 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommandTckTest.java
@@ -19,8 +19,12 @@ package org.apache.maven.scm.provider.git.jgit.command.tag;
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.maven.scm.provider.git.GitScmTestUtils;
 import org.apache.maven.scm.provider.git.command.tag.GitTagCommandTckTest;
+import org.eclipse.jgit.util.FileUtils;
 
 /**
  * This test tests the tag command.
@@ -38,4 +42,11 @@ public class JGitTagCommandTckTest
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "jgit" );
     }
+
+    @Override
+    protected void deleteDirectory( File directory )
+        throws IOException
+    {
+        FileUtils.delete( directory, FileUtils.RECURSIVE | FileUtils.RETRY );
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
----------------------------------------------------------------------
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 3f8cfe0..c4b148f 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
@@ -60,15 +60,15 @@ public abstract class ScmTestCase
     {
         super.setUp();
 
-        FileUtils.deleteDirectory( getRepositoryRoot() );
+        deleteDirectory( getRepositoryRoot() );
         assertFalse( getRepositoryRoot().exists() );
-        FileUtils.deleteDirectory( getWorkingCopy() );
+        deleteDirectory( getWorkingCopy() );
         assertFalse( getWorkingCopy().exists() );
-        FileUtils.deleteDirectory( getWorkingDirectory() );
+        deleteDirectory( getWorkingDirectory() );
         assertFalse( getWorkingDirectory().exists() );
-        FileUtils.deleteDirectory( getAssertionCopy() );
+        deleteDirectory( getAssertionCopy() );
         assertFalse( getAssertionCopy().exists() );
-        FileUtils.deleteDirectory( getUpdatingCopy() );
+        deleteDirectory( getUpdatingCopy() );
         assertFalse( getUpdatingCopy().exists() );
 
         scmManager = null;
@@ -303,6 +303,11 @@ public abstract class ScmTestCase
         }
     }
 
+    protected void deleteDirectory( File directory ) throws IOException
+    {
+        FileUtils.deleteDirectory( directory );   
+    }
+
     public static Date getDate( int year, int month, int day )
     {
         return getDate( year, month, day, 0, 0, 0, null );

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
index 5dd6770..72c202a 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
@@ -74,7 +74,7 @@ public abstract class BranchCommandTckTest
 
         assertEquals( "check readme.txt contents", "changed file", FileUtils.fileRead( readmeTxt ) );
 
-        FileUtils.deleteDirectory( getAssertionCopy() );
+        deleteDirectory( getAssertionCopy() );
 
         assertFalse( "check previous assertion copy deleted", getAssertionCopy().exists() );
 

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
index ebdcf6b..c4351a6 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
@@ -19,16 +19,15 @@ package org.apache.maven.scm.tck.command.checkout;
  * under the License.
  */
 
-import org.apache.maven.scm.ScmFile;
-import org.apache.maven.scm.ScmTckTestCase;
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-import org.codehaus.plexus.util.FileUtils;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmTckTestCase;
+import org.apache.maven.scm.command.checkout.CheckOutScmResult;
+
 /**
  * This test tests the check out command.
  *
@@ -41,7 +40,7 @@ public abstract class CheckOutCommandTckTest
     public void testCheckOutCommandTest()
         throws Exception
     {
-        FileUtils.deleteDirectory( getWorkingCopy() );
+        deleteDirectory( getWorkingCopy() );
 
         CheckOutScmResult result = checkOut( getWorkingCopy(), getScmRepository() );
 

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
index 3d7d0ae..332083b 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
@@ -74,7 +74,7 @@ public abstract class TagCommandTckTest
 
         assertEquals( "check readme.txt contents", "changed file", FileUtils.fileRead( readmeTxt ) );
 
-        FileUtils.deleteDirectory( getAssertionCopy() );
+        deleteDirectory( getAssertionCopy() );
 
         assertFalse( "check previous assertion copy deleted", getAssertionCopy().exists() );
 

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a9d4eca8/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
index 08d1d85..cc1c7bc 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
@@ -35,7 +35,6 @@ import org.apache.maven.scm.command.checkin.CheckInScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
 import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -78,11 +77,11 @@ public abstract class UpdateCommandTckTest
         throws Exception
     {
         
-        FileUtils.deleteDirectory( getUpdatingCopy() );
+        deleteDirectory( getUpdatingCopy() );
         
         assertFalse( getUpdatingCopy().exists() );    
         
-        //FileUtils.deleteDirectory( getWorkingCopy() );
+        //deleteDirectory( getWorkingCopy() );
         
         //assertFalse( getUpdatingCopy().exists() );