maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r989378 - in /maven/wagon/trunk: wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java wagon-tcks/wagon-tck-http/pom.xml
Date Wed, 25 Aug 2010 21:34:16 GMT
Author: olamy
Date: Wed Aug 25 21:34:16 2010
New Revision: 989378

URL: http://svn.apache.org/viewvc?rev=989378&view=rev
Log:
prevent io failure on os with bad io (windauze).
some update on versions for tck-http.

Modified:
    maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java
    maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml

Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java?rev=989378&r1=989377&r2=989378&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java
(original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java
Wed Aug 25 21:34:16 2010
@@ -24,6 +24,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 
+import org.codehaus.plexus.util.FileUtils;
+
 /**
  * @author <a href="michal@apache.org>Michal Maczka</a>
  * @version $Id$
@@ -62,14 +64,18 @@ public class FileTestUtils
         final File baseDirectory = getTestOutputDir();
 
         final File retValue = new File( baseDirectory, name );
-
-        retValue.delete();
-
+       
+        if ( retValue.exists() )
+        {
+            FileUtils.cleanDirectory( retValue );
+            return retValue;
+        }
+        
         retValue.mkdirs();
 
         if ( !retValue.exists() )
         {
-            throw new IOException( "Unable to create the directory for testdata" );
+            throw new IOException( "Unable to create the directory for testdata " + retValue.getPath()
);
         }
 
         return retValue;

Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml?rev=989378&r1=989377&r2=989378&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml Wed Aug 25 21:34:16 2010
@@ -16,36 +16,36 @@
   <dependencies>
     <!-- TODO: Split this out into a sample project that shows how to use this TCK. -->
     <dependency>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http-lightweight</artifactId>
-        <version>1.0-beta-6</version>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http-lightweight</artifactId>
+      <version>1.0-beta-6</version>
     </dependency>
     <dependency>
-    	<groupId>org.codehaus.plexus</groupId>
-    	<artifactId>plexus-container-default</artifactId>
-    	<version>1.0-alpha-9-stable-1</version>
-    	<!-- override test scope from parents -->
-    	<scope>compile</scope>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-9-stable-1</version>
+      <!-- override test scope from parents -->
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.8.1</version>
     </dependency>
     <dependency>
-    	<groupId>org.mortbay.jetty</groupId>
-    	<artifactId>jetty</artifactId>
-    	<version>6.1.21</version>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.21</version>
     </dependency>
     <dependency>
-    	<groupId>org.apache.maven.wagon</groupId>
-    	<artifactId>wagon-provider-api</artifactId>
-    	<version>1.0-beta-6</version>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-provider-api</artifactId>
+      <version>1.0-beta-6</version>
     </dependency>
     <dependency>
-    	<groupId>commons-codec</groupId>
-    	<artifactId>commons-codec</artifactId>
-    	<version>1.4</version>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.4</version>
     </dependency>
   </dependencies>
   
@@ -54,7 +54,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
+          <version>2.3.1</version>
           <configuration>
             <source>1.5</source>
             <target>1.5</target>



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org


Mime
View raw message