Repository: camel Updated Branches: refs/heads/camel-2.14.x 2386efb25 -> 5cdfef3f9
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/5cdfef3f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5cdfef3f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5cdfef3f Branch: refs/heads/camel-2.14.x Commit: 5cdfef3f987f185c3253389c3fd2779240f4c07e Parents: 2386efb Author: Willem Jiang <willem.ji...@gmail.com> Authored: Wed May 27 21:35:09 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu May 28 23:01:00 2015 +0000 ---------------------------------------------------------------------- .../cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java | 2 +- .../cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java | 3 ++- parent/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5cdfef3f/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/5cdfef3f/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, http://git-wip-us.apache.org/repos/asf/camel/blob/5cdfef3f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 36dd547..8fe9023 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -114,9 +114,9 @@ <commons-vfs2-version>2.0</commons-vfs2-version> <concurrentlinkedhashmap.version>1.4</concurrentlinkedhashmap.version> <cobertura-maven-plugin-version>2.5.2</cobertura-maven-plugin-version> - <cxf-version>3.0.4</cxf-version> + <cxf-version>3.0.5</cxf-version> <cxf-version-range>[2.7,4.0)</cxf-version-range> - <cxf-xjc-utils-version>3.0.2</cxf-xjc-utils-version> + <cxf-xjc-utils-version>3.0.3</cxf-xjc-utils-version> <deltaspike-version>1.0.2</deltaspike-version> <derby-version>10.10.2.0</derby-version> <disruptor-version>3.3.0</disruptor-version>
