Repository: jclouds-karaf Updated Branches: refs/heads/master 5c3065518 -> fd000a3c9
Promote Azure ARM from jclouds-labs Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/fd000a3c Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/fd000a3c Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/fd000a3c Branch: refs/heads/master Commit: fd000a3c9686434326b4c5745cf3db5b8c80bc43 Parents: 5c30655 Author: Ignasi Barrera <[email protected]> Authored: Mon Jan 8 15:08:39 2018 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Mon Jan 8 15:08:39 2018 +0100 ---------------------------------------------------------------------- feature-labs/src/main/feature/feature.xml | 11 ----------- feature/src/main/feature/feature.xml | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fd000a3c/feature-labs/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/feature-labs/src/main/feature/feature.xml b/feature-labs/src/main/feature/feature.xml index 75c21cb..799a706 100644 --- a/feature-labs/src/main/feature/feature.xml +++ b/feature-labs/src/main/feature/feature.xml @@ -22,7 +22,6 @@ limitations under the License. </feature> <feature name='jclouds-labs-all-compute' description='jclouds-labs - all - macro feature to bundle all computes' version='${project.version}'> - <feature version='${project.version}'>jclouds-azurecompute-arm</feature> <feature version='${project.version}'>jclouds-api-cloudsigma2</feature> <feature version='${project.version}'>jclouds-cloudsigma2-hnl</feature> <feature version='${project.version}'>jclouds-cloudsigma2-lvs</feature> @@ -34,16 +33,6 @@ limitations under the License. </feature> <!-- JCLOUDS-LABS --> - <feature name='jclouds-azurecompute-arm' description='Components to access Azure Compute ARM' version='${project.version}'> - <feature version='${project.version}'>jclouds-compute</feature> - <feature version='${project.version}'>jclouds-azureblob</feature> - <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle> - <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle> - <bundle>mvn:org.apache.jclouds.labs/azurecompute-arm/${jclouds.version}</bundle> - </feature> - <feature name='jclouds-api-cloudsigma2' description='jclouds - API - CloudSigma v2' version='${project.version}'> <feature version='${project.version}'>jclouds-compute</feature> <bundle>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fd000a3c/feature/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/feature/feature.xml b/feature/src/main/feature/feature.xml index d78d2c2..d60596e 100644 --- a/feature/src/main/feature/feature.xml +++ b/feature/src/main/feature/feature.xml @@ -53,6 +53,7 @@ limitations under the License. <feature version='${project.version}'>jclouds-profitbricks</feature> <feature version='${project.version}'>jclouds-api-docker</feature> <feature version='${project.version}'>jclouds-packet</feature> + <feature version='${project.version}'>jclouds-azurecompute-arm</feature> </feature> <feature name='jclouds-guice' description='jclouds - Google Guice' version='${project.version}'> @@ -274,6 +275,16 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.provider/azureblob/${jclouds.version}</bundle> </feature> + <feature name='jclouds-azurecompute-arm' description='Components to access Azure Compute ARM' version='${project.version}'> + <feature version='${project.version}'>jclouds-compute</feature> + <feature version='${project.version}'>jclouds-azureblob</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle> + <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.provider/azurecompute-arm/${jclouds.version}</bundle> + </feature> + <feature name='jclouds-digitalocean2' description='Components to access DigitalOcean v2' version='${project.version}'> <feature version='${project.version}'>jclouds-compute</feature> <feature version='${project.version}'>jclouds-api-oauth</feature>
