JCLOUDS-944: JCLOUDS-1272: Update B2 and GCS deps
authorAndrew Gaul <gaul@apache.org>
Tue, 9 May 2017 00:13:37 +0000 (17:13 -0700)
committerAndrew Gaul <gaul@apache.org>
Wed, 10 May 2017 05:21:46 +0000 (22:21 -0700)
feature-labs/src/main/feature/feature.xml
feature/src/main/feature/feature.xml
itests/src/test/java/org/jclouds/karaf/itests/FeatureInstallationTest.java
itests/src/test/java/org/jclouds/karaf/itests/FeatureLabsInstallationTest.java

index 600dca7..346e00a 100644 (file)
@@ -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>
index 1e990cc..ba24fd9 100644 (file)
@@ -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 -->
index 4a490ac..e057264 100644 (file)
@@ -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");
    }
index 577bd16..efe0c74 100644 (file)
@@ -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");
    }