Amend poms after promoting DigitalOcean v2

allcompute/pom.xml

@@ -123,5 +123,10 @@
       <artifactId>google-compute-engine</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.jclouds.provider</groupId>
+      <artifactId>digitalocean2</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>

project/pom.xml

@@ -490,6 +490,7 @@
             <!-- SSH keys -->
             <exclude>**/test</exclude>
             <exclude>**/test.pub</exclude>
+            <exclude>**/src/test/resources/**/ssh-*.pub</exclude>
 
             <!-- temporary files or those generated by IDE or SCM -->
             <exclude>**/target/**</exclude>

providers/digitalocean2/pom.xml

@@ -21,12 +21,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-        <groupId>org.apache.jclouds.labs</groupId>
-        <artifactId>jclouds-labs</artifactId>
+    <groupId>org.apache.jclouds</groupId>
+    <artifactId>jclouds-project</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../project/pom.xml</relativePath>
   </parent>
 
-    <groupId>org.apache.jclouds.labs</groupId>
+  <groupId>org.apache.jclouds.provider</groupId>
   <artifactId>digitalocean2</artifactId>
   <name>jclouds DigitalOcean v2 API Provider</name>
   <description>jclouds provider for Digital Ocean v2 Compute API</description>
@@ -37,56 +38,62 @@
     <test.digitalocean2.identity>FIXME</test.digitalocean2.identity>
     <test.digitalocean2.credential>FIXME</test.digitalocean2.credential>
     <test.digitalocean2.template>osFamily=UBUNTU,os64Bit=true</test.digitalocean2.template>
+    <jclouds.osgi.export>org.jclouds.digitalocean2*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.import>
+      org.jclouds.rest.internal;version="${project.version}",
+      org.jclouds*;version="${project.version}",
+      *
+    </jclouds.osgi.import>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>
       <artifactId>oauth</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>
       <artifactId>oauth</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds</groupId>
       <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-sshj</artifactId>
-            <version>${jclouds.version}</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

providers/pom.xml

@@ -36,6 +36,7 @@
     <module>aws-ec2</module>
     <module>aws-sqs</module>
     <module>aws-cloudwatch</module>
+    <module>digitalocean2</module>
     <module>elastichosts-lon-p</module>
     <module>elastichosts-sat-p</module>
     <module>elastichosts-lon-b</module>