From f94ee03626812ae30ab97d81a1a4e317b7063e68 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <gaul@maginatics.com>
Date: Fri, 2 Nov 2012 16:05:07 -0700
Subject: [PATCH] Remove commons-io dependency from sshj

FilterInputStream suffices since we only override close.
---
 drivers/sshj/pom.xml                                       | 7 +------
 .../sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml
index c22f77e45c..f3c5509127 100644
--- a/drivers/sshj/pom.xml
+++ b/drivers/sshj/pom.xml
@@ -52,7 +52,7 @@
         <test.ssh.keyfile />
 
         <jclouds.osgi.export>org.jclouds.sshj*;version="${project.version}"</jclouds.osgi.export>
-        <jclouds.osgi.import>org.jclouds*;version="${project.version}",org.apache.commons.io.input;version="[1.4,3)",*</jclouds.osgi.import>
+        <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
     </properties>
 
     <dependencies>
@@ -93,11 +93,6 @@
             <artifactId>sshj</artifactId>
             <version>0.8.1</version>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
index 437c14398d..837448513f 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
@@ -31,6 +31,7 @@ import static org.jclouds.crypto.SshKeys.fingerprintPrivateKey;
 import static org.jclouds.crypto.SshKeys.sha1PrivateKey;
 
 import java.io.Closeable;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.ConnectException;
@@ -54,7 +55,6 @@ import net.schmizz.sshj.transport.TransportException;
 import net.schmizz.sshj.userauth.UserAuthException;
 import net.schmizz.sshj.xfer.InMemorySourceFile;
 
-import org.apache.commons.io.input.ProxyInputStream;
 import org.jclouds.compute.domain.ExecChannel;
 import org.jclouds.compute.domain.ExecResponse;
 import org.jclouds.domain.LoginCredentials;
@@ -86,7 +86,7 @@ import com.google.inject.Inject;
 @SuppressWarnings("unchecked")
 public class SshjSshClient implements SshClient {
 
-   private final class CloseFtpChannelOnCloseInputStream extends ProxyInputStream {
+   private final class CloseFtpChannelOnCloseInputStream extends FilterInputStream {
 
       private final SFTPClient sftp;