Repository: jclouds-karaf Updated Branches: refs/heads/master 7006c5124 -> 011e811c0
JCLOUDS-944: JCLOUDS-1272: Update B2 and GCS deps Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/011e811c Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/011e811c Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/011e811c Branch: refs/heads/master Commit: 011e811c049153ebe50f5466dcbe5993978adec3 Parents: 7006c51 Author: Andrew Gaul <[email protected]> Authored: Mon May 8 17:13:37 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Tue May 9 22:21:46 2017 -0700 ---------------------------------------------------------------------- feature-labs/src/main/feature/feature.xml | 14 -------------- feature/src/main/feature/feature.xml | 6 ++++-- .../jclouds/karaf/itests/FeatureInstallationTest.java | 10 ++++++++++ .../karaf/itests/FeatureLabsInstallationTest.java | 10 ---------- 4 files changed, 14 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/011e811c/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 600dca7..346e00a 100644 --- a/feature-labs/src/main/feature/feature.xml +++ b/feature-labs/src/main/feature/feature.xml @@ -19,8 +19,6 @@ limitations under the License. <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository> <feature name='jclouds-labs-all-blobstore' description='jclouds-labs - all - macro feature to bundle all blobstores' version='${project.version}'> - <feature version='${project.version}'>jclouds-b2</feature> - <feature version='${project.version}'>jclouds-google-cloud-storage</feature> </feature> <feature name='jclouds-labs-all-compute' description='jclouds-labs - all - macro feature to bundle all computes' version='${project.version}'> @@ -46,11 +44,6 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.labs/azurecompute-arm/${jclouds.version}</bundle> </feature> - <feature name='jclouds-b2' description='Backblaze B2' version='${project.version}'> - <feature version='${project.version}'>jclouds-blobstore</feature> - <bundle>mvn:org.apache.jclouds.labs/b2/${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> @@ -85,13 +78,6 @@ limitations under the License. <bundle dependency='true'>mvn:org.apache.jclouds.labs/cloudsigma2/${jclouds.version}</bundle> <bundle>mvn:org.apache.jclouds.labs/cloudsigma2-zrh/${jclouds.version}</bundle> </feature> - - <feature name='jclouds-google-cloud-storage' description='Google Cloud Storage' version='${project.version}'> - <feature version='${project.version}'>jclouds-blobstore</feature> - <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle> - <bundle dependency='true'>mvn:org.apache.jclouds.common/googlecloud/${jclouds.version}</bundle> - <bundle>mvn:org.apache.jclouds.labs/google-cloud-storage/${jclouds.version}</bundle> - </feature> <feature name='jclouds-packet' description='Packet' version='${project.version}'> <feature version='${project.version}'>jclouds-compute</feature> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/011e811c/feature/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/feature/feature.xml b/feature/src/main/feature/feature.xml index 1e990cc..ba24fd9 100644 --- a/feature/src/main/feature/feature.xml +++ b/feature/src/main/feature/feature.xml @@ -23,6 +23,8 @@ limitations under the License. <feature version='${project.version}'>jclouds-azureblob</feature> <feature version='${project.version}'>jclouds-api-atmos</feature> <feature version='${project.version}'>jclouds-api-openstack-swift</feature> + <feature version='${project.version}'>jclouds-b2</feature> + <feature version='${project.version}'>jclouds-google-cloud-storage</feature> <feature version='${project.version}'>jclouds-rackspace-cloudfiles-uk</feature> <feature version='${project.version}'>jclouds-rackspace-cloudfiles-us</feature> </feature> @@ -512,7 +514,7 @@ limitations under the License. <feature name='jclouds-b2' description='Backblaze B2' version='${project.version}'> <feature version='${project.version}'>jclouds-blobstore</feature> - <bundle>mvn:org.apache.jclouds.labs/b2/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.provider/b2/${jclouds.version}</bundle> </feature> <feature name='jclouds-cloudsigma2-hnl' description='CloudSigma v2 Honolulu' version='${project.version}'> @@ -549,7 +551,7 @@ limitations under the License. <feature version='${project.version}'>jclouds-blobstore</feature> <feature version='${project.version}'>jclouds-api-oauth</feature> <bundle dependency='true'>mvn:org.apache.jclouds.common/googlecloud/${jclouds.version}</bundle> - <bundle>mvn:org.apache.jclouds.labs/google-cloud-storage/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.provider/google-cloud-storage/${jclouds.version}</bundle> </feature> <!-- SERVICES --> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/011e811c/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java index 4a490ac..e057264 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java @@ -267,6 +267,11 @@ public class FeatureInstallationTest extends BasePaxExamTest { } @Test + public void testB2Feature() throws Exception { + featuresService.installFeature("jclouds-b2"); + } + + @Test public void testDigitalOcean2Feature() throws Exception { featuresService.installFeature("jclouds-digitalocean2"); } @@ -317,6 +322,11 @@ public class FeatureInstallationTest extends BasePaxExamTest { } @Test + public void testGoogleCloudStorageFeature() throws Exception { + featuresService.installFeature("jclouds-google-cloud-storage"); + } + + @Test public void testGoogleComputeEngineFeature() throws Exception { featuresService.installFeature("jclouds-google-compute-engine"); } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/011e811c/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java index 577bd16..efe0c74 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java @@ -58,11 +58,6 @@ public class FeatureLabsInstallationTest extends BasePaxExamTest { } @Test - public void testLabsB2Feature() throws Exception { - featuresService.installFeature("jclouds-b2"); - } - - @Test public void testLabsCloudsigma2HnlFeature() throws Exception { featuresService.installFeature("jclouds-cloudsigma2-hnl"); } @@ -88,11 +83,6 @@ public class FeatureLabsInstallationTest extends BasePaxExamTest { } @Test - public void testLabsGoogleCloudStorageFeature() throws Exception { - featuresService.installFeature("jclouds-google-cloud-storage"); - } - - @Test public void testLabsPacketFeature() throws Exception { featuresService.installFeature("jclouds-packet"); }
