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 2012/03/21 09:18:24 UTC

svn commit: r1303306 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml

Author: ffang
Date: Wed Mar 21 08:18:24 2012
New Revision: 1303306

URL: http://svn.apache.org/viewvc?rev=1303306&view=rev
Log:
Merged revisions 1303304 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x

................
  r1303304 | ffang | 2012-03-21 16:13:43 +0800 (三, 21  3 2012) | 9 lines
  
  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.8.x/   (props changed)
    camel/branches/camel-2.8.x/parent/pom.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1303306&r1=1303305&r2=1303306&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Wed Mar 21 08:18:24 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>140</bouncycastle-version>
     <castor-bundle-version>1.3.1_2</castor-bundle-version>
     <cometd-bayeux-version>6.1.11</cometd-bayeux-version>