From a7383af25828b86694db11c6b797619cd0b49675 Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Wed, 17 Jan 2018 09:19:18 +0100
Subject: [PATCH] Update pom.xml files after promoting Rackspace Cloud Networks

---
 providers/pom.xml                             |  2 ++
 .../rackspace-cloudnetworks-uk/README.md      |  4 ----
 providers/rackspace-cloudnetworks-uk/pom.xml  | 21 ++++++++-----------
 .../rackspace-cloudnetworks-us/README.md      |  1 -
 providers/rackspace-cloudnetworks-us/pom.xml  | 21 ++++++++-----------
 5 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 providers/rackspace-cloudnetworks-uk/README.md

diff --git a/providers/pom.xml b/providers/pom.xml
index df0fe88f5e..29bd1238fd 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -70,6 +70,8 @@
     <module>rackspace-cloudfiles-us</module>
     <module>rackspace-cloudloadbalancers-uk</module>
     <module>rackspace-cloudloadbalancers-us</module>
+    <module>rackspace-cloudnetworks-uk</module>
+    <module>rackspace-cloudnetworks-us</module>
     <module>rackspace-cloudservers-uk</module>
     <module>rackspace-cloudservers-us</module>
     <module>serverlove-z1-man</module>
diff --git a/providers/rackspace-cloudnetworks-uk/README.md b/providers/rackspace-cloudnetworks-uk/README.md
deleted file mode 100644
index dc52a0f488..0000000000
--- a/providers/rackspace-cloudnetworks-uk/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Rackspace Networks UK
-========================
-
-Beta
diff --git a/providers/rackspace-cloudnetworks-uk/pom.xml b/providers/rackspace-cloudnetworks-uk/pom.xml
index 96935c9fc2..20e66498d5 100644
--- a/providers/rackspace-cloudnetworks-uk/pom.xml
+++ b/providers/rackspace-cloudnetworks-uk/pom.xml
@@ -23,13 +23,10 @@
     <groupId>org.apache.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>2.1.0-SNAPSHOT</version>
-    <relativePath />
+    <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>rackspace-cloudnetworks-uk</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
   <name>jclouds Rackspace Cloud Networks UK provider</name>
   <description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks UK</description>
   <packaging>bundle</packaging>
@@ -47,35 +44,35 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-neutron</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>org.apache.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-neutron</artifactId>
-      <version>${project.parent.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>${project.parent.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>${project.parent.version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/providers/rackspace-cloudnetworks-us/README.md b/providers/rackspace-cloudnetworks-us/README.md
index 4a833078ca..fa43188864 100644
--- a/providers/rackspace-cloudnetworks-us/README.md
+++ b/providers/rackspace-cloudnetworks-us/README.md
@@ -1,4 +1,3 @@
 Rackspace Networks US
 ========================
 
-Beta
diff --git a/providers/rackspace-cloudnetworks-us/pom.xml b/providers/rackspace-cloudnetworks-us/pom.xml
index aeb8a3ce5a..e34e38947b 100644
--- a/providers/rackspace-cloudnetworks-us/pom.xml
+++ b/providers/rackspace-cloudnetworks-us/pom.xml
@@ -23,13 +23,10 @@
     <groupId>org.apache.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>2.1.0-SNAPSHOT</version>
-    <relativePath />
+    <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>rackspace-cloudnetworks-us</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
   <name>jclouds Rackspace Cloud Networks US provider</name>
   <description>OpenStack Neutron implementation targeted to Rackspace Cloud Networks US</description>
   <packaging>bundle</packaging>
@@ -47,35 +44,35 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-neutron</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>org.apache.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-neutron</artifactId>
-      <version>${project.parent.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>${project.parent.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>${project.parent.version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>