Updating PR 841
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/730d2447 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/730d2447 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/730d2447 Branch: refs/heads/update-PR-841 Commit: 730d24478e98234e9e754a3240c763b23e8d4b1e Parents: e666693 Author: Andrew Phillips <[email protected]> Authored: Tue Aug 11 12:16:37 2015 -0400 Committer: Andrew Phillips <[email protected]> Committed: Tue Aug 11 12:16:37 2015 -0400 ---------------------------------------------------------------------- drivers/sshj/pom.xml | 16 ++--------- .../java/org/jclouds/sshj/SshjSshClient.java | 27 +++++++++--------- project/pom.xml | 30 -------------------- 3 files changed, 16 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/730d2447/drivers/sshj/pom.xml ---------------------------------------------------------------------- diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml index 752a59b..374b934 100644 --- a/drivers/sshj/pom.xml +++ b/drivers/sshj/pom.xml @@ -89,12 +89,7 @@ <dependency> <groupId>com.hierynomus</groupId> <artifactId>sshj</artifactId> - </dependency> - <!-- required by sshj --> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <version>1.51</version> + <version>0.12.0</version> <exclusions> <!-- provided by the jclouds-bouncycastle driver --> <exclusion> @@ -108,7 +103,7 @@ <artifactId>jsch.agentproxy.sshj</artifactId> <version>0.0.9</version> <exclusions> - <!-- Required due to sshj groupId change --> + <!-- required due to sshj group ID change --> <exclusion> <groupId>net.schmizz</groupId> <artifactId>sshj</artifactId> @@ -119,13 +114,6 @@ <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.connector-factory</artifactId> <version>0.0.9</version> - <exclusions> - <exclusion> - <!-- Required due to sshj groupId change --> - <groupId>net.schmizz</groupId> - <artifactId>sshj</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/jclouds/blob/730d2447/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 1f7fd8e..2d2cb0d 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java @@ -41,6 +41,20 @@ import javax.annotation.PreDestroy; import javax.annotation.Resource; import javax.inject.Named; +import net.schmizz.sshj.SSHClient; +import net.schmizz.sshj.common.IOUtils; +import net.schmizz.sshj.connection.ConnectionException; +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; +import net.schmizz.sshj.userauth.UserAuthException; +import net.schmizz.sshj.xfer.InMemorySourceFile; + import org.jclouds.compute.domain.ExecChannel; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.domain.LoginCredentials; @@ -66,19 +80,6 @@ import com.google.common.net.HostAndPort; import com.google.inject.Inject; import com.jcraft.jsch.agentproxy.Connector; -import net.schmizz.sshj.SSHClient; -import net.schmizz.sshj.common.IOUtils; -import net.schmizz.sshj.connection.ConnectionException; -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; -import net.schmizz.sshj.userauth.UserAuthException; -import net.schmizz.sshj.xfer.InMemorySourceFile; /** * This class needs refactoring. It is not thread safe. */ http://git-wip-us.apache.org/repos/asf/jclouds/blob/730d2447/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index aa152cd..560c2ae 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -232,7 +232,6 @@ <auto-service.version>1.0-rc2</auto-service.version> <auto-value.version>1.1</auto-value.version> <java-xmlbuilder.version>1.1</java-xmlbuilder.version> - <sshj.version>0.12.0</sshj.version> <http.proxyHost /> <http.proxyPort /> <jclouds.wire.httpstream.url>http://archive.apache.org/dist/commons/logging/binaries/commons-logging-1.1.1-bin.tar.gz</jclouds.wire.httpstream.url> @@ -362,18 +361,6 @@ <artifactId>java-xmlbuilder</artifactId> <version>${java-xmlbuilder.version}</version> </dependency> - <dependency> - <groupId>com.hierynomus</groupId> - <artifactId>sshj</artifactId> - <version>${sshj.version}</version> - <exclusions> - <!-- provided by the jclouds-bouncycastle driver --> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -585,23 +572,6 @@ <package>com.google</package> </packages> </exception> - <exception> - <conflictingDependencies> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch.agentproxy.core</artifactId> - <version>0.0.9</version> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch.agentproxy.connector-factory</artifactId> - <version>0.0.9</version> - </dependency> - </conflictingDependencies> - <packages> - <package>com.jcraft.jsch.agentproxy</package> - </packages> - </exception> </exceptions> <ignoredResources> <!-- For all the jetty packages -->
