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 2011/08/15 15:37:18 UTC
svn commit: r1157840 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml
Author: ningjiang
Date: Mon Aug 15 13:37:18 2011
New Revision: 1157840
URL: http://svn.apache.org/viewvc?rev=1157840&view=rev
Log:
Merged revisions 1157798 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1157798 | ningjiang | 2011-08-15 20:26:17 +0800 (Mon, 15 Aug 2011) | 1 line
CAMEL-4335 Upgrade CXF version to 2.4.2
........
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 Mon Aug 15 13:37:18 2011
@@ -1 +1 @@
-/camel/trunk:1155230,1156108,1156260,1156524,1157348
+/camel/trunk:1155230,1156108,1156260,1156524,1157348,1157798
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 15 13:37:18 2011
@@ -1 +1 @@
-/camel/trunk:1-1148091,1149488,1153146,1153323,1155229-1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327,1156108,1156260,1156524,1157348
+/camel/trunk:1-1148091,1149488,1153146,1153323,1155229-1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327,1156108,1156260,1156524,1157348,1157798
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=1157840&r1=1157839&r2=1157840&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Aug 15 13:37:18 2011
@@ -57,8 +57,8 @@
<commons-pool-version>1.5.4</commons-pool-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.1</cxf-version>
- <cxf-xjc-utils-version>2.3.2</cxf-xjc-utils-version>
+ <cxf-version>2.4.2</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>
<dozer-version>5.3.1</dozer-version>