Author: ffang Date: Fri Jan 11 02:04:01 2013 New Revision: 1431806 URL: http://svn.apache.org/viewvc?rev=1431806&view=rev Log: Merged revisions 1431788 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1431788 | ffang | 2013-01-11 09:40:04 +0800 (五, 11 1 2013) | 9 lines 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.9.x/ (props changed) camel/branches/camel-2.9.x/parent/pom.xml Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1431781 Merged /camel/branches/camel-2.10.x:r1431788 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1431806&r1=1431805&r2=1431806&view=diff ============================================================================== --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Fri Jan 11 02:04:01 2013 @@ -34,15 +34,14 @@ <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.5.1</activemq-version> <ahc-version>1.6.5</ahc-version> <apacheds-version>1.5.7</apacheds-version> <aries-blueprint-version>0.3</aries-blueprint-version> <atomikos-trascations-version>3.7.0</atomikos-trascations-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> <bouncycastle-version>1.46</bouncycastle-version> <castor-bundle-version>1.3.1_2</castor-bundle-version> <cometd-bayeux-version>6.1.11</cometd-bayeux-version>
