Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #944 from andrewgaul/sshj-remove-commons-io 

Remove commons-io dependency from sshj
This commit is contained in:
Adrian Cole 2012-11-04 07:30:29 -08:00
parent d0b83b88d5 f94ee03626
commit 14c056a077
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/sshj/pom.xml
View File

@ -52,7 +52,7 @@
<test.ssh.keyfile /> <test.ssh.keyfile />
<jclouds.osgi.export>org.jclouds.sshj*;version="${project.version}"</jclouds.osgi.export> <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> </properties>
<dependencies> <dependencies>
@ -93,11 +93,6 @@
<artifactId>sshj</artifactId> <artifactId>sshj</artifactId>
<version>0.8.1</version> <version>0.8.1</version>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

4
drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
View File

@ -31,6 +31,7 @@ import static org.jclouds.crypto.SshKeys.fingerprintPrivateKey;
import static org.jclouds.crypto.SshKeys.sha1PrivateKey; import static org.jclouds.crypto.SshKeys.sha1PrivateKey;
import java.io.Closeable; import java.io.Closeable;
import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.ConnectException; import java.net.ConnectException;
@ -54,7 +55,6 @@ import net.schmizz.sshj.transport.TransportException;
import net.schmizz.sshj.userauth.UserAuthException; import net.schmizz.sshj.userauth.UserAuthException;
import net.schmizz.sshj.xfer.InMemorySourceFile; import net.schmizz.sshj.xfer.InMemorySourceFile;
import org.apache.commons.io.input.ProxyInputStream;
import org.jclouds.compute.domain.ExecChannel; import org.jclouds.compute.domain.ExecChannel;
import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.domain.LoginCredentials; import org.jclouds.domain.LoginCredentials;
@ -86,7 +86,7 @@ import com.google.inject.Inject;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class SshjSshClient implements SshClient { public class SshjSshClient implements SshClient {
private final class CloseFtpChannelOnCloseInputStream extends ProxyInputStream { private final class CloseFtpChannelOnCloseInputStream extends FilterInputStream {
private final SFTPClient sftp; private final SFTPClient sftp;