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:43:22 UTC
[5/6] camel git commit: Upgrade CXF
Upgrade CXF
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5ba44bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5ba44bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5ba44bc
Branch: refs/heads/camel-2.15.x
Commit: c5ba44bc397213b6a9bfe50b70235100cc19365e
Parents: 0fe2143
Author: Claus Ibsen <da...@apache.org>
Authored: Wed May 27 11:11:19 2015 +0200
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed May 27 21:42:15 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c5ba44bc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6736c6a..885a2d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -121,9 +121,9 @@
<commons-vfs2-version>2.0</commons-vfs2-version>
<concurrentlinkedhashmap.version>1.4.2</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.2.1</deltaspike-version>
<derby-version>10.11.1.1</derby-version>
<disruptor-version>3.3.2</disruptor-version>