You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/03/27 12:50:50 UTC
[4/4] git commit: use commons-lang commons-io rather than plexus-utils
use commons-lang commons-io rather than plexus-utils
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/05a76e1e
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/05a76e1e
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/05a76e1e
Branch: refs/heads/master
Commit: 05a76e1ec762cec4175e59f4d15e93bb0086f235
Parents: 0268188
Author: olivier lamy <ol...@apache.org>
Authored: Wed Mar 27 22:50:34 2013 +1100
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Mar 27 22:50:34 2013 +1100
----------------------------------------------------------------------
wagon-providers/wagon-file/pom.xml | 6 ++++++
.../maven/wagon/providers/file/FileWagon.java | 2 +-
wagon-providers/wagon-ftp/pom.xml | 4 ++++
.../apache/maven/wagon/providers/ftp/FtpWagon.java | 4 ++--
.../maven/wagon/providers/ftp/FtpWagonTest.java | 5 +++--
5 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05a76e1e/wagon-providers/wagon-file/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-file/pom.xml b/wagon-providers/wagon-file/pom.xml
index 33c8ad5..fcbcf6f 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -32,4 +32,10 @@ under the License.
<description>
Wagon provider that gets and puts artifacts using file system protocol
</description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05a76e1e/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
index d6ce25f..edce708 100644
--- a/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
+++ b/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
@@ -30,6 +30,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.InputData;
import org.apache.maven.wagon.LazyFileOutputStream;
@@ -40,7 +41,6 @@ import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
/**
* Wagon Provider for Local File System
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05a76e1e/wagon-providers/wagon-ftp/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ftp/pom.xml b/wagon-providers/wagon-ftp/pom.xml
index c25a5d7..a7bac49 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -54,6 +54,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05a76e1e/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
index 7e961f9..607c457 100644
--- a/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
+++ b/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
@@ -19,6 +19,7 @@ package org.apache.maven.wagon.providers.ftp;
* under the License.
*/
+import org.apache.commons.io.IOUtils;
import org.apache.commons.net.ProtocolCommandEvent;
import org.apache.commons.net.ProtocolCommandListener;
import org.apache.commons.net.ftp.FTP;
@@ -38,7 +39,6 @@ import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.apache.maven.wagon.resource.Resource;
-import org.codehaus.plexus.util.IOUtil;
import java.io.File;
import java.io.FileInputStream;
@@ -664,7 +664,7 @@ public class FtpWagon
}
finally
{
- IOUtil.close( sourceFileStream );
+ IOUtils.close( sourceFileStream );
}
}
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05a76e1e/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
index fe61ac3..6c8f401 100644
--- a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
+++ b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
@@ -19,6 +19,7 @@ package org.apache.maven.wagon.providers.ftp;
* under the License.
*/
+import org.apache.commons.io.FileUtils;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.ftplet.Authority;
@@ -34,7 +35,7 @@ import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
-import org.codehaus.plexus.util.FileUtils;
+
import java.io.File;
import java.util.ArrayList;
@@ -199,7 +200,7 @@ public class FtpWagonTest
{
// do the cleanup first
File destDir = new File( getRepositoryDirectory(), "dirExists" );
- FileUtils.deleteDirectory(destDir);
+ FileUtils.deleteDirectory( destDir );
destDir.mkdirs();
destDir = new File( destDir, "not_yet_existing/also_not" );