Bumping dependency to Guava 22.0
- Tweak OSGi Manifest for Guava to accept later versions
Change-Id: I992e7307293832d8371d2f24c4ebc9a45a57fd1f
diff --git a/pom.xml b/pom.xml
index 91475ee..fd3d8eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos-build-conf.version>1.3</onos-build-conf.version>
+ <guava.version>22.0</guava.version>
</properties>
<modules>
@@ -57,7 +58,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -96,6 +97,16 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>3.2.0</version>
<extensions>true</extensions>
+ <configuration>
+ <niceManifest>true</niceManifest>
+ <instructions>
+ <!-- Accept any version of Guava, released later than the one we use -->
+ <Import-Package>
+ com.google.*;version=${guava.version},
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>