You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by io...@apache.org on 2013/04/12 18:02:22 UTC
git commit: Upgrade to jclouds-karaf 1.5.8
Updated Branches:
refs/heads/trunk b2f197d36 -> b98d88565
Upgrade to jclouds-karaf 1.5.8
Project: http://git-wip-us.apache.org/repos/asf/whirr/repo
Commit: http://git-wip-us.apache.org/repos/asf/whirr/commit/b98d8856
Tree: http://git-wip-us.apache.org/repos/asf/whirr/tree/b98d8856
Diff: http://git-wip-us.apache.org/repos/asf/whirr/diff/b98d8856
Branch: refs/heads/trunk
Commit: b98d885657b802ba600e3c379dac667e25335497
Parents: b2f197d
Author: Ioannis Canellos <io...@apache.org>
Authored: Fri Apr 12 17:54:36 2013 +0300
Committer: Ioannis Canellos <io...@apache.org>
Committed: Fri Apr 12 17:54:36 2013 +0300
----------------------------------------------------------------------
platforms/karaf/feature/pom.xml | 2 +-
.../karaf/feature/src/main/resources/features.xml | 4 +++-
platforms/karaf/pom.xml | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/whirr/blob/b98d8856/platforms/karaf/feature/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/feature/pom.xml b/platforms/karaf/feature/pom.xml
index 9ec9e83..77e204e 100644
--- a/platforms/karaf/feature/pom.xml
+++ b/platforms/karaf/feature/pom.xml
@@ -47,7 +47,7 @@
<dnsjava.version>2.0.8</dnsjava.version>
<javax.mail.bundle.version>1.4.1_4</javax.mail.bundle.version>
<junit.bundle.version>4.9_1</junit.bundle.version>
- <jclouds.karaf.version>1.5.0</jclouds.karaf.version>
+ <jclouds.karaf.version>1.5.8</jclouds.karaf.version>
<jopt.simple.bundle.version>4.3_1</jopt.simple.bundle.version>
<jsch.bundle.version>0.1.44_2</jsch.bundle.version>
<not-yet-commons-ssl.bundle.version>0.3.11_1
http://git-wip-us.apache.org/repos/asf/whirr/blob/b98d8856/platforms/karaf/feature/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/feature/src/main/resources/features.xml b/platforms/karaf/feature/src/main/resources/features.xml
index 6d3016e..47cfaa4 100644
--- a/platforms/karaf/feature/src/main/resources/features.xml
+++ b/platforms/karaf/feature/src/main/resources/features.xml
@@ -15,12 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+<features name="whirr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features</repository>
<feature name="whirr" version="${project.version}" description="Apache Whirr Core" resolver="(obr)">
<feature version="${jclouds.karaf.version}">jclouds-commands</feature>
+ <feature version="${jclouds.karaf.version}">jclouds-api-byon</feature>
+ <feature version="${jclouds.karaf.version}">jclouds-api-openstack-nova</feature>
<feature version="${jclouds.karaf.version}">jclouds-aws-ec2</feature>
<feature version="${jclouds.karaf.version}">jclouds-aws-s3</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${activation.spec.version}</bundle>
http://git-wip-us.apache.org/repos/asf/whirr/blob/b98d8856/platforms/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
index 4907036..f1e0a89 100644
--- a/platforms/karaf/pom.xml
+++ b/platforms/karaf/pom.xml
@@ -32,7 +32,7 @@
<name>Apache Whirr Platforms Karaf</name>
<properties>
- <karaf.version>2.2.5</karaf.version>
+ <karaf.version>2.2.10</karaf.version>
<osgi.version>4.2.0</osgi.version>
<pax.exam.version>2.3.1</pax.exam.version>
<pax.exam.karaf.version>0.5.1</pax.exam.karaf.version>