Merge pull request Azure#1459 from jianghaolu/guavafix

[Azure#1322] Upgrade guava to 20.0
jianghaolu · Feb 15, 2017 · b94cfa1 · b94cfa1
2 parents e1ce1a3 + 641265d
commit b94cfa1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/azure-keyvault-core/pom.xml b/azure-keyvault-core/pom.xml
@@ -98,7 +98,7 @@
   	<dependency>
   		<groupId>com.google.guava</groupId>
   		<artifactId>guava</artifactId>
-  		<version>18.0</version>
+  		<version>20.0</version>
   	</dependency>
   </dependencies>
 </project>
diff --git a/azure-keyvault-extensions/pom.xml b/azure-keyvault-extensions/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
     	<groupId>com.google.guava</groupId>
     	<artifactId>guava</artifactId>
-    	<version>18.0</version>
+    	<version>20.0</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/azure-keyvault-webkey/pom.xml b/azure-keyvault-webkey/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>18.0</version>
+        <version>20.0</version>
     </dependency>
 
     <!-- Test dependencies -->

diff --git a/pom.xml b/pom.xml
@@ -82,12 +82,17 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.6.3</version>
+        <version>2.7.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.6.3</version>
+        <version>2.7.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>2.7.0</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
@@ -109,6 +114,11 @@
         <artifactId>azure-client-authentication</artifactId>
         <version>1.0.0-beta6-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>20.0</version>
+      </dependency>
       <!-- Test dependencies -->
       <dependency>
         <groupId>junit</groupId>
@@ -119,7 +129,7 @@
       <dependency>
         <groupId>com.github.tomakehurst</groupId>
         <artifactId>wiremock</artifactId>
-        <version>2.5.0</version>
+        <version>2.5.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>