You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/02/09 15:32:15 UTC

svn commit: r1444369 - in /camel/branches/camel-2.9.x: ./ parent/pom.xml

Author: davsclaus
Date: Sat Feb  9 14:32:14 2013
New Revision: 1444369

URL: http://svn.apache.org/r1444369
Log:
CAMEL-6059: Use axiom 1.2.12 that works in OSGi.

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:r1444366
  Merged /camel/branches/camel-2.10.x:r1444367

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=1444369&r1=1444368&r2=1444369&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Sat Feb  9 14:32:14 2013
@@ -42,7 +42,8 @@
     <apache-mime4j-version>0.7.2</apache-mime4j-version>
     <aries-blueprint-version>0.3</aries-blueprint-version>
     <atomikos-trascations-version>3.7.0</atomikos-trascations-version>
-    <axiom-version>1.2.14</axiom-version>
+    <!-- axiom 1.2.13 and 1.2.14 does not work with OSGi -->
+    <axiom-version>1.2.12</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>