Author: ningjiang
Date: Sat Oct 8 06:52:31 2011
New Revision: 1180322
URL: http://svn.apache.org/viewvc?rev=1180322&view=rev
Log:
Merged revisions 1180321 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1180321 | ningjiang | 2011-10-08 14:27:53 +0800 (Sat, 08 Oct 2011) | 1 line
CAMEL-4525 Upgrade CXF version to 2.4.3
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/parent/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 8 06:52:31 2011
@@ -1 +1 @@
-/camel/trunk:1178509,1179125,1179198
+/camel/trunk:1178509,1179125,1179198,1180321
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1180322&r1=1180321&r2=1180322&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Sat Oct 8 06:52:31 2011
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+ <?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -58,7 +58,7 @@
<concurrentlinkedhashmap.version>1.2</concurrentlinkedhashmap.version>
<!-- When updating cxf-version, may need to change CXF version range in
platforms/karaf/features/src/main/resources/features.xml -->
- <cxf-version>2.4.2</cxf-version>
+ <cxf-version>2.4.3</cxf-version>
<cxf-xjc-utils-version>2.4.0</cxf-xjc-utils-version>
<derby-version>10.4.2.0</derby-version>
<dnsjava-version>2.1.1</dnsjava-version>
