This is an automated email from the ASF dual-hosted git repository.
ffang 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 b9392a3 [CAMEL-15459]update to CXF 3.4.0
b9392a3 is described below
commit b9392a3f78a9c348c4dd6bd15779e20f11d5d315
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Mon Aug 24 19:03:51 2020 -0400
[CAMEL-15459]update to CXF 3.4.0
---
camel-dependencies/pom.xml | 2 +-
.../src/generated/resources/org/apache/camel/catalog/others.properties | 1 +
.../java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java | 3 ++-
docs/components/modules/ROOT/pages/azure-eventhubs-component.adoc | 3 ++-
parent/pom.xml | 2 +-
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 405d2c5..00bfdf0 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -155,7 +155,7 @@
<couchbase-client-version>3.0.6</couchbase-client-version>
<curator-version>4.3.0</curator-version>
<cxf-codegen-plugin-version>3.3.5</cxf-codegen-plugin-version>
- <cxf-version>3.3.6</cxf-version>
+ <cxf-version>3.4.0</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
<cxf-xjc-plugin-version>3.3.1</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.1</cxf-xjc-utils-version>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index f4a9fc2..ef6c3bc 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -26,6 +26,7 @@ spring-main
spring-security
swagger-java
test
+test-blueprint
test-cdi
test-junit5
test-spring
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
index 24d1fc5..b0bf7b6 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
@@ -91,7 +91,8 @@ public abstract class AbstractCxfWsdlFirstTest extends
CamelSpringTestSupport {
} catch (WebServiceException ex) {
// Caught expected WebServiceException here
assertTrue(ex.getMessage().indexOf("MyStringType") > 0
- || ex.getMessage().indexOf("Could not parse the XML
stream") != -1,
+ || ex.getMessage().indexOf("Could not parse the XML
stream") != -1
+ || ex.getMessage().indexOf("the required maximum is 30") >
0,
"Should get the xml vaildate error! " + ex.getMessage());
}
diff --git a/docs/components/modules/ROOT/pages/azure-eventhubs-component.adoc
b/docs/components/modules/ROOT/pages/azure-eventhubs-component.adoc
index e581462..f897ae5 100644
--- a/docs/components/modules/ROOT/pages/azure-eventhubs-component.adoc
+++ b/docs/components/modules/ROOT/pages/azure-eventhubs-component.adoc
@@ -201,7 +201,8 @@ This allows camel route to consume and produce events
asynchronously without blo
=== Message body type
The component's producer expects the data in the message body to be in
`byte[]`. This allows the user to utilize Camel TypeConverter to
marshal/unmarshal data with ease.
-The same goes as well for the component's consumer, it will set the encoded
data as `byte[]` in the message body. Therefore, Camel will try first to
convert the data to `byte[]` using the provided the typeConverters in the Camel
context (e.g: `String` to `byte[]`).
+The same goes as well for the component's consumer, it will set the encoded
data as `byte[]` in the message body.
+
=== Automatic detection of EventHubProducerAsyncClient client in registry
diff --git a/parent/pom.xml b/parent/pom.xml
index 43e71d3..9e5b7eb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -137,7 +137,7 @@
<corda-version>4.4</corda-version>
<couchbase-client-version>3.0.6</couchbase-client-version>
<curator-version>4.3.0</curator-version>
- <cxf-version>3.3.6</cxf-version>
+ <cxf-version>3.4.0</cxf-version>
<cxf-version-range>[3.3,4.0)</cxf-version-range>
<cxf-codegen-plugin-version>3.3.5</cxf-codegen-plugin-version>
<cxf-xjc-plugin-version>3.3.1</cxf-xjc-plugin-version>
