From 071a4047a22778c365dcf6db8650880b524d0bf5 Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Mon, 24 Jul 2017 21:07:21 -0700
Subject: [PATCH] auth library workaround

---
 monitoring/cloud-client/pom.xml | 26 +++++++++++++++++++-------
 vision/cloud-client/pom.xml     |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml
index 56bfad1fe0a..846e99ff954 100644
--- a/monitoring/cloud-client/pom.xml
+++ b/monitoring/cloud-client/pom.xml
@@ -33,24 +33,36 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
+  <!-- Workaround for issue : https://github.com/GoogleCloudPlatform/google-cloud-java/issues/2192 -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.auth</groupId>
+        <artifactId>google-auth-library-credentials</artifactId>
+        <version>0.7.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auth</groupId>
+        <artifactId>google-auth-library-oauth2-http</artifactId>
+        <version>0.7.1</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <!-- End of workaround -->
+
   <dependencies>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
       <version>0.20.3-alpha</version>
     </dependency>
-
-    <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>20.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.auth</groupId>
-      <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>0.7.1</version>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/vision/cloud-client/pom.xml b/vision/cloud-client/pom.xml
index 41432b3f4bc..671d024e5b4 100644
--- a/vision/cloud-client/pom.xml
+++ b/vision/cloud-client/pom.xml
@@ -42,7 +42,6 @@
     </dependency>
     <!-- [END dependencies] -->
 
-    <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
@@ -53,6 +52,7 @@
       <artifactId>guava</artifactId>
       <version>20.0</version>
     </dependency>
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>