Author: jbonofre
Date: Mon Apr 29 10:04:07 2013
New Revision: 1476951
URL: http://svn.apache.org/r1476951
Log:
[KARAF-2294] Upgrade to jclouds 1.4.0
Modified:
karaf/cellar/branches/cellar-2.3.x/assembly/src/main/resources/features.xml
karaf/cellar/branches/cellar-2.3.x/pom.xml
Modified:
karaf/cellar/branches/cellar-2.3.x/assembly/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/assembly/src/main/resources/features.xml?rev=1476951&r1=1476950&r2=1476951&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/assembly/src/main/resources/features.xml
(original)
+++ karaf/cellar/branches/cellar-2.3.x/assembly/src/main/resources/features.xml
Mon Apr 29 10:04:07 2013
@@ -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.features.version}/xml/features</repository>
+
<repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
<feature name="cellar-core" description="Karaf clustering core"
version="${project.version}" resolver="(obr)">
<configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">
@@ -94,9 +94,9 @@
<feature name="cellar-cloud" description="Cloud blobstore support in
clusters" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">cellar-core</feature>
- <feature version="${jclouds.features.version}">jclouds</feature>
+ <feature version="${jclouds.version}">jclouds</feature>
<!-- Adding S3 as the default Blobstore -->
- <feature version="${jclouds.features.version}">jclouds-aws-s3</feature>
+ <feature version="${jclouds.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.3.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/pom.xml?rev=1476951&r1=1476950&r2=1476951&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/pom.xml Mon Apr 29 10:04:07 2013
@@ -40,8 +40,7 @@
<felix.configadmin.version>1.6.0</felix.configadmin.version>
<felix.webconsole.version>4.0.0</felix.webconsole.version>
<hazelcast.version>2.5</hazelcast.version>
- <jclouds.version>1.3.2</jclouds.version>
- <jclouds.features.version>1.3.2_3</jclouds.features.version>
+ <jclouds.version>1.4.0</jclouds.version>
<joda-time.version>2.1</joda-time.version>
<junit.version>4.10</junit.version>
<junit.bundle.version>4.10_1</junit.bundle.version>
