You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/05/27 15:36:14 UTC
[1/2] camel git commit: Update the kafka version to 0.8.2.1
Repository: camel
Updated Branches:
refs/heads/master e1b3386a9 -> ae8a06682
Update the kafka version to 0.8.2.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c9634be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c9634be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c9634be
Branch: refs/heads/master
Commit: 3c9634be3293b4dd6b8f0ee866195c4b93d9b7a3
Parents: e1b3386
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed May 27 17:39:10 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed May 27 21:35:27 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3c9634be/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 443c81e..da80edc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -304,7 +304,7 @@
<junit-version>4.11</junit-version>
<jython-version>2.5.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
- <kafka-version>0.8.2.0</kafka-version>
+ <kafka-version>0.8.2.1</kafka-version>
<kafka-bundle-version>0.8.2.0_1</kafka-bundle-version>
<karaf-version>2.4.2</karaf-version>
<karaf3-version>3.0.2</karaf3-version>
[2/2] camel git commit: CAMEL-8802 Upgraded CXF version to 3.0.5
Posted by ni...@apache.org.
CAMEL-8802 Upgraded CXF version to 3.0.5
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae8a0668
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae8a0668
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae8a0668
Branch: refs/heads/master
Commit: ae8a06682c2ca9884b61890c51e06b014bf10cc0
Parents: 3c9634b
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed May 27 21:35:09 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed May 27 21:35:28 2015 +0800
----------------------------------------------------------------------
.../cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java | 2 +-
.../cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ae8a0668/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index 8cfe283..be3c9d8 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -307,7 +307,7 @@ public class CxfRsConsumerSimpleBindingTest extends CamelTestSupport {
@Test
public void testMultipartPostWithoutParameters() throws Exception {
- HttpPost post = new HttpPost("http://localhost:" + PORT_PATH + "/rest/customerservice/customers/multipart");
+ HttpPost post = new HttpPost("http://localhost:" + PORT_PATH + "/rest/customerservice/customers/multipart/withoutParameters");
MultipartEntityBuilder builder = MultipartEntityBuilder.create().setMode(HttpMultipartMode.STRICT);
builder.addBinaryBody("part1", new File(this.getClass().getClassLoader().getResource("java.jpg").toURI()), ContentType.create("image/jpeg"), "java.jpg");
builder.addBinaryBody("part2", new File(this.getClass().getClassLoader().getResource("java.jpg").toURI()), ContentType.create("image/jpeg"), "java.jpg");
http://git-wip-us.apache.org/repos/asf/camel/blob/ae8a0668/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
index 7281e6e..66f08ab 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
@@ -36,7 +36,8 @@ public class MultipartCustomer {
return null;
}
- @POST
+ @POST @Path("/withoutParameters")
+ // Added the path due to change of CXF-6321
public Response multipartPostWithoutParameters(
@Multipart(value = "part1", type = "image/jpeg") DataHandler dh1,
@Multipart(value = "part2", type = "image/jpeg") DataHandler dh2,