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 2013/01/11 02:40:05 UTC
svn commit: r1431788 - in /camel/branches/camel-2.10.x: ./ parent/pom.xml
Author: ffang
Date: Fri Jan 11 01:40:04 2013
New Revision: 1431788
URL: http://svn.apache.org/viewvc?rev=1431788&view=rev
Log:
Merged revisions 1431781 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1431781 | ffang | 2013-01-11 09:33:11 +0800 (δΊ”, 11 1 2013) | 1 line
[CAMEL-5947]upgrade to axiom 1.2.14 and abdera 1.1.3
........
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:r1431781
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=1431788&r1=1431787&r2=1431788&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Fri Jan 11 01:40:04 2013
@@ -34,7 +34,7 @@
<properties>
<compiler.fork>true</compiler.fork>
- <abdera-version>1.1.2</abdera-version>
+ <abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.7.0</activemq-version>
<ahc-version>1.7.9</ahc-version>
@@ -46,8 +46,7 @@
<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>
- <!--we must use axiom 1.2.10 with abdera 1.1.2, CAMEL-5109 has more details-->
- <axiom-version>1.2.10</axiom-version>
+ <axiom-version>1.2.14</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>