You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/09/06 10:49:42 UTC
[camel] branch master updated: CAMEL-13869 - camel-undertow -
Upgrade to 2.x
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 10f0f79 CAMEL-13869 - camel-undertow - Upgrade to 2.x
10f0f79 is described below
commit 10f0f795e73cbfb31818057e03de952aa4d4f7b1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Sep 6 12:30:46 2019 +0200
CAMEL-13869 - camel-undertow - Upgrade to 2.x
---
.../camel/component/undertow/UndertowComponentVerifierExtension.java | 1 +
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtension.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtension.java
index 68b4ee9..ea3bff9 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtension.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtension.java
@@ -242,6 +242,7 @@ public final class UndertowComponentVerifierExtension extends DefaultComponentVe
ClientRequest request = new ClientRequest();
request.setMethod(method);
request.setPath(URISupport.pathAndQueryOf(uri));
+ request.getRequestHeaders().put(Headers.HOST, String.format("%s:%s", uri.getHost(), uri.getPort()));
IoFuture<ClientConnection> connectFuture = client.connect(uri, worker, pool, OptionMap.EMPTY);
UndertowClientResponseFuture responseFuture = new UndertowClientResponseFuture();
diff --git a/parent/pom.xml b/parent/pom.xml
index 9bb02cd..559f8fb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -330,7 +330,7 @@
<jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
<!-- Avoid upgrading to newer version for the moment: see https://issues.apache.org/jira/browse/CAMEL-13654 -->
<jbpm-version>7.22.0.Final</jbpm-version>
- <jboss-logging-version>3.3.2.Final</jboss-logging-version>
+ <jboss-logging-version>3.4.0.Final</jboss-logging-version>
<jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
<jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version>
<jboss-xnio-version>3.3.8.Final</jboss-xnio-version>
@@ -632,7 +632,7 @@
<twilio-version>7.9.1</twilio-version>
<twitter4j-bundle-version>4.0.7_1</twitter4j-bundle-version>
<twitter4j-version>4.0.7</twitter4j-version>
- <undertow-version>1.4.26.Final</undertow-version>
+ <undertow-version>2.0.26.Final</undertow-version>
<univocity-parsers-version>2.8.3</univocity-parsers-version>
<unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version>
<unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 7e559c9..7c0d1fe 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2583,6 +2583,7 @@
<bundle dependency='true'>mvn:org.jboss.xnio/xnio-api/${jboss-xnio-version}</bundle>
<bundle dependency='true'>mvn:org.jboss.xnio/xnio-nio/${jboss-xnio-version}</bundle>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-undertow/${project.version}</bundle>