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 2018/12/07 07:31:06 UTC
[camel] branch sandbox/camel-3.x updated (59049bd -> 67778f6)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 59049bd CAMEL-12919 - Regen docs
new 0564166 CAMEL-12982: Added unit test
new 25a3c76 Upgrade Fastjson and related bundle to version 1.2.54
new 47043d2 Upgrade Kafka and related bundle to version 2.1.0
new 67778f6 Upgrade AWS SDK and related bundle to version 1.11.461
The 4 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:
.../issues/EndpointWithRawUriParameterTest.java | 32 ++++++++++++++++++++++
parent/pom.xml | 12 ++++----
2 files changed, 38 insertions(+), 6 deletions(-)
[camel] 01/04: CAMEL-12982: Added unit test
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 056416636b1e22f2ec279a50c9945724e7c60277
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 6 17:41:33 2018 +0100
CAMEL-12982: Added unit test
Conflicts:
camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
---
.../issues/EndpointWithRawUriParameterTest.java | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
index 8f3e2aa..8fa2c4f 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
@@ -27,6 +27,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.DefaultProducer;
@@ -140,6 +141,29 @@ public class EndpointWithRawUriParameterTest extends ContextTestSupport {
assertEquals("++def++", lines.get(1));
}
+ @Test
+ public void testRawUriParameterFail() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ getMockEndpoint("mock:result").expectedHeaderReceived("username", "scott");
+ getMockEndpoint("mock:result").expectedHeaderReceived("password", "foo)+bar");
+
+ template.sendBody("direct:fail", "Hello World");
+
+ // should fail as the password has + sign which gets escaped
+ getMockEndpoint("mock:result").assertIsNotSatisfied();
+ }
+
+ @Test
+ public void testRawUriParameterOk() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+ getMockEndpoint("mock:result").expectedHeaderReceived("username", "scott");
+ getMockEndpoint("mock:result").expectedHeaderReceived("password", "foo)+bar");
+
+ template.sendBody("direct:ok", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@@ -158,6 +182,14 @@ public class EndpointWithRawUriParameterTest extends ContextTestSupport {
from("direct:rawlines")
.to("mycomponent:foo?lines=RAW(++abc++)&lines=RAW(++def++)")
.to("mock:result");
+
+ from("direct:fail")
+ .to("mycomponent:foo?password=foo)+bar&username=scott")
+ .to("mock:result");
+
+ from("direct:ok")
+ .to("mycomponent:foo?password=RAW(foo)+bar)&username=scott")
+ .to("mock:result");
}
};
}
[camel] 04/04: Upgrade AWS SDK and related bundle to version
1.11.461
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 67778f644bfb136021360cb1c5050090c37ecef5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 6 10:50:40 2018 +0100
Upgrade AWS SDK and related bundle to version 1.11.461
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f38da0e..1166740 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,8 +81,8 @@
<avro-bundle-version>1.8.2_1</avro-bundle-version>
<avro-ipc-bundle-version>1.8.2_1</avro-ipc-bundle-version>
<awaitility-version>3.1.3</awaitility-version>
- <aws-java-sdk-bundle-version>1.11.438_1</aws-java-sdk-bundle-version>
- <aws-java-sdk-version>1.11.438</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.11.461_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.11.461</aws-java-sdk-version>
<aws-xray-version>2.1.0</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-storage-java-sdk-version>8.0.0</azure-storage-java-sdk-version>
[camel] 03/04: Upgrade Kafka and related bundle to version 2.1.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 47043d230cae98e40be8a10c4533d8d62cf6441a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 6 10:09:20 2018 +0100
Upgrade Kafka and related bundle to version 2.1.0
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 555e00d..f38da0e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -439,8 +439,8 @@
<jython-version>2.5.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
<jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
- <kafka-version>2.0.0</kafka-version>
- <kafka-bundle-version>2.0.0_1</kafka-bundle-version>
+ <kafka-version>2.1.0</kafka-version>
+ <kafka-bundle-version>2.1.0_1</kafka-bundle-version>
<karaf2-version>2.4.4</karaf2-version>
<karaf4-version>4.2.1</karaf4-version>
<kie-version>7.14.0.Final</kie-version>
[camel] 02/04: Upgrade Fastjson and related bundle to version 1.2.54
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 25a3c767d2df581e7c021b1db45332c10927e23b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Dec 6 08:24:45 2018 +0100
Upgrade Fastjson and related bundle to version 1.2.54
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7101277..555e00d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -215,8 +215,8 @@
<facebook4j-core-version>2.4.12</facebook4j-core-version>
<facebook4j-core-bundle-version>2.4.12_1</facebook4j-core-bundle-version>
<fastinfoset-version>1.2.13_1</fastinfoset-version>
- <fastjson-version>1.2.51</fastjson-version>
- <fastjson-bundle-version>1.2.51_1</fastjson-bundle-version>
+ <fastjson-version>1.2.54</fastjson-version>
+ <fastjson-bundle-version>1.2.54_1</fastjson-bundle-version>
<felix-configadmin-version>1.8.8</felix-configadmin-version>
<felix-connect-version>0.2.0</felix-connect-version>
<felix-fileinstall-version>3.5.2</felix-fileinstall-version>