[KARAF-2294] Upgrade to jclouds 1.4.0 git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.3.x@1476951 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/5b589e13 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/5b589e13 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/5b589e13 Branch: refs/heads/cellar-2.3.x Commit: 5b589e13ffc3ce123c8b4a585cb4f52a69b043cd Parents: 632aca5 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Mon Apr 29 10:04:07 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Mon Apr 29 10:04:07 2013 +0000 ---------------------------------------------------------------------- assembly/src/main/resources/features.xml | 6 +++--- pom.xml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/5b589e13/assembly/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml index 52fa0e3..f2ff382 100644 --- a/assembly/src/main/resources/features.xml +++ b/assembly/src/main/resources/features.xml @@ -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> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/5b589e13/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2a64740..85e3f65 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
