You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/05/13 22:13:21 UTC

[3/6] git commit: JCLOUDS-20. Switch groupId to org.apache.jclouds, change parent POM, remove old distributionManagement content, add ASF repos.

JCLOUDS-20. Switch groupId to org.apache.jclouds, change parent POM, remove old distributionManagement content, add ASF repos.


Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/commit/4795cb44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/4795cb44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/4795cb44

Branch: refs/heads/1.6.x
Commit: 4795cb4446520981e713d80788963338cb1803ea
Parents: 2418e3a
Author: Andrew Bayer <an...@gmail.com>
Authored: Mon May 13 12:30:57 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Mon May 13 12:30:57 2013 -0700

----------------------------------------------------------------------
 abiquo/pom.xml                       |   14 +++++++-------
 aws-elb/pom.xml                      |   20 ++++++++++----------
 aws-iam/pom.xml                      |   12 ++++++------
 aws-rds/pom.xml                      |   12 ++++++------
 azure-management/pom.xml             |   14 +++++++-------
 carrenza-vcloud-director/pom.xml     |   16 ++++++++--------
 cdmi/pom.xml                         |   12 ++++++------
 cloudstack-ec2/pom.xml               |   16 ++++++++--------
 dmtf/pom.xml                         |    6 +++---
 elb/pom.xml                          |   20 ++++++++++----------
 fgcp-au/pom.xml                      |   18 +++++++++---------
 fgcp-de/pom.xml                      |   18 +++++++++---------
 fgcp/pom.xml                         |   14 +++++++-------
 google-compute-engine/pom.xml        |   20 ++++++++++----------
 greenqloud-compute/pom.xml           |   16 ++++++++--------
 greenqloud-storage/pom.xml           |   14 +++++++-------
 iam/pom.xml                          |   10 +++++-----
 jenkins/pom.xml                      |   10 +++++-----
 joyent-cloudapi/pom.xml              |   14 +++++++-------
 joyentcloud/pom.xml                  |   16 ++++++++--------
 nodepool/pom.xml                     |   22 +++++++++++-----------
 oauth/pom.xml                        |   10 +++++-----
 openstack/openstack-glance/pom.xml   |   14 +++++++-------
 openstack/openstack-quantum/pom.xml  |   14 +++++++-------
 openstack/openstack-reddwarf/pom.xml |   14 +++++++-------
 openstack/openstack-swift/pom.xml    |   16 ++++++++--------
 openstack/pom.xml                    |    4 ++--
 opsource-servers/pom.xml             |   14 +++++++-------
 pom.xml                              |   16 +++++++++++++---
 rackspace-clouddns-uk/pom.xml        |   22 +++++++++++-----------
 rackspace-clouddns-us/pom.xml        |   28 ++++++++++++++--------------
 rackspace-clouddns/pom.xml           |   24 ++++++++++++------------
 rds/pom.xml                          |   10 +++++-----
 savvis-symphonyvpdc/pom.xml          |   14 +++++++-------
 smartos-ssh/pom.xml                  |   14 +++++++-------
 vcloud-director/pom.xml              |   16 ++++++++--------
 virtualbox/pom.xml                   |   16 ++++++++--------
 37 files changed, 285 insertions(+), 275 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/abiquo/pom.xml
----------------------------------------------------------------------
diff --git a/abiquo/pom.xml b/abiquo/pom.xml
index 44a2d1b..02274df 100644
--- a/abiquo/pom.xml
+++ b/abiquo/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
@@ -30,12 +30,12 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
@@ -92,27 +92,27 @@
         </dependency>
         <!-- Test dependencies -->
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/aws-elb/pom.xml
----------------------------------------------------------------------
diff --git a/aws-elb/pom.xml b/aws-elb/pom.xml
index 6424c78..f75ff16 100644
--- a/aws-elb/pom.xml
+++ b/aws-elb/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>aws-elb</artifactId>
     <name>jclouds Amazon Elastic Load Balancer provider</name>
     <description>Elastic Load Balancer implementation targeted to Amazon Web Services</description>
@@ -57,52 +57,52 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>elb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>elb</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.provider</groupId>
+            <groupId>org.apache.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/aws-iam/pom.xml
----------------------------------------------------------------------
diff --git a/aws-iam/pom.xml b/aws-iam/pom.xml
index fdf2801..2293073 100644
--- a/aws-iam/pom.xml
+++ b/aws-iam/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>aws-iam</artifactId>
     <name>jclouds Amazon Identity and Access Management (IAM) provider</name>
     <description>Identity and Access Management (IAM) to Amazon Web Services</description>
@@ -50,26 +50,26 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>iam</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>iam</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/aws-rds/pom.xml
----------------------------------------------------------------------
diff --git a/aws-rds/pom.xml b/aws-rds/pom.xml
index b51426a..db3e5d9 100644
--- a/aws-rds/pom.xml
+++ b/aws-rds/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>aws-rds</artifactId>
     <name>jclouds Amazon Relational Database Service provider</name>
     <description>Relational Database Service implementation targeted to Amazon Web Services</description>
@@ -50,26 +50,26 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>rds</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>rds</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/azure-management/pom.xml
----------------------------------------------------------------------
diff --git a/azure-management/pom.xml b/azure-management/pom.xml
index d1dd20a..f65b48b 100644
--- a/azure-management/pom.xml
+++ b/azure-management/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>azure-management</artifactId>
   <name>jcloud azure-management api</name>
   <description>jclouds components to access an implementation of Azure Management</description>
@@ -57,32 +57,32 @@
       <version>0.4</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/carrenza-vcloud-director/pom.xml
----------------------------------------------------------------------
diff --git a/carrenza-vcloud-director/pom.xml b/carrenza-vcloud-director/pom.xml
index a9e0fab..62a2b97 100644
--- a/carrenza-vcloud-director/pom.xml
+++ b/carrenza-vcloud-director/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>carrenza-vcloud-director</artifactId>
     <name>jclouds Carrenza vCloud Director provider</name>
     <description>vCloud Director implementation targeted to Carrenza</description>
@@ -59,39 +59,39 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>vcloud-director</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>vcloud-director</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/cdmi/pom.xml
----------------------------------------------------------------------
diff --git a/cdmi/pom.xml b/cdmi/pom.xml
index 0923130..4d22680 100644
--- a/cdmi/pom.xml
+++ b/cdmi/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>cdmi</artifactId>
   <name>jcloud cdmi api</name>
   <description>jclouds components to access an implementation of SNIA CDMI</description>
@@ -54,26 +54,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/cloudstack-ec2/pom.xml
----------------------------------------------------------------------
diff --git a/cloudstack-ec2/pom.xml b/cloudstack-ec2/pom.xml
index c57bb5c..fd60f65 100644
--- a/cloudstack-ec2/pom.xml
+++ b/cloudstack-ec2/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>cloudstack-ec2</artifactId>
   <name>jclouds CloudStack EC2 api</name>
   <description>EC2 implementation based on CloudStack</description>
@@ -53,39 +53,39 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>ec2</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>ec2</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-log4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/dmtf/pom.xml
----------------------------------------------------------------------
diff --git a/dmtf/pom.xml b/dmtf/pom.xml
index e13608b..02a608b 100644
--- a/dmtf/pom.xml
+++ b/dmtf/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: consider merging this with vcloud-director as it is not used anywhere else -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>dmtf</artifactId>
   <name>jclouds dmtf domain objects</name>
   <description>jclouds implementation of DMTF OVF and CIM domain objects</description>
@@ -44,7 +44,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/elb/pom.xml
----------------------------------------------------------------------
diff --git a/elb/pom.xml b/elb/pom.xml
index 3d5ee48..49e149c 100644
--- a/elb/pom.xml
+++ b/elb/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>elb</artifactId>
     <name>jcloud elb api</name>
     <description>jclouds components to access an implementation of Elastic Load Balancer</description>
@@ -57,51 +57,51 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>sts</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
             <version>${jclouds.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.provider</groupId>
+            <groupId>org.apache.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/fgcp-au/pom.xml
----------------------------------------------------------------------
diff --git a/fgcp-au/pom.xml b/fgcp-au/pom.xml
index 4e7a97b..0b314d5 100644
--- a/fgcp-au/pom.xml
+++ b/fgcp-au/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>fgcp-au</artifactId>
     <name>jclouds Fujitsu Global Cloud Platform AU provider</name>
     <description>jclouds components to access Fujitsu Global Cloud Platform in Australia</description>
@@ -68,31 +68,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
@@ -109,12 +109,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/fgcp-de/pom.xml
----------------------------------------------------------------------
diff --git a/fgcp-de/pom.xml b/fgcp-de/pom.xml
index 512876a..1b569bd 100644
--- a/fgcp-de/pom.xml
+++ b/fgcp-de/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>fgcp-de</artifactId>
     <name>jclouds Fujitsu Global Cloud Platform DE provider</name>
     <description>jclouds components to access Fujitsu Global Cloud Platform in Germany</description>
@@ -69,31 +69,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
@@ -110,12 +110,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/fgcp/pom.xml
----------------------------------------------------------------------
diff --git a/fgcp/pom.xml b/fgcp/pom.xml
index dcf4cc4..dc45a34 100644
--- a/fgcp/pom.xml
+++ b/fgcp/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>fgcp</artifactId>
     <name>jclouds Fujitsu Global Cloud Platform</name>
     <description>jclouds components to access Fujitsu Global Cloud Platform</description>
@@ -70,31 +70,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/google-compute-engine/pom.xml
----------------------------------------------------------------------
diff --git a/google-compute-engine/pom.xml b/google-compute-engine/pom.xml
index 9f05446..e8171ab 100644
--- a/google-compute-engine/pom.xml
+++ b/google-compute-engine/pom.xml
@@ -21,13 +21,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>google-compute-engine</artifactId>
     <name>jclouds Google Compute Engine provider</name>
     <description>jclouds components to access GoogleCompute</description>
@@ -41,50 +41,50 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>oauth</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.labs</groupId>
             <artifactId>oauth</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/greenqloud-compute/pom.xml
----------------------------------------------------------------------
diff --git a/greenqloud-compute/pom.xml b/greenqloud-compute/pom.xml
index c49af57..e799720 100644
--- a/greenqloud-compute/pom.xml
+++ b/greenqloud-compute/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>greenqloud-compute</artifactId>
     <name>jclouds Greenqloud compute provider</name>
     <description>Compute implementation targeted to Greenqloud Web Services</description>
@@ -54,39 +54,39 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>ec2</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>ec2</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/greenqloud-storage/pom.xml
----------------------------------------------------------------------
diff --git a/greenqloud-storage/pom.xml b/greenqloud-storage/pom.xml
index fb97e23..0809499 100644
--- a/greenqloud-storage/pom.xml
+++ b/greenqloud-storage/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>greenqloud-storage</artifactId>
     <name>jclouds GreenQloud Simple Storage Service (S3) provider</name>
     <description>Simple Storage Service (S3) implementation targeted to GreenQloud Web Services</description>
@@ -49,33 +49,33 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>s3</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-blobstore</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>s3</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/iam/pom.xml
----------------------------------------------------------------------
diff --git a/iam/pom.xml b/iam/pom.xml
index 0fe3b52..619aa95 100644
--- a/iam/pom.xml
+++ b/iam/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>iam</artifactId>
   <name>jcloud iam api</name>
   <description>jclouds components to access an implementation of Identity and Access Management (IAM)</description>
@@ -50,19 +50,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>sts</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/jenkins/pom.xml
----------------------------------------------------------------------
diff --git a/jenkins/pom.xml b/jenkins/pom.xml
index bbce372..ae8d64d 100644
--- a/jenkins/pom.xml
+++ b/jenkins/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>jenkins</artifactId>
   <name>jcloud jenkins api</name>
   <description>jclouds components to access an implementation of Jenkins</description>
@@ -51,19 +51,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/joyent-cloudapi/pom.xml
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/pom.xml b/joyent-cloudapi/pom.xml
index ffee293..37541fe 100644
--- a/joyent-cloudapi/pom.xml
+++ b/joyent-cloudapi/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>joyent-cloudapi</artifactId>
   <name>jcloud joyent-cloudapi api</name>
   <description>jclouds components to access an implementation of Joyent SDC</description>
@@ -50,32 +50,32 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/joyentcloud/pom.xml
----------------------------------------------------------------------
diff --git a/joyentcloud/pom.xml b/joyentcloud/pom.xml
index 0a2587f..9ceda18 100644
--- a/joyentcloud/pom.xml
+++ b/joyentcloud/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>joyentcloud</artifactId>
   <name>jcloud joyentcloud provider</name>
   <description>jclouds components to access the Joyent Cloud</description>
@@ -50,39 +50,39 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>joyent-cloudapi</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>joyent-cloudapi</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/nodepool/pom.xml
----------------------------------------------------------------------
diff --git a/nodepool/pom.xml b/nodepool/pom.xml
index 44ea5f9..486f375 100644
--- a/nodepool/pom.xml
+++ b/nodepool/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api? -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>nodepool</artifactId>
   <name>jcloud nodepool api</name>
   <packaging>bundle</packaging>
@@ -51,55 +51,55 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!-- Add all compute so that we can run tests with any provider -->
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-allcompute</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>filesystem</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>byon</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/oauth/pom.xml
----------------------------------------------------------------------
diff --git a/oauth/pom.xml b/oauth/pom.xml
index 2a4f00f..4f6fda0 100644
--- a/oauth/pom.xml
+++ b/oauth/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>oauth</artifactId>
     <name>jclouds OAuth core</name>
     <description>jclouds components to access OAuth</description>
@@ -46,19 +46,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/openstack/openstack-glance/pom.xml
----------------------------------------------------------------------
diff --git a/openstack/openstack-glance/pom.xml b/openstack/openstack-glance/pom.xml
index 8230303..29807a7 100644
--- a/openstack/openstack-glance/pom.xml
+++ b/openstack/openstack-glance/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs-openstack</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>openstack-glance</artifactId>
   <name>jclouds openstack-glance api</name>
   <description>jclouds components to access an implementation of OpenStack Glance</description>
@@ -54,31 +54,31 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/openstack/openstack-quantum/pom.xml
----------------------------------------------------------------------
diff --git a/openstack/openstack-quantum/pom.xml b/openstack/openstack-quantum/pom.xml
index a13cd2d..d3475d1 100644
--- a/openstack/openstack-quantum/pom.xml
+++ b/openstack/openstack-quantum/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs-openstack</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>openstack-quantum</artifactId>
   <name>jclouds openstack-quantum api</name>
   <description>jclouds components to access an implementation of OpenStack Quantum</description>
@@ -53,31 +53,31 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/openstack/openstack-reddwarf/pom.xml
----------------------------------------------------------------------
diff --git a/openstack/openstack-reddwarf/pom.xml b/openstack/openstack-reddwarf/pom.xml
index c0163ce..7f00368 100644
--- a/openstack/openstack-reddwarf/pom.xml
+++ b/openstack/openstack-reddwarf/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs-openstack</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>openstack-reddwarf</artifactId>
   <name>jclouds openstack-reddwarf api</name>
   <description>jclouds components to access an implementation of OpenStack RedDwarf</description>
@@ -54,31 +54,31 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/openstack/openstack-swift/pom.xml
----------------------------------------------------------------------
diff --git a/openstack/openstack-swift/pom.xml b/openstack/openstack-swift/pom.xml
index dcfc676..179f66d 100644
--- a/openstack/openstack-swift/pom.xml
+++ b/openstack/openstack-swift/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs-openstack</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>openstack-swift</artifactId>
   <name>jclouds openstack-swift api</name>
   <description>jclouds components to access an implementation of OpenStack Swift</description>
@@ -56,38 +56,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
       <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/openstack/pom.xml
----------------------------------------------------------------------
diff --git a/openstack/pom.xml b/openstack/pom.xml
index 0d0b067..9c73680 100644
--- a/openstack/pom.xml
+++ b/openstack/pom.xml
@@ -22,11 +22,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs-openstack</artifactId>
     <packaging>pom</packaging>
     <name>jclouds labs openstack</name>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/opsource-servers/pom.xml
----------------------------------------------------------------------
diff --git a/opsource-servers/pom.xml b/opsource-servers/pom.xml
index f44730a..0e8f0f7 100644
--- a/opsource-servers/pom.xml
+++ b/opsource-servers/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>opsource-servers</artifactId>
   <name>jcloud opsource-servers provider</name>
   <description>jclouds components to access an implementation of OpSource Cloud Servers</description>
@@ -52,32 +52,32 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-log4j</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f4192f8..9ace5b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds</groupId>
+        <groupId>org.apache.jclouds</groupId>
         <artifactId>jclouds-project</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -44,6 +44,16 @@
     </properties>
 
     <repositories>
+    <repository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
         <repository>
             <id>sonatype-nexus-snapshots</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/rackspace-clouddns-uk/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-clouddns-uk/pom.xml b/rackspace-clouddns-uk/pom.xml
index 56d63c4..02172b3 100644
--- a/rackspace-clouddns-uk/pom.xml
+++ b/rackspace-clouddns-uk/pom.xml
@@ -22,12 +22,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>jclouds-labs</artifactId>
       <version>1.6.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>rackspace-clouddns-uk</artifactId>
   <name>jclouds Rackspace Next Generation Cloud DNS UK provider</name>
   <description>Rackspace Next Generation Cloud DNS UK</description>
@@ -51,55 +51,55 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>rackspace-clouddns</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>rackspace-clouddns</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/rackspace-clouddns-us/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-clouddns-us/pom.xml b/rackspace-clouddns-us/pom.xml
index c7a3d9d..b88c718 100644
--- a/rackspace-clouddns-us/pom.xml
+++ b/rackspace-clouddns-us/pom.xml
@@ -22,12 +22,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>jclouds-labs</artifactId>
       <version>1.6.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>rackspace-clouddns-us</artifactId>
   <name>jclouds Rackspace Next Generation Cloud DNS US provider</name>
   <description>Rackspace Next Generation Cloud DNS US</description>
@@ -51,76 +51,76 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>rackspace-clouddns</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-nova</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.labs</groupId>
+      <groupId>org.apache.jclouds.labs</groupId>
       <artifactId>rackspace-clouddns</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.provider</groupId>
+      <groupId>org.apache.jclouds.provider</groupId>
       <artifactId>rackspace-cloudservers-us</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/rackspace-clouddns/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-clouddns/pom.xml b/rackspace-clouddns/pom.xml
index 95f47a5..4fa804f 100644
--- a/rackspace-clouddns/pom.xml
+++ b/rackspace-clouddns/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>jclouds-labs</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
   <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.labs</groupId>
   <artifactId>rackspace-clouddns</artifactId>
   <name>jclouds rackspace clouddns api</name>
   <description>jclouds components for Rackspace Cloud DNS</description>
@@ -51,64 +51,64 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
       <version>1.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds</groupId>
+      <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>openstack-nova</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.api</groupId>
+      <groupId>org.apache.jclouds.api</groupId>
       <artifactId>rackspace-cloudidentity</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.provider</groupId>
+      <groupId>org.apache.jclouds.provider</groupId>
       <artifactId>rackspace-cloudservers-us</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.driver</groupId>
+      <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>1.6.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/4795cb44/rds/pom.xml
----------------------------------------------------------------------
diff --git a/rds/pom.xml b/rds/pom.xml
index c290ae1..22f0eac 100644
--- a/rds/pom.xml
+++ b/rds/pom.xml
@@ -22,13 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.jclouds.labs</groupId>
+        <groupId>org.apache.jclouds.labs</groupId>
         <artifactId>jclouds-labs</artifactId>
         <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <!-- TODO: when out of labs, switch to org.jclouds.api -->
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.apache.jclouds.labs</groupId>
     <artifactId>rds</artifactId>
     <name>jcloud rds api</name>
     <description>jclouds components to access an implementation of Relational Database Service</description>
@@ -50,19 +50,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.api</groupId>
+            <groupId>org.apache.jclouds.api</groupId>
             <artifactId>sts</artifactId>
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jclouds</groupId>
+            <groupId>org.apache.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.driver</groupId>
+            <groupId>org.apache.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
             <version>${jclouds.version}</version>
             <scope>test</scope>