You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2018/07/27 07:07:45 UTC
[camel] branch master updated: CAMEL-12674 - upgrade sshd-core and
replace it specific ones by version 2.0.0
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 63be5a1 CAMEL-12674 - upgrade sshd-core and replace it specific ones by version 2.0.0
63be5a1 is described below
commit 63be5a1b27a8dbbec928ab8caa7b124c04d7d5f2
Author: onders <on...@apache.org>
AuthorDate: Mon Jul 23 16:01:15 2018 +0300
CAMEL-12674 - upgrade sshd-core and replace it specific ones by version 2.0.0
---
components/camel-ftp/pom.xml | 8 +++++++-
components/camel-jsch/pom.xml | 8 +++++++-
.../java/org/apache/camel/component/ssh/EchoCommandFactory.java | 4 ++--
.../org/apache/camel/component/ssh/TestEchoCommandFactory.java | 2 +-
parent/pom.xml | 2 +-
5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index d668b71..de0c3fc 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -108,7 +108,13 @@
<!-- for testing sftp -->
<dependency>
<groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>${sshd-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-scp</artifactId>
<version>${sshd-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index bd95975..e780e61 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -82,7 +82,13 @@
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
+ <artifactId>sshd-scp</artifactId>
+ <version>${sshd-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
<version>${sshd-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java
index 7509161..b4b046f 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/EchoCommandFactory.java
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.sshd.server.Command;
-import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.Environment;
import org.apache.sshd.server.ExitCallback;
+import org.apache.sshd.server.command.Command;
+import org.apache.sshd.server.command.CommandFactory;
public class EchoCommandFactory implements CommandFactory {
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java
index b8cac98..46b865d 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.ssh;
import java.util.concurrent.CountDownLatch;
-import org.apache.sshd.server.Command;
+import org.apache.sshd.server.command.Command;
public class TestEchoCommandFactory extends EchoCommandFactory {
diff --git a/parent/pom.xml b/parent/pom.xml
index 774d39a..78fb79f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -665,7 +665,7 @@
<squareup-okio-bundle-version>1.14.0_1</squareup-okio-bundle-version>
<squareup-retrofit-bundle-version>1.9.0_1</squareup-retrofit-bundle-version>
<squareup-retrofit2-bundle-version>2.4.0_1</squareup-retrofit2-bundle-version>
- <sshd-version>1.7.0</sshd-version>
+ <sshd-version>2.0.0</sshd-version>
<stompjms-version>1.19</stompjms-version>
<swagger-scala-version>1.3.12</swagger-scala-version>
<swagger-scala-guava-version>15.0</swagger-scala-guava-version>