Merge pull request #36 from adrian-rosello/develop

Upgrade guava version from 16.0.1 to 17.0
dana-i2cat · Feb 3, 2015 · b0afb52 · b0afb52
2 parents 65286d5 + 91b5156
commit b0afb52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<guava.version>17.0</guava.version>
 	</properties>
 
 	<dependencies>
@@ -65,7 +67,7 @@
 		<dependency>
 		  <groupId>com.google.guava</groupId>
 		  <artifactId>guava</artifactId>
-		  <version>16.0.1</version>
+		  <version>${guava.version}</version>
 		</dependency>
 	</dependencies>
 

diff --git a/src/main/resources/features.xml b/src/main/resources/features.xml
@@ -3,7 +3,7 @@
 	<feature name="netconf4j" version="${project.version}">
 		<feature version="1.6">netconf4j-commons-config</feature>
 		<bundle dependency="true">mvn:commons-io/commons-io/1.4</bundle>
-		<bundle dependency="true">mvn:com.google.guava/guava/16.0.1</bundle>
+		<bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
 
 		<bundle>mvn:net.i2cat.netconf/netconf4j/${project.version}</bundle>
 	</feature>