[
https://issues.apache.org/jira/browse/CAMEL-12674?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16559354#comment-16559354
]
ASF GitHub Bot commented on CAMEL-12674:
----------------------------------------
onderson closed pull request #2434: CAMEL-12674 - upgrade sshd-core and replace
it specific ones by versi…
URL: https://github.com/apache/camel/pull/2434
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index d668b7131af..de0c3fc2a3e 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 bd959750cfb..e780e6153cf 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 75091611446..b4b046f9e98 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.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 b8cac988c13..46b865d07fa 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 @@
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 f37b305ce6b..47eb520496f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -670,7 +670,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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Update sshd-version
> -------------------
>
> Key: CAMEL-12674
> URL: https://issues.apache.org/jira/browse/CAMEL-12674
> Project: Camel
> Issue Type: Improvement
> Components: camel-ftp, camel-jsch, camel-ssh
> Reporter: Önder Sezgin
> Assignee: Önder Sezgin
> Priority: Minor
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
