You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/04/04 16:57:33 UTC

(camel-quarkus) branch 3.8.x updated (7cf29c6fa1 -> d58c1c602c)

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a change to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


    from 7cf29c6fa1 JT400 Inquiry test
     new 81f1308f94 Remove jsch container DOCKER_MODS configuration
     new d58c1c602c [NettyHttp] Increase proxy connection timeout and make it configurable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/camel/quarkus/component/http/common/HttpTestResource.java    | 1 +
 .../component/http/netty/ProxyCapableClientInitializerFactory.java      | 2 +-
 .../org/apache/camel/quarkus/component/jsch/it/JschTestResource.java    | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)


(camel-quarkus) 02/02: [NettyHttp] Increase proxy connection timeout and make it configurable

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit d58c1c602c98e73c8c9176ceb6d4e1157b32102d
Author: Andrej Vano <av...@redhat.com>
AuthorDate: Thu Apr 4 14:19:19 2024 +0200

    [NettyHttp] Increase proxy connection timeout and make it configurable
---
 .../apache/camel/quarkus/component/http/common/HttpTestResource.java    | 1 +
 .../component/http/netty/ProxyCapableClientInitializerFactory.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java b/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
index 72ddc21652..270e4dfdff 100644
--- a/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
+++ b/integration-test-groups/http/common/src/test/java/org/apache/camel/quarkus/component/http/common/HttpTestResource.java
@@ -52,6 +52,7 @@ public class HttpTestResource implements QuarkusTestResourceLifecycleManager {
                 "camel.netty-http.https-test-port",
                 "camel.netty-http.compression-test-port");
         options.put("proxy.host", "localhost");
+        options.put("proxy.connection.timeout", "10000");
 
         server = new ProxyServer(Integer.parseInt(options.get("proxy.port")), USER_ADMIN, USER_ADMIN_PASSWORD);
         server.start();
diff --git a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
index 9f3e544684..f1a8b36471 100644
--- a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
+++ b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/ProxyCapableClientInitializerFactory.java
@@ -46,7 +46,7 @@ public class ProxyCapableClientInitializerFactory extends HttpClientInitializerF
         Integer proxyPort = config.getValue("proxy.port", Integer.class);
         InetSocketAddress proxyServerAddress = new InetSocketAddress(proxyHost, proxyPort);
         HttpProxyHandler httpProxyHandler = new HttpProxyHandler(proxyServerAddress, USER_ADMIN, USER_ADMIN_PASSWORD);
-        httpProxyHandler.setConnectTimeoutMillis(5000);
+        httpProxyHandler.setConnectTimeoutMillis(config.getValue("proxy.connection.timeout", Long.class));
         super.initChannel(channel);
         channel.pipeline().addFirst(httpProxyHandler);
     }


(camel-quarkus) 01/02: Remove jsch container DOCKER_MODS configuration

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 81f1308f94fab29a11a7f45ada94e552f8c6bef3
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Apr 4 12:34:01 2024 +0100

    Remove jsch container DOCKER_MODS configuration
---
 .../org/apache/camel/quarkus/component/jsch/it/JschTestResource.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java b/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
index 896d6fe60e..195cee2ed6 100644
--- a/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
+++ b/integration-tests/jsch/src/test/java/org/apache/camel/quarkus/component/jsch/it/JschTestResource.java
@@ -38,7 +38,6 @@ public class JschTestResource implements QuarkusTestResourceLifecycleManager {
         try {
             container = new GenericContainer(JSCH_IMAGE)
                     .withExposedPorts(JSCH_PORT)
-                    .withEnv("DOCKER_MODS", "linuxserver/mods:openssh-server-openssh-client")
                     .withEnv("PASSWORD_ACCESS", "true")
                     .withEnv("USER_NAME", USERNAME)
                     .withEnv("USER_PASSWORD", PASSWORD)