Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ciprian Ciubotariu 2016-03-08 23:12:49 +02:00 committed by Ignasi Barrera
parent 47251f0ea7
commit fc5f5e509e
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project/pom.xml
View File

@ -206,6 +206,7 @@
<maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base> <maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
<clojure.version>1.3.0</clojure.version> <clojure.version>1.3.0</clojure.version>
<guava.version>16.0.1</guava.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> <guice.version>3.0</guice.version>
<okhttp.version>2.2.0</okhttp.version> <okhttp.version>2.2.0</okhttp.version>
<surefire.version>2.17</surefire.version> <surefire.version>2.17</surefire.version>
@ -772,7 +773,7 @@
<Bundle-Activator>${jclouds.osgi.activator}</Bundle-Activator> <Bundle-Activator>${jclouds.osgi.activator}</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${jclouds.osgi.export}</Export-Package> <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> <DynamicImport-Package>${jclouds.osgi.dynamic}</DynamicImport-Package>
<Fragment-Host>${jclouds.osgi.fragment}</Fragment-Host> <Fragment-Host>${jclouds.osgi.fragment}</Fragment-Host>
</instructions> </instructions>

21
scriptbuilder/pom.xml
View File

@ -64,25 +64,4 @@
</dependency> </dependency>
</dependencies> </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> </project>