Author: ffang Date: Fri Dec 14 08:14:23 2012 New Revision: 1421715 URL: http://svn.apache.org/viewvc?rev=1421715&view=rev Log: Merged revisions 1421713 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1421713 | ffang | 2012-12-14 16:06:41 +0800 (五, 14 12 2012) | 9 lines 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.9.x/ (props changed) camel/branches/camel-2.9.x/parent/pom.xml Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1421712 Merged /camel/branches/camel-2.10.x:r1421713 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=1421715&r1=1421714&r2=1421715&view=diff ============================================================================== --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Fri Dec 14 08:14:23 2012 @@ -41,7 +41,8 @@ <apacheds-version>1.5.7</apacheds-version> <aries-blueprint-version>0.3</aries-blueprint-version> <atomikos-trascations-version>3.7.0</atomikos-trascations-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> <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>
