Repository: jclouds Updated Branches: refs/heads/1.9.x 47251f0ea -> fc5f5e509
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: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/fc5f5e50 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/fc5f5e50 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/fc5f5e50 Branch: refs/heads/1.9.x Commit: fc5f5e509efea1341a3fb607c8e180708092d4b1 Parents: 47251f0 Author: Ciprian Ciubotariu <[email protected]> Authored: Tue Mar 8 23:12:49 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed Mar 16 12:27:37 2016 +0100 ---------------------------------------------------------------------- project/pom.xml | 3 ++- scriptbuilder/pom.xml | 21 --------------------- 2 files changed, 2 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/fc5f5e50/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 3912ee4..f69dfbc 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -206,6 +206,7 @@ <maven.site.url.base>gitsite:[email protected]/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> @@ -772,7 +773,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> http://git-wip-us.apache.org/repos/asf/jclouds/blob/fc5f5e50/scriptbuilder/pom.xml ---------------------------------------------------------------------- diff --git a/scriptbuilder/pom.xml b/scriptbuilder/pom.xml index f7a2e4c..92e8f4a 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>
