Author: ffang
Date: Wed Mar 21 08:13:43 2012
New Revision: 1303304
URL: http://svn.apache.org/viewvc?rev=1303304&view=rev
Log:
Merged revisions 1303301 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1303301 | ffang | 2012-03-21 16:02:55 +0800 (δΈ‰, 21 3 2012) | 1 line
[CAMEL-5109]axiom 1.2.12 can't work 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/
------------------------------------------------------------------------------
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=1303304&r1=1303303&r2=1303304&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Wed Mar 21 08:13:43 2012
@@ -41,7 +41,7 @@
<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>
+ <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>
