This is an automated email from the ASF dual-hosted git repository.
acosentino 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 bbfac4f72cc Upgrade Jsch to version 0.2.15 (#12505)
bbfac4f72cc is described below
commit bbfac4f72cc9c610611035c824fb9210ff617acf
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Dec 20 13:51:48 2023 +0100
Upgrade Jsch to version 0.2.15 (#12505)
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../apache/camel/component/file/remote/FtpSoTimeoutTest.java | 12 ++++++------
parent/pom.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java
index 9aa8fa9318b..deb7b4d0b38 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.file.remote;
+import java.net.ServerSocket;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.RoutesBuilder;
@@ -28,9 +31,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import java.net.ServerSocket;
-import java.util.concurrent.TimeUnit;
-
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
@@ -78,15 +78,15 @@ public class FtpSoTimeoutTest extends CamelTestSupport {
public void configure() {
from("direct:with").to("ftp://localhost:"; +
serverSocket.getLocalPort()
- +
"?ftpClient=#myftpclient&connectTimeout=300&soTimeout=300&reconnectDelay=100");
+ +
"?ftpClient=#myftpclient&connectTimeout=300&soTimeout=300&reconnectDelay=100");
from("direct:without").to("ftp://localhost:"; +
serverSocket.getLocalPort()
- +
"?connectTimeout=300&soTimeout=300&reconnectDelay=100");
+ +
"?connectTimeout=300&soTimeout=300&reconnectDelay=100");
// using soTimeout=0 could potentially cause the ftp producer
to dead-lock doing endless reconnection attempts
// this is a test to ensure we have fixed that; see CAMEL-8088
from("direct:soTimeoutZero").to("ftp://localhost:"; +
serverSocket.getLocalPort()
- + "?connectTimeout=300&soTimeout=0")
+ +
"?connectTimeout=300&soTimeout=0")
.to("mock:done")
.errorHandler(deadLetterChannel("mock:dead"));
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 670815ef43e..b6cd62eb182 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -277,7 +277,7 @@
<johnzon-version>2.0.0</johnzon-version>
<jslt-version>0.1.14</jslt-version>
<jsmpp-version>3.0.0</jsmpp-version>
- <jsch-version>0.2.13</jsch-version>
+ <jsch-version>0.2.15</jsch-version>
<javax-json-api-version>1.1.4</javax-json-api-version>
<jsonassert-version>1.5.1</jsonassert-version>
<json-path-version>2.8.0</json-path-version>
