You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/02/04 21:33:10 UTC
[1/3] git commit: Upgrading sshj 0.8.1 -> 0.9.0
Updated Branches:
refs/heads/up-sshj d8f245c6e -> 303fda645 (forced update)
refs/heads/up-sshj-1.6.x 91c6b6cf5 -> f10533a7b (forced update)
refs/heads/up-sshj-1.7.x 623ea793d -> 1f6237b93 (forced update)
Upgrading sshj 0.8.1 -> 0.9.0
Also need to exclude the Bouncycastle dep from sshj
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/303fda64
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/303fda64
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/303fda64
Branch: refs/heads/up-sshj
Commit: 303fda645a5d23ba78534fb2c9f37561166e4908
Parents: 32a2a7c
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Feb 3 17:20:12 2014 +0100
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Feb 4 21:21:20 2014 +0100
----------------------------------------------------------------------
drivers/sshj/pom.xml | 9 ++++++++-
.../sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/303fda64/drivers/sshj/pom.xml
----------------------------------------------------------------------
diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml
index ce85b06..d377c59 100644
--- a/drivers/sshj/pom.xml
+++ b/drivers/sshj/pom.xml
@@ -89,7 +89,14 @@
<dependency>
<groupId>net.schmizz</groupId>
<artifactId>sshj</artifactId>
- <version>0.8.1</version>
+ <version>0.9.0</version>
+ <exclusions>
+ <!-- provided by the jclouds-bouncycastle driver -->
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/303fda64/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 4115517..dfe2add 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
@@ -269,7 +269,7 @@ public class SshjSshClient implements SshClient {
public Payload create() throws Exception {
sftp = acquire(sftpConnection);
return Payloads.newInputStreamPayload(new CloseFtpChannelOnCloseInputStream(sftp.getSFTPEngine().open(path)
- .getInputStream(), sftp));
+ .new RemoteFileInputStream(), sftp));
}
@Override
[2/3] git commit: Upgrading sshj 0.8.1 -> 0.9.0
Posted by an...@apache.org.
Upgrading sshj 0.8.1 -> 0.9.0
Also need to exclude the Bouncycastle dep from sshj
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1f6237b9
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1f6237b9
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1f6237b9
Branch: refs/heads/up-sshj-1.7.x
Commit: 1f6237b938ee6c1d372f1d57f6dde9d9c793c76c
Parents: 3de11fa
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Feb 3 17:20:12 2014 +0100
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Feb 4 21:26:39 2014 +0100
----------------------------------------------------------------------
drivers/sshj/pom.xml | 9 ++++++++-
.../sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6237b9/drivers/sshj/pom.xml
----------------------------------------------------------------------
diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml
index 2b9b0de..19649d5 100644
--- a/drivers/sshj/pom.xml
+++ b/drivers/sshj/pom.xml
@@ -89,7 +89,14 @@
<dependency>
<groupId>net.schmizz</groupId>
<artifactId>sshj</artifactId>
- <version>0.8.1</version>
+ <version>0.9.0</version>
+ <exclusions>
+ <!-- provided by the jclouds-bouncycastle driver -->
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6237b9/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 4115517..dfe2add 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
@@ -269,7 +269,7 @@ public class SshjSshClient implements SshClient {
public Payload create() throws Exception {
sftp = acquire(sftpConnection);
return Payloads.newInputStreamPayload(new CloseFtpChannelOnCloseInputStream(sftp.getSFTPEngine().open(path)
- .getInputStream(), sftp));
+ .new RemoteFileInputStream(), sftp));
}
@Override
[3/3] git commit: Upgrading sshj 0.8.1 -> 0.9.0
Posted by an...@apache.org.
Upgrading sshj 0.8.1 -> 0.9.0
Also need to exclude the Bouncycastle dep from sshj
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/f10533a7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/f10533a7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/f10533a7
Branch: refs/heads/up-sshj-1.6.x
Commit: f10533a7b72afe87b2dcdcdc134ac8d79e1c8cac
Parents: c56d7ad
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Feb 3 17:20:12 2014 +0100
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Feb 4 21:29:45 2014 +0100
----------------------------------------------------------------------
drivers/sshj/pom.xml | 9 ++++++++-
.../sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/f10533a7/drivers/sshj/pom.xml
----------------------------------------------------------------------
diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml
index b30c0b5..fd6ab96 100644
--- a/drivers/sshj/pom.xml
+++ b/drivers/sshj/pom.xml
@@ -89,7 +89,14 @@
<dependency>
<groupId>net.schmizz</groupId>
<artifactId>sshj</artifactId>
- <version>0.8.1</version>
+ <version>0.9.0</version>
+ <exclusions>
+ <!-- provided by the jclouds-bouncycastle driver -->
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/f10533a7/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 dc9fb30..00ad4ca 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
@@ -269,7 +269,7 @@ public class SshjSshClient implements SshClient {
public Payload create() throws Exception {
sftp = acquire(sftpConnection);
return Payloads.newInputStreamPayload(new CloseFtpChannelOnCloseInputStream(sftp.getSFTPEngine().open(path)
- .getInputStream(), sftp));
+ .new RemoteFileInputStream(), sftp));
}
@Override