camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1446241 - in /camel/branches/camel-2.9.x: ./ parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Date Thu, 14 Feb 2013 15:35:34 GMT
Author: davsclaus
Date: Thu Feb 14 15:35:33 2013
New Revision: 1446241

URL: http://svn.apache.org/r1446241
Log:
CAMEL-6066: Use latest axiom as we can get it working in OSGi

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/parent/pom.xml
    camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1446238
  Merged /camel/branches/camel-2.10.x:r1446239

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=1446241&r1=1446240&r2=1446241&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Thu Feb 14 15:35:33 2013
@@ -42,8 +42,7 @@
     <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 1.2.13 and 1.2.14 does not work with OSGi -->
-    <axiom-version>1.2.12</axiom-version>
+    <axiom-version>1.2.14</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>

Modified: camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1446241&r1=1446240&r2=1446241&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml Thu
Feb 14 15:35:33 2013
@@ -167,8 +167,6 @@
   <feature name='camel-atom' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.abdera/abdera-core/${abdera-version}</bundle>
     <!--bundle dependency='true'>mvn:org.apache.abdera/abdera-extensions-json/${abdera-version}</bundle-->
     <bundle dependency='true'>mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}</bundle>



Mime
View raw message