Merge branch 'master' of github.com:actions-on-google/smart-home-dashboard

Fleker · Fleker · commit 9ee7855a7b46 · 2018-07-25T16:09:15.000-07:00
Change-Id: I43304b7423731f73cb2b15332c9129c6b23e9c4d
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,13 @@
 		<dependency>
 			<groupId>com.google.api-client</groupId>
 			<artifactId>google-api-client</artifactId>
-			<version>1.23.0</version>
+                        <version>1.23.0</version>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>com.google.guava</groupId>
+                                <artifactId>guava-jdk5</artifactId>
+                            </exclusion>
+                        </exclusions>
 		</dependency>
 
 
