From 08b77ccd816956a46547f8c1945afc3b9aea99ee Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Sat, 9 Mar 2013 14:49:15 -0500
Subject: [PATCH] Separating labs version from jclouds version

---
 labs/abiquo/pom.xml                      | 25 ++++++++-------
 labs/aws-elb/pom.xml                     | 26 ++++++++--------
 labs/aws-iam/pom.xml                     | 18 ++++++-----
 labs/aws-rds/pom.xml                     | 18 ++++++-----
 labs/cdmi/pom.xml                        | 22 ++++++-------
 labs/dmtf/pom.xml                        | 12 ++++----
 labs/elb/pom.xml                         | 29 ++++++++++--------
 labs/fgcp-au/pom.xml                     | 21 ++++++-------
 labs/fgcp-de/pom.xml                     | 21 ++++++-------
 labs/fgcp/pom.xml                        | 24 +++++++--------
 labs/google-compute/pom.xml              | 10 +++---
 labs/iam/pom.xml                         | 20 ++++++------
 labs/joyent-cloudapi/pom.xml             | 22 ++++++-------
 labs/joyentcloud/pom.xml                 | 20 ++++++------
 labs/oauth/pom.xml                       |  8 ++---
 labs/openstack/openstack-glance/pom.xml  | 22 ++++++-------
 labs/openstack/openstack-quantum/pom.xml | 21 +++++++------
 labs/openstack/openstack-swift/pom.xml   | 27 ++++++++--------
 labs/openstack/pom.xml                   | 11 +++----
 labs/pom.xml                             | 12 ++++----
 labs/project/pom.xml                     | 39 ++++++++++++++++++++++++
 labs/rds/pom.xml                         | 19 +++++++-----
 labs/vcloud-director/pom.xml             | 24 +++++++--------
 labs/virtualbox/pom.xml                  | 22 ++++++-------
 24 files changed, 271 insertions(+), 222 deletions(-)
 create mode 100644 labs/project/pom.xml

diff --git a/labs/abiquo/pom.xml b/labs/abiquo/pom.xml
index 3fb943cb0b..f0f0f8f4bf 100644
--- a/labs/abiquo/pom.xml
+++ b/labs/abiquo/pom.xml
@@ -2,13 +2,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</groupId>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
     
-    <groupId>org.jclouds.labs</groupId>
     <artifactId>abiquo</artifactId>
     <name>jclouds Abiquo api</name>
     <description>jclouds components to access an implementation of Abiquo</description>
@@ -23,19 +22,23 @@
         <test.abiquo.api-version />
         <test.abiquo.build-version />
         <jclouds.osgi.export>org.jclouds.abiquo*;version="${project.version}"</jclouds.osgi.export>
-        <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+        <jclouds.osgi.import>
+          org.jclouds.labs*;version="${project.version}",
+          org.jclouds*;version="${jclouds.version}",
+          *
+        </jclouds.osgi.import>
     </properties>
     
     <dependencies>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
         </dependency>
         <!-- Abiquo -->
         <dependency>
@@ -92,27 +95,27 @@
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/labs/aws-elb/pom.xml b/labs/aws-elb/pom.xml
index 52d18674b1..9fbfc5429f 100644
--- a/labs/aws-elb/pom.xml
+++ b/labs/aws-elb/pom.xml
@@ -22,12 +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>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.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>
@@ -48,7 +47,11 @@
         <test.aws-elb.compute.template />
 
       <jclouds.osgi.export>org.jclouds.aws.elb*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+      <jclouds.osgi.import>
+        org.jclouds.labs*;version="${project.version}",
+        org.jclouds*;version="${jclouds.version}",
+        *
+      </jclouds.osgi.import>
     </properties>
 
     <dependencies>
@@ -56,7 +59,6 @@
             <groupId>org.jclouds.labs</groupId>
             <artifactId>elb</artifactId>
             <version>${project.version}</version>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jclouds.labs</groupId>
@@ -68,40 +70,40 @@
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/labs/aws-iam/pom.xml b/labs/aws-iam/pom.xml
index 1f8c83012a..9a6d4492e6 100644
--- a/labs/aws-iam/pom.xml
+++ b/labs/aws-iam/pom.xml
@@ -22,12 +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>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.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>
@@ -41,7 +40,11 @@
         <test.aws-iam.credential>${test.aws.credential}</test.aws-iam.credential>
 
         <jclouds.osgi.export>org.jclouds.aws.iam*;version="${project.version}"</jclouds.osgi.export>
-        <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+        <jclouds.osgi.import>
+          org.jclouds.labs*;version="${project.version}",
+          org.jclouds*;version="${jclouds.version}",
+          *
+        </jclouds.osgi.import>
     </properties>
 
     <dependencies>
@@ -49,7 +52,6 @@
             <groupId>org.jclouds.labs</groupId>
             <artifactId>iam</artifactId>
             <version>${project.version}</version>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jclouds.labs</groupId>
@@ -61,14 +63,14 @@
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/labs/aws-rds/pom.xml b/labs/aws-rds/pom.xml
index db9ec819d7..b5f545d39f 100644
--- a/labs/aws-rds/pom.xml
+++ b/labs/aws-rds/pom.xml
@@ -22,12 +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>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.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>
@@ -41,7 +40,11 @@
         <test.aws-rds.credential>${test.aws.credential}</test.aws-rds.credential>
 
       <jclouds.osgi.export>org.jclouds.aws.rds*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+      <jclouds.osgi.import>
+        org.jclouds.labs*;version="${project.version}",
+        org.jclouds*;version="${jclouds.version}",
+        *
+      </jclouds.osgi.import>
     </properties>
 
     <dependencies>
@@ -49,7 +52,6 @@
             <groupId>org.jclouds.labs</groupId>
             <artifactId>rds</artifactId>
             <version>${project.version}</version>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jclouds.labs</groupId>
@@ -61,14 +63,14 @@
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/labs/cdmi/pom.xml b/labs/cdmi/pom.xml
index efedc6def6..a7a518cb4f 100644
--- a/labs/cdmi/pom.xml
+++ b/labs/cdmi/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>cdmi</artifactId>
   <name>jcloud cdmi api</name>
   <description>jclouds components to access an implementation of SNIA CDMI</description>
@@ -44,9 +43,10 @@
 
     <jclouds.osgi.export>org.jclouds.snia.cdmi.v1*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds.blobstore.internal;version="${project.version}",
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
+      org.jclouds.blobstore.internal;version="${jclouds.version}",
+      org.jclouds.rest.internal;version="${jclouds.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -55,26 +55,26 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/labs/dmtf/pom.xml b/labs/dmtf/pom.xml
index 9f36db5bd6..1e301253f1 100644
--- a/labs/dmtf/pom.xml
+++ b/labs/dmtf/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>dmtf</artifactId>
   <name>jclouds dmtf domain objects</name>
   <description>jclouds implementation of DMTF OVF and CIM domain objects</description>
@@ -36,7 +35,8 @@
   <properties>
     <jclouds.osgi.export>org.jclouds.dmtf.*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds*;version="${project.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/labs/elb/pom.xml b/labs/elb/pom.xml
index c53f08da1b..222c5f5fd3 100644
--- a/labs/elb/pom.xml
+++ b/labs/elb/pom.xml
@@ -22,12 +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>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
     <artifactId>elb</artifactId>
     <name>jcloud elb api</name>
     <description>jclouds components to access an implementation of Elastic Load Balancer</description>
@@ -48,58 +47,62 @@
         <test.elb.compute.template />
 
       <jclouds.osgi.export>org.jclouds.elb*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+      <jclouds.osgi.import>
+        org.jclouds.labs*;version="${project.version}",
+        org.jclouds*;version="${jclouds.version}",
+        *
+      </jclouds.osgi.import>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.jclouds.api</groupId>
             <artifactId>sts</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-loadbalancer</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/labs/fgcp-au/pom.xml b/labs/fgcp-au/pom.xml
index c3828e426b..3a3050bbe9 100644
--- a/labs/fgcp-au/pom.xml
+++ b/labs/fgcp-au/pom.xml
@@ -22,12 +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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.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>
@@ -60,7 +59,8 @@
         <test.fgcp-au.image.authenticate-sudo />
         <jclouds.osgi.export>org.jclouds.fujitsu.fgcp*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
-          org.jclouds.providers*;version="${project.version}",
+          org.jclouds.labs*;version="${project.version}",
+          org.jclouds.providers*;version="${jclouds.version}",
           *
         </jclouds.osgi.import>
     </properties>
@@ -70,31 +70,31 @@
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -112,7 +112,6 @@
             <groupId>org.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jclouds.labs</groupId>
diff --git a/labs/fgcp-de/pom.xml b/labs/fgcp-de/pom.xml
index 00ea8c40c4..af6e84406c 100644
--- a/labs/fgcp-de/pom.xml
+++ b/labs/fgcp-de/pom.xml
@@ -22,12 +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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.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>
@@ -60,7 +59,8 @@
         <test.fgcp-de.image.authenticate-sudo />
         <jclouds.osgi.export>org.jclouds.fujitsu.fgcp*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
-          org.jclouds.providers*;version="${project.version}",
+          org.jclouds.labs*;version="${project.version}",
+          org.jclouds.providers*;version="${jclouds.version}",
           *
         </jclouds.osgi.import>
     </properties>
@@ -70,31 +70,31 @@
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -112,7 +112,6 @@
             <groupId>org.jclouds.labs</groupId>
             <artifactId>fgcp</artifactId>
             <version>${project.version}</version>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jclouds.labs</groupId>
diff --git a/labs/fgcp/pom.xml b/labs/fgcp/pom.xml
index 619e275f8c..ea0cbcdd17 100644
--- a/labs/fgcp/pom.xml
+++ b/labs/fgcp/pom.xml
@@ -22,12 +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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
     <artifactId>fgcp</artifactId>
     <name>jclouds Fujitsu Global Cloud Platform</name>
     <description>jclouds components to access Fujitsu Global Cloud Platform</description>
@@ -59,9 +58,10 @@
         <test.fgcp-au.image.authenticate-sudo />
         <jclouds.osgi.export>org.jclouds.fujitsu.fgcp*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
-          org.jclouds.compute.internal;version="${project.version}",
-          org.jclouds.rest.internal;version="${project.version}",
-          org.jclouds*;version="${project.version}",
+          org.jclouds.compute.internal;version="${jclouds.version}",
+          org.jclouds.rest.internal;version="${jclouds.version}",
+          org.jclouds.labs*;version="${project.version}",
+          org.jclouds*;version="${jclouds.version}",
           *
         </jclouds.osgi.import>
     </properties>
@@ -71,31 +71,31 @@
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-compute</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/labs/google-compute/pom.xml b/labs/google-compute/pom.xml
index 5c3c82fc8c..9a80af7c68 100644
--- a/labs/google-compute/pom.xml
+++ b/labs/google-compute/pom.xml
@@ -21,18 +21,16 @@
 <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>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
     <artifactId>google-compute</artifactId>
     <name>jclouds Google Compute Engine provider</name>
     <description>jclouds components to access GoogleCompute</description>
 
     <properties>
-        <jclouds.version>1.7.0-SNAPSHOT</jclouds.version>
         <test.google-compute.identity>Email associated with the Google API client_id</test.google-compute.identity>
         <test.google-compute.credential>Private key (PKCS12 file) associated with the Google API client_id</test.google-compute.credential>
         <test.google-compute.api-version>v1beta13</test.google-compute.api-version>
@@ -86,7 +84,7 @@
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-sshj</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/labs/iam/pom.xml b/labs/iam/pom.xml
index 349d01410c..e8e446d6ae 100644
--- a/labs/iam/pom.xml
+++ b/labs/iam/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.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>
@@ -41,27 +40,30 @@
     <test.iam.credential>${test.aws.credential}</test.iam.credential>
 
     <jclouds.osgi.export>org.jclouds.iam*;version="${project.version}"</jclouds.osgi.export>
-    <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+    <jclouds.osgi.import>
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
+      *
+    </jclouds.osgi.import>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>sts</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/labs/joyent-cloudapi/pom.xml b/labs/joyent-cloudapi/pom.xml
index cd219bced9..dd4eec53fe 100644
--- a/labs/joyent-cloudapi/pom.xml
+++ b/labs/joyent-cloudapi/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>joyent-cloudapi</artifactId>
   <name>jcloud joyent-cloudapi api</name>
   <description>jclouds components to access an implementation of Joyent SDC</description>
@@ -41,8 +40,9 @@
     <test.joyent-cloudapi.credential>FIXME_CREDENTIALS</test.joyent-cloudapi.credential>
     <jclouds.osgi.export>org.jclouds.joyent.cloudapi.v6_5*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
+      org.jclouds.rest.internal;version="${jclouds.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -51,32 +51,32 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/labs/joyentcloud/pom.xml b/labs/joyentcloud/pom.xml
index 36ee681134..1d00bcbe77 100644
--- a/labs/joyentcloud/pom.xml
+++ b/labs/joyentcloud/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>joyentcloud</artifactId>
   <name>jcloud joyentcloud api</name>
   <description>jclouds components to access the Joyent Cloud</description>
@@ -41,8 +40,9 @@
     <test.joyentcloud.credential>FIXME_CREDENTIALS</test.joyentcloud.credential>
     <jclouds.osgi.export>org.jclouds.joyent.joyentcloud*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
+      org.jclouds.rest.internal;version="${jclouds.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -63,27 +63,27 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/labs/oauth/pom.xml b/labs/oauth/pom.xml
index 32de3d1b31..789873f8c9 100644
--- a/labs/oauth/pom.xml
+++ b/labs/oauth/pom.xml
@@ -22,18 +22,16 @@
 <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>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
     <artifactId>oauth</artifactId>
     <name>jclouds OAuth core</name>
     <description>jclouds components to access OAuth</description>
 
     <properties>
-        <jclouds.version>1.7.0-SNAPSHOT</jclouds.version>
         <test.oauth.identity>FIX_ME</test.oauth.identity>
         <test.oauth.credential>FIX_ME</test.oauth.credential>
         <test.oauth.endpoint>FIX_ME</test.oauth.endpoint>
diff --git a/labs/openstack/openstack-glance/pom.xml b/labs/openstack/openstack-glance/pom.xml
index 44aacf47c2..9d178a5e65 100644
--- a/labs/openstack/openstack-glance/pom.xml
+++ b/labs/openstack/openstack-glance/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../../project/pom.xml</relativePath>
+    <relativePath>../../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>openstack-glance</artifactId>
   <name>jclouds openstack-glance api</name>
   <description>jclouds components to access an implementation of OpenStack Glance</description>
@@ -45,8 +44,9 @@
 
     <jclouds.osgi.export>org.jclouds.openstack.glance.v1_0*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
+      org.jclouds.rest.internal;version="${jclouds.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -55,31 +55,31 @@
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/labs/openstack/openstack-quantum/pom.xml b/labs/openstack/openstack-quantum/pom.xml
index ed8f4e90be..03bd4988d0 100644
--- a/labs/openstack/openstack-quantum/pom.xml
+++ b/labs/openstack/openstack-quantum/pom.xml
@@ -22,10 +22,10 @@
 <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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../../project/pom.xml</relativePath>
+    <relativePath>../../project/pom.xml</relativePath>
   </parent>
   <groupId>org.jclouds.labs</groupId>
   <artifactId>openstack-quantum</artifactId>
@@ -44,8 +44,9 @@
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
     <jclouds.osgi.export>org.jclouds.openstack.quantum.v1_0*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
+      org.jclouds.rest.internal;version="${jclouds.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -54,31 +55,31 @@
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/labs/openstack/openstack-swift/pom.xml b/labs/openstack/openstack-swift/pom.xml
index bd1163ea98..06043d26b1 100644
--- a/labs/openstack/openstack-swift/pom.xml
+++ b/labs/openstack/openstack-swift/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../../project/pom.xml</relativePath>
+    <relativePath>../../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>openstack-swift</artifactId>
   <name>jclouds openstack-swift api</name>
   <description>jclouds components to access an implementation of OpenStack Swift</description>
@@ -46,9 +45,10 @@
 
     <jclouds.osgi.export>org.jclouds.openstack.swift.v1*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds.blobstore.internal;version="${project.version}",
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
+      org.jclouds.blobstore.internal;version="${jclouds.version}",
+      org.jclouds.rest.internal;version="${jclouds.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -57,38 +57,38 @@
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>openstack-keystone</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-blobstore</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -133,5 +133,4 @@
     </profile>
   </profiles>
 
-
 </project>
diff --git a/labs/openstack/pom.xml b/labs/openstack/pom.xml
index 637c29e519..21dc38fdf7 100644
--- a/labs/openstack/pom.xml
+++ b/labs/openstack/pom.xml
@@ -22,15 +22,14 @@
 <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>
-        <artifactId>jclouds-project</artifactId>
-        <groupId>org.jclouds</groupId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
-    <artifactId>jclouds-labs-openstack-project</artifactId>
+    <artifactId>jclouds-labs-openstack</artifactId>
     <packaging>pom</packaging>
-    <name>jclouds labs openstack project</name>
+    <name>jclouds labs openstack</name>
     <modules>
        <!--<module>openstack-atlas</module>-->
        <!--<module>openstack-cinder-v2</module>-->
diff --git a/labs/pom.xml b/labs/pom.xml
index 438c0f1a29..30476195c5 100644
--- a/labs/pom.xml
+++ b/labs/pom.xml
@@ -22,16 +22,16 @@
 <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>
-        <artifactId>jclouds-project</artifactId>
-        <groupId>org.jclouds</groupId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../project/pom.xml</relativePath>
+        <relativePath>project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
-    <artifactId>jclouds-labs-project</artifactId>
+    <artifactId>jclouds-labs</artifactId>
     <packaging>pom</packaging>
-    <name>jclouds labs project</name>
+    <name>jclouds labs</name>
     <modules>
+       <module>project</module>
        <module>virtualbox</module>
        <module>vcloud-director</module>
        <module>elb</module>
diff --git a/labs/project/pom.xml b/labs/project/pom.xml
new file mode 100644
index 0000000000..063cdbcac5
--- /dev/null
+++ b/labs/project/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to jclouds, Inc. (jclouds) under one or more
+    contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  jclouds licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<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>
+        <artifactId>jclouds-project</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <relativePath>../../project/pom.xml</relativePath>
+    </parent>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>jclouds Labs Project</name>
+    
+    <properties>
+        <jclouds.version>1.7.0-SNAPSHOT</jclouds.version>
+    </properties>
+</project>
diff --git a/labs/rds/pom.xml b/labs/rds/pom.xml
index 9a9eb23682..55dcfe619e 100644
--- a/labs/rds/pom.xml
+++ b/labs/rds/pom.xml
@@ -22,12 +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>
-        <artifactId>jclouds-project</artifactId>
+        <groupId>org.jclouds.labs</groupId>
+        <artifactId>jclouds-labs-project</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
+        <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
     <artifactId>rds</artifactId>
     <name>jcloud rds api</name>
     <description>jclouds components to access an implementation of Relational Database Service</description>
@@ -41,26 +40,30 @@
         <test.rds.credential>${test.aws.credential}</test.rds.credential>
 
       <jclouds.osgi.export>org.jclouds.rds*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+      <jclouds.osgi.import>
+        org.jclouds.labs*;version="${project.version}",
+        org.jclouds*;version="${jclouds.version}",
+        *
+      </jclouds.osgi.import>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.jclouds.api</groupId>
             <artifactId>sts</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jclouds</groupId>
             <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-slf4j</artifactId>
-            <version>${project.version}</version>
+            <version>${jclouds.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/labs/vcloud-director/pom.xml b/labs/vcloud-director/pom.xml
index dfe705f240..d29b74d1d3 100644
--- a/labs/vcloud-director/pom.xml
+++ b/labs/vcloud-director/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>vcloud-director</artifactId>
   <name>jclouds vcloud-director api</name>
   <description>jclouds components to access an implementation of VMware vCloud Director 1.5+</description>
@@ -55,9 +54,10 @@
 
     <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds.compute.internal;version="${project.version}",
-      org.jclouds.rest.internal;version="${project.version}",
-      org.jclouds*;version="${project.version}",
+      org.jclouds.compute.internal;version="${jclouds.version}",
+      org.jclouds.rest.internal;version="${jclouds.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       *
     </jclouds.osgi.import>
   </properties>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds.labs</groupId>
@@ -81,27 +81,27 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/labs/virtualbox/pom.xml b/labs/virtualbox/pom.xml
index b4351a8f9a..148beefa41 100644
--- a/labs/virtualbox/pom.xml
+++ b/labs/virtualbox/pom.xml
@@ -22,12 +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>
-    <artifactId>jclouds-project</artifactId>
+    <groupId>org.jclouds.labs</groupId>
+    <artifactId>jclouds-labs-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <relativePath>../../project/pom.xml</relativePath>
+    <relativePath>../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
   <artifactId>virtualbox</artifactId>
   <name>jcloud virtualbox api</name>
   <description>jclouds components to access an implementation of virtualbox</description>
@@ -43,7 +42,8 @@
     <test.virtualbox.template>osFamily=UBUNTU,osVersionMatches=12.04.1,os64Bit=true,osArchMatches=amd64,loginUser=toor:password,authenticateSudo=true</test.virtualbox.template>
     <jclouds.osgi.export>org.jclouds.virtualbox*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
-      org.jclouds*;version="${project.version}",
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
       org.eclipse.jetty*;version="[7.5,9)",
       javax.servlet*;version="[2.5,3)",
       *
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.virtualbox</groupId>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>byon</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -79,12 +79,12 @@
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -94,14 +94,14 @@
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-      <version>${project.version}</version>
+      <version>${jclouds.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>