Author: davsclaus
Date: Sat Apr 13 10:03:23 2013
New Revision: 1467582
URL: http://svn.apache.org/r1467582
Log:
CAMEL-6261: Fixed install camel-jclouds in Karaf
Modified:
camel/trunk/components/camel-jclouds/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-jclouds/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/pom.xml?rev=1467582&r1=1467581&r2=1467582&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/pom.xml (original)
+++ camel/trunk/components/camel-jclouds/pom.xml Sat Apr 13 10:03:23 2013
@@ -34,6 +34,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.jclouds.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jclouds</camel.osgi.export.service>
+
<google-guava-version>${jclouds-google-guava-version}</google-guava-version>
</properties>
<dependencies>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1467582&r1=1467581&r2=1467582&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Apr 13 10:03:23 2013
@@ -197,6 +197,8 @@
<jaxen-version>1.1.4</jaxen-version>
<jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
<jclouds-version>1.5.7</jclouds-version>
+ <!-- jclouds must use this guava version -->
+ <jclouds-google-guava-version>13.0.1</jclouds-google-guava-version>
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>
