From 9a20cadaf948d5a844ecb2b308edd5d1b669cca9 Mon Sep 17 00:00:00 2001
From: Ciprian Ciubotariu <cheepeero@gmx.net>
Date: Tue, 8 Mar 2016 23:12:49 +0200
Subject: [PATCH] Improve version range specification for guava

The defaults of maven-bundle-plugin set the required version range to
only match guava-16, but the actual usage of guava within jclouds allows
any version after guava-16.

This helps dependent projects mix jclouds with bundles using other guava
versions within OSGi environments.
---
 project/pom.xml       |  3 ++-
 scriptbuilder/pom.xml | 21 ---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/project/pom.xml b/project/pom.xml
index d5bc5ba309..b344be851d 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -223,6 +223,7 @@
     <maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
     <clojure.version>1.3.0</clojure.version>
     <guava.version>16.0.1</guava.version>
+    <guava.osgi.import>com.google.common.*;version="[16.0.1,20.0.0)"</guava.osgi.import>
     <guice.version>3.0</guice.version>
     <okhttp.version>2.2.0</okhttp.version>
     <surefire.version>2.17</surefire.version>
@@ -819,7 +820,7 @@
             <Bundle-Activator>${jclouds.osgi.activator}</Bundle-Activator>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Export-Package>${jclouds.osgi.export}</Export-Package>
-            <Import-Package>${jclouds.osgi.import}</Import-Package>
+            <Import-Package>${guava.osgi.import},${jclouds.osgi.import}</Import-Package>
             <DynamicImport-Package>${jclouds.osgi.dynamic}</DynamicImport-Package>
             <Fragment-Host>${jclouds.osgi.fragment}</Fragment-Host>
           </instructions>
diff --git a/scriptbuilder/pom.xml b/scriptbuilder/pom.xml
index 406c0fe738..df80961f9b 100644
--- a/scriptbuilder/pom.xml
+++ b/scriptbuilder/pom.xml
@@ -64,25 +64,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <!-- ensure activator is set -->
-        <configuration>
-          <obrRepository>NONE</obrRepository>
-          <instructions>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>${jclouds.osgi.export}</Export-Package>
-            <Import-Package>${jclouds.osgi.import}</Import-Package>
-            <DynamicImport-Package>${jclouds.osgi.dynamic}</DynamicImport-Package>
-            <Fragment-Host>${jclouds.osgi.fragment}</Fragment-Host>
-            <Bundle-Activator>${jclouds.osgi.activator}</Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>