From 4bc179cfe8c6c6926bfb6e58b0d1f4a13443a3cb Mon Sep 17 00:00:00 2001
From: Solomon Duskis <sduskis@google.com>
Date: Thu, 17 Jan 2019 11:58:30 -0800
Subject: [PATCH 1/3] Removing some unused dependencies Also, reducing scope of
 auto-value to provided.

---
 google-cloud-clients/google-cloud-asset/pom.xml   |  4 ----
 .../google-cloud-bigquery/pom.xml                 |  2 +-
 .../google-cloud-bigquerydatatransfer/pom.xml     | 10 ----------
 .../google-cloud-core-http/pom.xml                | 15 ---------------
 .../google-cloud-dataproc/pom.xml                 |  5 -----
 google-cloud-clients/google-cloud-dns/pom.xml     |  4 ----
 .../google-cloud-firestore/pom.xml                |  5 -----
 google-cloud-clients/google-cloud-pubsub/pom.xml  |  2 +-
 google-cloud-clients/google-cloud-redis/pom.xml   |  5 -----
 .../google-cloud-scheduler/pom.xml                |  5 -----
 10 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/google-cloud-clients/google-cloud-asset/pom.xml b/google-cloud-clients/google-cloud-asset/pom.xml
index 0618dc405a2e..671b0a98e0c9 100644
--- a/google-cloud-clients/google-cloud-asset/pom.xml
+++ b/google-cloud-clients/google-cloud-asset/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-asset</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index 9ea24b93a95b..6ee94cfd5e71 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index 4f813101c0f2..7a497d43d87f 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -54,11 +54,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
@@ -69,11 +64,6 @@
       <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-iam-v1</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
diff --git a/google-cloud-clients/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
index 8d4e42653b82..a007a1eac7da 100644
--- a/google-cloud-clients/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -35,11 +35,6 @@
       <artifactId>google-http-client</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.oauth-client</groupId>
-      <artifactId>google-oauth-client</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -54,11 +49,6 @@
       <artifactId>google-http-client-appengine</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-jackson2</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-httpjson</artifactId>
@@ -85,11 +75,6 @@
       <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.opencensus</groupId>
       <artifactId>opencensus-api</artifactId>
diff --git a/google-cloud-clients/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
index 6394ba60de6c..6d80dc287f53 100644
--- a/google-cloud-clients/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -76,11 +76,6 @@
       <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-iam-v1</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
index 81822d5d188e..fb9be3a3949d 100644
--- a/google-cloud-clients/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -33,10 +33,6 @@
       <artifactId>google-api-services-dns</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index 49ff441347a1..060d6ab28b49 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -41,11 +41,6 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-firestore-v1beta1</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-firestore-v1beta1</artifactId>
diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
index dc2b4ef513b9..881320eb4d23 100644
--- a/google-cloud-clients/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/google-cloud-clients/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
index cf3182920b3d..f9c04ea1911d 100644
--- a/google-cloud-clients/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -54,11 +54,6 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <scope>compile</scope>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/google-cloud-clients/google-cloud-scheduler/pom.xml b/google-cloud-clients/google-cloud-scheduler/pom.xml
index f806e76b992a..81ea26b3bda0 100644
--- a/google-cloud-clients/google-cloud-scheduler/pom.xml
+++ b/google-cloud-clients/google-cloud-scheduler/pom.xml
@@ -46,11 +46,6 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <scope>compile</scope>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>

From f96eee758d07bf8d661193dfe18fb8a930293f54 Mon Sep 17 00:00:00 2001
From: Solomon Duskis <sduskis@google.com>
Date: Thu, 17 Jan 2019 12:39:01 -0800
Subject: [PATCH 2/3] Restoring Firestore auto-value

---
 google-cloud-clients/google-cloud-firestore/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index 060d6ab28b49..562207191c3f 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -41,6 +41,11 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-firestore-v1beta1</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-firestore-v1beta1</artifactId>

From a89eadc759e74dacf2b744314a619d4133d283bf Mon Sep 17 00:00:00 2001
From: Solomon Duskis <sduskis@google.com>
Date: Thu, 17 Jan 2019 12:57:32 -0800
Subject: [PATCH 3/3] Removing more instances of easymock.

---
 google-cloud-clients/google-cloud-spanner/pom.xml            | 4 ----
 google-cloud-clients/google-cloud-speech/pom.xml             | 5 -----
 google-cloud-clients/google-cloud-tasks/pom.xml              | 5 -----
 google-cloud-clients/google-cloud-trace/pom.xml              | 5 -----
 google-cloud-clients/google-cloud-video-intelligence/pom.xml | 5 -----
 google-cloud-clients/google-cloud-vision/pom.xml             | 5 -----
 6 files changed, 29 deletions(-)

diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 7a39e4410b87..79f83f685b6a 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -129,10 +129,6 @@
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/google-cloud-clients/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
index f3aea2de33b9..6dcf8ddc5e38 100644
--- a/google-cloud-clients/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -57,11 +57,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
diff --git a/google-cloud-clients/google-cloud-tasks/pom.xml b/google-cloud-clients/google-cloud-tasks/pom.xml
index bce350509544..6499de2460e0 100644
--- a/google-cloud-clients/google-cloud-tasks/pom.xml
+++ b/google-cloud-clients/google-cloud-tasks/pom.xml
@@ -53,11 +53,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
diff --git a/google-cloud-clients/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
index f9bc265777b9..180dd912e0dc 100644
--- a/google-cloud-clients/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -53,11 +53,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
diff --git a/google-cloud-clients/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
index b63a318c2c89..9baa9bd7a645 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -66,11 +66,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
diff --git a/google-cloud-clients/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
index 3ce413051e2c..7d9902e9d187 100644
--- a/google-cloud-clients/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -61,11 +61,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>