From ef7b85130e66e0b80c4c4882d4348e1b0b0a9d4a Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Fri, 22 Jan 2016 10:45:59 +0100
Subject: [PATCH] JCLOUDS-1056: Configure OSGi packaging

---
 apis/oauth/pom.xml                      | 3 +++
 common/googlecloud/pom.xml              | 6 ++++++
 providers/digitalocean2/pom.xml         | 2 ++
 providers/google-compute-engine/pom.xml | 8 ++++++++
 4 files changed, 19 insertions(+)

diff --git a/apis/oauth/pom.xml b/apis/oauth/pom.xml
index 0ff4790ca2..7370501105 100644
--- a/apis/oauth/pom.xml
+++ b/apis/oauth/pom.xml
@@ -30,6 +30,7 @@
   <artifactId>oauth</artifactId>
   <name>jclouds OAuth core</name>
   <description>jclouds components to access OAuth</description>
+  <packaging>bundle</packaging>
 
   <properties>
     <test.oauth.identity>FIX_ME</test.oauth.identity>
@@ -39,6 +40,8 @@
     <test.jclouds.oauth.scope>FIX_ME</test.jclouds.oauth.scope>
     <test.oauth.api-version>2</test.oauth.api-version>
     <test.oauth.build-version />
+    <jclouds.osgi.export>org.jclouds.oauth*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
 
   <dependencies>
diff --git a/common/googlecloud/pom.xml b/common/googlecloud/pom.xml
index 2d67e7350a..be66168569 100644
--- a/common/googlecloud/pom.xml
+++ b/common/googlecloud/pom.xml
@@ -31,6 +31,12 @@
     <artifactId>googlecloud</artifactId>
     <name>jclouds Google Cloud Core</name>
     <description>jclouds components common to Google Cloud products</description>
+    <packaging>bundle</packaging>
+    
+    <properties>
+      <jclouds.osgi.export>org.jclouds.googlecloud*;version="${project.version}";-noimport:=true</jclouds.osgi.export>
+      <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
+    </properties>
 
     <dependencies>
         <dependency>
diff --git a/providers/digitalocean2/pom.xml b/providers/digitalocean2/pom.xml
index c1dd83d1ac..f7171d974a 100644
--- a/providers/digitalocean2/pom.xml
+++ b/providers/digitalocean2/pom.xml
@@ -31,6 +31,7 @@
   <artifactId>digitalocean2</artifactId>
   <name>jclouds DigitalOcean v2 API Provider</name>
   <description>jclouds provider for Digital Ocean v2 Compute API</description>
+  <packaging>bundle</packaging>
 
   <properties>
     <test.digitalocean2.endpoint>https://api.digitalocean.com/v2/</test.digitalocean2.endpoint>
@@ -40,6 +41,7 @@
     <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.compute.internal;version="${project.version}",
       org.jclouds.rest.internal;version="${project.version}",
       org.jclouds*;version="${project.version}",
       *
diff --git a/providers/google-compute-engine/pom.xml b/providers/google-compute-engine/pom.xml
index 2e26052497..e59c7484a0 100644
--- a/providers/google-compute-engine/pom.xml
+++ b/providers/google-compute-engine/pom.xml
@@ -31,6 +31,7 @@
     <artifactId>google-compute-engine</artifactId>
     <name>jclouds Google Compute Engine provider</name>
     <description>jclouds components to access GoogleCompute</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.google-compute-engine.identity>client_email which usually looks like project_id@developer.gserviceaccount.com</test.google-compute-engine.identity>
@@ -41,6 +42,13 @@
         <test.google-compute-engine.api-version>v1</test.google-compute-engine.api-version>
         <test.google-compute-engine.build-version/>
         <test.google-compute-engine.template>imageNameMatches=debian-7-wheezy-v[0-9]*,locationId=us-central1-a,minRam=2048</test.google-compute-engine.template>
+        <jclouds.osgi.export>org.jclouds.googlecomputeengine*;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}",
+            *
+        </jclouds.osgi.import>
     </properties>
 
     <dependencies>