From 647df25d903017a1539b92c248ac2b4b4423b9df Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Thu, 25 Jun 2015 18:47:32 +0200
Subject: [PATCH] Update Maven coordinates to the promoted naming

---
 common/googlecloud/pom.xml              | 14 +++++++-------
 common/pom.xml                          |  1 +
 providers/google-compute-engine/pom.xml | 24 ++++++++++++------------
 providers/pom.xml                       |  1 +
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/common/googlecloud/pom.xml b/common/googlecloud/pom.xml
index df6a7c73df..2d67e7350a 100644
--- a/common/googlecloud/pom.xml
+++ b/common/googlecloud/pom.xml
@@ -21,13 +21,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-google</artifactId>
+        <groupId>org.apache.jclouds</groupId>
+        <artifactId>jclouds-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../project/pom.xml</relativePath>
     </parent>
 
-    <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.apache.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.common</groupId>
     <artifactId>googlecloud</artifactId>
     <name>jclouds Google Cloud Core</name>
     <description>jclouds components common to Google Cloud products</description>
@@ -36,11 +36,11 @@
         <dependency>
             <groupId>org.apache.jclouds.api</groupId>
             <artifactId>oauth</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>oauth</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/common/pom.xml b/common/pom.xml
index d12c7b8905..7ceb7f96a7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -30,6 +30,7 @@
   <packaging>pom</packaging>
   <name>jclouds commons project</name>
   <modules>
+    <module>googlecloud</module>
     <module>openstack</module>
   </modules>
 </project>
diff --git a/providers/google-compute-engine/pom.xml b/providers/google-compute-engine/pom.xml
index 2cf38fbb31..2e26052497 100644
--- a/providers/google-compute-engine/pom.xml
+++ b/providers/google-compute-engine/pom.xml
@@ -21,13 +21,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-google</artifactId>
+        <groupId>org.apache.jclouds</groupId>
+        <artifactId>jclouds-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../project/pom.xml</relativePath>
     </parent>
 
-    <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.apache.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.provider</groupId>
     <artifactId>google-compute-engine</artifactId>
     <name>jclouds Google Compute Engine provider</name>
     <description>jclouds components to access GoogleCompute</description>
@@ -47,16 +47,16 @@
         <dependency>
             <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.common</groupId>
             <artifactId>googlecloud</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.common</groupId>
             <artifactId>googlecloud</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.auto.service</groupId>
@@ -80,27 +80,27 @@
         <dependency>
             <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${jclouds.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/providers/pom.xml b/providers/pom.xml
index 9eac6a2356..77bf0e2daa 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -49,6 +49,7 @@
     <module>serverlove-z1-man</module>
     <module>skalicloud-sdg-my</module>
     <module>go2cloud-jhb1</module>
+    <module>google-compute-engine</module>
     <module>softlayer</module>
     <module>hpcloud-compute</module>
     <module>hpcloud-blockstorage</module>