You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2018/03/26 03:52:07 UTC
[camel] branch master updated: [CAMEL-12405]upgrade to CXF 3.2.4
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 c9a3332 [CAMEL-12405]upgrade to CXF 3.2.4
c9a3332 is described below
commit c9a3332a6f4261774fe222e88ea87a825d0d981e
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Mar 26 11:51:44 2018 +0800
[CAMEL-12405]upgrade to CXF 3.2.4
---
.../org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
index b5a4354..977d7dc 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
@@ -65,7 +65,7 @@ public class CxfRsSpringEndpointTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
String version = Version.getCurrentVersion();
- if (version.contains("2.5") || version.contains("2.4")) {
+ if (version.startsWith("2") && (version.contains("2.5") || version.contains("2.4"))) {
return new ClassPathXmlApplicationContext(new String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans.xml"));
}
return new ClassPathXmlApplicationContext(new String("org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml"));
diff --git a/parent/pom.xml b/parent/pom.xml
index cbed111..f009c9f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -174,7 +174,7 @@
<couchbase-client-version>1.4.13</couchbase-client-version>
<couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
<curator-version>2.12.0</curator-version>
- <cxf-version>3.2.3</cxf-version>
+ <cxf-version>3.2.4</cxf-version>
<cxf-version-range>[3.1,4.0)</cxf-version-range>
<cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
--
To stop receiving notification emails like this one, please contact
ffang@apache.org.