Author: davsclaus
Date: Sat Feb 9 14:31:05 2013
New Revision: 1444367
URL: http://svn.apache.org/r1444367
Log:
CAMEL-6059: Use axiom 1.2.12 that works in OSGi.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/parent/pom.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1444366
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1444367&r1=1444366&r2=1444367&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Sat Feb 9 14:31:05 2013
@@ -47,7 +47,8 @@
<avro-bundle-version>1.6.1_1</avro-bundle-version>
<aws-java-sdk-bundle-version>1.3.14_1</aws-java-sdk-bundle-version>
<aws-java-sdk-version>1.3.14</aws-java-sdk-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>
<beanio-version>2.0.2</beanio-version>
<bouncycastle-version>1.46</bouncycastle-version>
<castor-bundle-version>1.3.1_2</castor-bundle-version>
