Repository: jclouds Updated Branches: refs/heads/master e2b695046 -> 4f649b43f
JCLOUDS-827: Upgrading sshj to 0.12.0 (new group ID too) Also upgraded jsch.agentproxy.* to 0.0.9 and bouncycastle to 1.51 - required for the sshj change. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4f649b43 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4f649b43 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4f649b43 Branch: refs/heads/master Commit: 4f649b43f4a96e032e15611654eff6e8bb39c64a Parents: e2b6950 Author: Stuart Hendren <[email protected]> Authored: Mon Aug 10 16:18:11 2015 +0100 Committer: Andrew Phillips <[email protected]> Committed: Wed Aug 12 13:47:41 2015 -0400 ---------------------------------------------------------------------- drivers/bouncycastle/pom.xml | 2 +- drivers/jsch/pom.xml | 4 ++-- drivers/sshj/pom.xml | 21 ++++++++++---------- .../java/org/jclouds/sshj/SshjSshClient.java | 15 ++++++++++++-- project/pom.xml | 4 ++-- 5 files changed, 29 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/4f649b43/drivers/bouncycastle/pom.xml ---------------------------------------------------------------------- diff --git a/drivers/bouncycastle/pom.xml b/drivers/bouncycastle/pom.xml index d673615..e82527c 100644 --- a/drivers/bouncycastle/pom.xml +++ b/drivers/bouncycastle/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-ext-jdk15on</artifactId> - <version>1.49</version> + <version>1.51</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/jclouds/blob/4f649b43/drivers/jsch/pom.xml ---------------------------------------------------------------------- diff --git a/drivers/jsch/pom.xml b/drivers/jsch/pom.xml index 6aabe35..dcd17b2 100644 --- a/drivers/jsch/pom.xml +++ b/drivers/jsch/pom.xml @@ -90,12 +90,12 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.jsch</artifactId> - <version>0.0.8</version> + <version>0.0.9</version> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.connector-factory</artifactId> - <version>0.0.8</version> + <version>0.0.9</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/jclouds/blob/4f649b43/drivers/sshj/pom.xml ---------------------------------------------------------------------- diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml index 4bbfbbf..374b934 100644 --- a/drivers/sshj/pom.xml +++ b/drivers/sshj/pom.xml @@ -87,15 +87,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>net.schmizz</groupId> + <groupId>com.hierynomus</groupId> <artifactId>sshj</artifactId> - <version>0.8.1</version> - </dependency> - <!-- required by sshj --> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <version>1.49</version> + <version>0.12.0</version> <exclusions> <!-- provided by the jclouds-bouncycastle driver --> <exclusion> @@ -107,12 +101,19 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.sshj</artifactId> - <version>0.0.8</version> + <version>0.0.9</version> + <exclusions> + <!-- required due to sshj group ID change --> + <exclusion> + <groupId>net.schmizz</groupId> + <artifactId>sshj</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.connector-factory</artifactId> - <version>0.0.8</version> + <version>0.0.9</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/jclouds/blob/4f649b43/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java ---------------------------------------------------------------------- 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 b1f60b5..2d2cb0d 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java @@ -48,6 +48,7 @@ import net.schmizz.sshj.connection.channel.direct.PTYMode; import net.schmizz.sshj.connection.channel.direct.Session; import net.schmizz.sshj.connection.channel.direct.Session.Command; import net.schmizz.sshj.connection.channel.direct.SessionChannel; +import net.schmizz.sshj.sftp.RemoteFile; import net.schmizz.sshj.sftp.SFTPClient; import net.schmizz.sshj.sftp.SFTPException; import net.schmizz.sshj.transport.TransportException; @@ -271,8 +272,18 @@ public class SshjSshClient implements SshClient { @Override public Payload create() throws Exception { sftp = acquire(sftpConnection); - return Payloads.newInputStreamPayload(new CloseFtpChannelOnCloseInputStream(sftp.getSFTPEngine().open(path) - .getInputStream(), sftp)); + final RemoteFile remoteFile = sftp.getSFTPEngine().open(path); + final InputStream in = remoteFile.new RemoteFileInputStream() { + @Override + public void close() throws IOException { + try { + super.close(); + } finally { + remoteFile.close(); + } + } + }; + return Payloads.newInputStreamPayload(new CloseFtpChannelOnCloseInputStream(in, sftp)); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/4f649b43/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index b23a93f..095f800 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -577,12 +577,12 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.core</artifactId> - <version>0.0.8</version> + <version>0.0.9</version> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.connector-factory</artifactId> - <version>0.0.8</version> + <version>0.0.9</version> </dependency> </conflictingDependencies> <packages>
