[WAGON-379] webdav site deployement fail with mvn 2.2.1.
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/6b664d69 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/6b664d69 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/6b664d69 Branch: refs/heads/master Commit: 6b664d691c9a0fec8a09b77a0f57c1945691db8a Parents: bf6a825 Author: olivier lamy <[email protected]> Authored: Thu Oct 11 22:32:18 2012 +0200 Committer: olivier lamy <[email protected]> Committed: Thu Oct 11 22:32:18 2012 +0200 ---------------------------------------------------------------------- pom.xml | 11 ++++++++++- wagon-providers/wagon-http-shared/pom.xml | 8 ++++++++ .../wagon/shared/http/AbstractHttpClientWagon.java | 8 ++++---- wagon-providers/wagon-webdav-jackrabbit/pom.xml | 14 ++++++++++++++ 4 files changed, 36 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6b664d69/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 53d07ef..e82eea6 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,16 @@ under the License. <scope>test</scope> </dependency> - + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.2</version> + </dependency> <dependency> <groupId>easymock</groupId> <artifactId>easymock</artifactId> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6b664d69/wagon-providers/wagon-http-shared/pom.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-http-shared/pom.xml b/wagon-providers/wagon-http-shared/pom.xml index 47f20e4..00d61d9 100644 --- a/wagon-providers/wagon-http-shared/pom.xml +++ b/wagon-providers/wagon-http-shared/pom.xml @@ -75,5 +75,13 @@ under the License. <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</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/6b664d69/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java index 2e0d225..62b5c12 100644 --- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java +++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java @@ -39,6 +39,8 @@ import org.apache.commons.httpclient.methods.RequestEntity; import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.httpclient.util.DateParseException; import org.apache.commons.httpclient.util.DateUtil; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.maven.wagon.InputData; import org.apache.maven.wagon.OutputData; import org.apache.maven.wagon.PathUtils; @@ -51,8 +53,6 @@ import org.apache.maven.wagon.events.TransferEvent; import org.apache.maven.wagon.proxy.ProxyInfo; import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.resource.Resource; -import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.StringUtils; import java.io.ByteArrayInputStream; import java.io.File; @@ -100,7 +100,7 @@ public abstract class AbstractHttpClientWagon { try { - byte[] bytes = IOUtil.toByteArray( stream ); + byte[] bytes = IOUtils.toByteArray( stream ); this.byteBuffer = ByteBuffer.allocate( bytes.length ); this.byteBuffer.put( bytes ); } @@ -163,7 +163,7 @@ public abstract class AbstractHttpClientWagon } finally { - IOUtil.close( fin ); + IOUtils.closeQuietly( fin ); } output.flush(); http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6b664d69/wagon-providers/wagon-webdav-jackrabbit/pom.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml b/wagon-providers/wagon-webdav-jackrabbit/pom.xml index d847389..6323b7d 100644 --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml @@ -63,6 +63,20 @@ under the License. </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.1</version>
