You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/04/16 17:47:06 UTC
svn commit: r1326656 - in /karaf/cellar/branches/cellar-2.2.x:
assembly/src/main/resources/features.xml pom.xml
Author: jbonofre
Date: Mon Apr 16 15:47:05 2012
New Revision: 1326656
URL: http://svn.apache.org/viewvc?rev=1326656&view=rev
Log:
[KARAF-1372] Upgrade to jclouds 1.3.2
Modified:
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
karaf/cellar/branches/cellar-2.2.x/pom.xml
Modified: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml?rev=1326656&r1=1326655&r2=1326656&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml Mon Apr 16 15:47:05 2012
@@ -15,7 +15,7 @@
-->
<features name="karaf-cellar-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
+ <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.features.version}/xml/features</repository>
<feature name='hazelcast' description='In memory data grid' version='${hazelcast.version}' resolver='(obr)'>
<bundle>mvn:com.hazelcast/hazelcast/${hazelcast.version}</bundle>
@@ -63,9 +63,9 @@
<feature name='cellar-cloud' description='Cloud blobstore support in Cellar clusters' version='${project.version}' resolver='(obr)'>
<feature version="${project.version}">cellar</feature>
- <feature version="${jclouds.version}">jclouds</feature>
+ <feature version="${jclouds.features.version}">jclouds</feature>
<!-- Adding S3 as the default Blobstore -->
- <feature>jclouds-aws-s3</feature>
+ <feature version="${jclouds.features.version}">jclouds-aws-s3</feature>
<bundle dependency='true'>mvn:joda-time/joda-time/${joda-time.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.cloud/${project.version}</bundle>
</feature>
Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1326656&r1=1326655&r2=1326656&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Mon Apr 16 15:47:05 2012
@@ -39,7 +39,8 @@
<felix.configadmin.version>1.2.8</felix.configadmin.version>
<felix.webconsole.version>3.1.8</felix.webconsole.version>
<hazelcast.version>1.9.4.8</hazelcast.version>
- <jclouds.version>1.3.1</jclouds.version>
+ <jclouds.version>1.3.2</jclouds.version>
+ <jclouds.features.version>1.3.2_3</jclouds.features.version>
<joda-time.version>1.6.2</joda-time.version>
<junit.version>4.7</junit.version>
<junit.bundle.version>4.7_3</junit.bundle.version>