You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/11/04 08:06:07 UTC
[camel] branch main updated: CAMEL-17164: camel-ssh - Upgrade to
SSHD 2.7.0
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 999c384 CAMEL-17164: camel-ssh - Upgrade to SSHD 2.7.0
999c384 is described below
commit 999c38491e9836073dd2b5ca4d2cafe128949d00
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Nov 4 09:05:34 2021 +0100
CAMEL-17164: camel-ssh - Upgrade to SSHD 2.7.0
---
camel-dependencies/pom.xml | 2 +-
components/camel-ftp/pom.xml | 3 +++
.../java/org/apache/camel/component/scp/ScpServerTestSupport.java | 4 ++--
parent/pom.xml | 3 +--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 3c8b604..8e6663d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -530,7 +530,7 @@
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.7</squareup-okhttp-version>
<squareup-okio-version>1.17.2</squareup-okio-version>
- <sshd-version>2.5.0</sshd-version>
+ <sshd-version>2.7.0</sshd-version>
<stax-api-version>1.0.1</stax-api-version>
<stompjms-version>1.19</stompjms-version>
<stringtemplate-version>4.3</stringtemplate-version>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index cd43779..aac39a1 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -40,6 +40,9 @@
<camel.surefire.forkTimeout>1800</camel.surefire.forkTimeout>
<camel.surefire.parallel>false</camel.surefire.parallel>
+ <!-- testing with SSHD does not work with 2.6.0 or 2.7.0: https://issues.apache.org/jira/browse/CAMEL-17163 -->
+ <sshd-version>2.5.0</sshd-version>
+
<!-- This one can run in parallel rather safely-->
<camel.failsafe.forkCount>${camel.surefire.forkCount}</camel.failsafe.forkCount>
<camel.failsafe.forkTimeout>${camel.surefire.forkTimeout}</camel.failsafe.forkTimeout>
diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
index b651319..f97e4c8 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
@@ -31,12 +31,12 @@ import com.jcraft.jsch.UserInfo;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import org.apache.sshd.scp.server.ScpCommandFactory;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.password.PasswordAuthenticator;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
-import org.apache.sshd.server.scp.ScpCommandFactory;
import org.apache.sshd.server.session.ServerSession;
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
+import org.apache.sshd.sftp.server.SftpSubsystemFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/parent/pom.xml b/parent/pom.xml
index 5516b15..2db7cd4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -520,8 +520,7 @@
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.7</squareup-okhttp-version>
<squareup-okio-version>1.17.2</squareup-okio-version>
- <!-- sshd 2.6.0 does not work with camel-ftp tests -->
- <sshd-version>2.5.0</sshd-version>
+ <sshd-version>2.7.0</sshd-version>
<stompjms-version>1.19</stompjms-version>
<swagger-java-version>1.6.2</swagger-java-version>
<swagger-openapi3-version>2.1.11</swagger-openapi3-version>