Author: ffang
Date: Fri Dec 14 08:06:41 2012
New Revision: 1421713
URL: http://svn.apache.org/viewvc?rev=1421713&view=rev
Log:
Merged revisions 1421712 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1421712 | ffang | 2012-12-14 16:01:53 +0800 (δΊ”, 14 12 2012) | 1 line
[CAMEL-5109]must use axiom 1.2.10 with abdera 1.1.2
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/parent/pom.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1421712
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1421713&r1=1421712&r2=1421713&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Fri Dec 14 08:06:41 2012
@@ -46,7 +46,8 @@
<avro-bundle-version>1.6.1_1</avro-bundle-version>
<aws-java-sdk-bundle-version>1.3.14_1</aws-java-sdk-bundle-version>
<aws-java-sdk-version>1.3.14</aws-java-sdk-version>
- <axiom-version>1.2.12</axiom-version>
+ <!--we must use axiom 1.2.10 with abdera 1.1.2, CAMEL-5109 has more
details-->
+ <axiom-version>1.2.10</axiom-version>
<beanio-version>2.0.2</beanio-version>
<bouncycastle-version>1.46</bouncycastle-version>
<castor-bundle-version>1.3.1_2</castor-bundle-version>