From 44409b9fa1a6f9bb03685eb3bb880b59ad7f92fe Mon Sep 17 00:00:00 2001
From: Reynald Borer <reynald.borer@paper.li>
Date: Mon, 27 Feb 2017 10:55:54 +0100
Subject: [PATCH] Ensure dependency convergence

This is done using dependencyManagement at the root pom
---
 google-cloud-bigquery/pom.xml                 |   1 -
 google-cloud-compute/pom.xml                  |   1 -
 .../google-cloud-nio-examples/pom.xml         |   4 +-
 google-cloud-contrib/google-cloud-nio/pom.xml |   5 -
 google-cloud-core/pom.xml                     |  12 --
 google-cloud-datastore/pom.xml                |   1 -
 google-cloud-dns/pom.xml                      |   1 -
 google-cloud-errorreporting/pom.xml           |   1 -
 google-cloud-examples/pom.xml                 |   5 +-
 google-cloud-language/pom.xml                 |   1 -
 google-cloud-logging/pom.xml                  |   1 -
 google-cloud-monitoring/pom.xml               |   1 -
 google-cloud-pubsub/pom.xml                   |   1 -
 google-cloud-resourcemanager/pom.xml          |   1 -
 google-cloud-spanner/pom.xml                  |  12 +-
 google-cloud-speech/pom.xml                   |   1 -
 google-cloud-storage/pom.xml                  |   1 -
 google-cloud-trace/pom.xml                    |   1 -
 google-cloud-translate/pom.xml                |   1 -
 google-cloud-vision/pom.xml                   |   1 -
 pom.xml                                       | 112 +++++++++++++++++-
 21 files changed, 116 insertions(+), 49 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index 6384d55f3e33..96740bd2eb35 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -51,7 +51,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml
index 0f29a06629d6..9b643c859e19 100644
--- a/google-cloud-compute/pom.xml
+++ b/google-cloud-compute/pom.xml
@@ -44,7 +44,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-contrib/google-cloud-nio-examples/pom.xml
index e7e3e754ab2f..b9a98afab951 100644
--- a/google-cloud-contrib/google-cloud-nio-examples/pom.xml
+++ b/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -23,11 +23,11 @@
       <version>${storage.version}</version>
     </dependency>
 
-    <dependency>
+    <!--<dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-assembly-plugin</artifactId>
       <version>2.5.4</version>
-    </dependency>
+    </dependency>-->
   </dependencies>
   <build>
     <plugins>
diff --git a/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-contrib/google-cloud-nio/pom.xml
index 6cca06dd2361..d312f23f3440 100644
--- a/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -25,12 +25,10 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>19.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
@@ -46,19 +44,16 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>1.1</version>
       <scope>provided</scope> <!-- to leave out of the all-deps jar -->
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>19.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index 672b1565a5d1..383717ffb2d0 100644
--- a/google-cloud-core/pom.xml
+++ b/google-cloud-core/pom.xml
@@ -20,12 +20,10 @@
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-credentials</artifactId>
-      <version>${google.auth.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>${google.auth.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.guava</groupId>
@@ -36,24 +34,20 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
-      <version>1.21.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
-      <version>1.21.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>19.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client-appengine</artifactId>
-      <version>1.21.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -65,7 +59,6 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson</artifactId>
-      <version>1.21.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -77,13 +70,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -101,7 +92,6 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
@@ -111,7 +101,6 @@
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
-      <version>${gax.version}</version>
       <exclusions>
         <exclusion>
           <groupId>io.grpc</groupId>
@@ -122,7 +111,6 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-common-protos</artifactId>
-      <version>0.1.5</version>
       <exclusions>
         <exclusion>
           <groupId>io.grpc</groupId>
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 9b2b26b76eba..a4f25d099d66 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -49,7 +49,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-dns/pom.xml b/google-cloud-dns/pom.xml
index 809df009cfee..840cbfb0eb2e 100644
--- a/google-cloud-dns/pom.xml
+++ b/google-cloud-dns/pom.xml
@@ -55,7 +55,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml
index f349b054237a..14002550f9e5 100644
--- a/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-errorreporting/pom.xml
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index b15a86959935..4c32afd437ff 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -27,15 +27,14 @@
       <artifactId>google-cloud-nio</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-assembly-plugin</artifactId>
       <version>2.5.4</version>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml
index 5a3bc3eb1b20..0d67ebd6e0e2 100644
--- a/google-cloud-language/pom.xml
+++ b/google-cloud-language/pom.xml
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml
index b80b067c7260..93649f69e250 100644
--- a/google-cloud-logging/pom.xml
+++ b/google-cloud-logging/pom.xml
@@ -64,7 +64,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml
index 4a97c3e27617..addf974fc0bc 100644
--- a/google-cloud-monitoring/pom.xml
+++ b/google-cloud-monitoring/pom.xml
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml
index a7f47bfcd007..f39593953003 100644
--- a/google-cloud-pubsub/pom.xml
+++ b/google-cloud-pubsub/pom.xml
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml
index 7e3468c4cb9e..7f7ce6f2ee55 100644
--- a/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-resourcemanager/pom.xml
@@ -44,7 +44,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 6d7a4e38d6be..4a81ee7f417a 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -129,7 +129,6 @@
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
-      <version>0.0.25</version>
       <exclusions>
         <exclusion>
           <groupId>io.grpc</groupId>
@@ -140,37 +139,30 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
-      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
-<artifactId>guava</artifactId>
-      <version>19.0</version>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-credentials</artifactId>
-      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>
-      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
-      <version>1.20.0</version>
       <exclusions>
         <exclusion>
           <!-- Conflicts with com.google.guava:guava -->
@@ -182,7 +174,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
@@ -199,7 +190,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
-      <version>19.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml
index 8332384639e7..c45fe1d1c776 100644
--- a/google-cloud-speech/pom.xml
+++ b/google-cloud-speech/pom.xml
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml
index 17ead5706cce..9a58ed31fa67 100644
--- a/google-cloud-storage/pom.xml
+++ b/google-cloud-storage/pom.xml
@@ -49,7 +49,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml
index 666f743573b3..cea7903156eb 100644
--- a/google-cloud-trace/pom.xml
+++ b/google-cloud-trace/pom.xml
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-translate/pom.xml b/google-cloud-translate/pom.xml
index 2724291e7f68..de4c0746df3d 100644
--- a/google-cloud-translate/pom.xml
+++ b/google-cloud-translate/pom.xml
@@ -48,7 +48,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml
index 52ba0d1f89dd..1157a33d5131 100644
--- a/google-cloud-vision/pom.xml
+++ b/google-cloud-vision/pom.xml
@@ -63,7 +63,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index ee1e97b05549..b5d25c310198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,117 @@
     <core.version>0.9.4-alpha-SNAPSHOT</core.version>
     <beta.version>0.9.4-beta-SNAPSHOT</beta.version>
     <storage.version>${beta.version}</storage.version>
+    <version.http-client>1.22.0</version.http-client>
+    <version.api-client>1.21.0</version.api-client>
+    <version.guava>19.0</version.guava>
+    <version.protobuf>3.0.2</version.protobuf>
     <site.installationModule>google-cloud</site.installationModule>
   </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>2.9.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${version.protobuf}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java-util</artifactId>
+        <version>${version.protobuf}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${version.guava}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-testlib</artifactId>
+        <version>${version.guava}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>grpc-google-common-protos</artifactId>
+        <version>0.1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auto.value</groupId>
+        <artifactId>auto-value</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client</artifactId>
+        <version>${version.http-client}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-jackson2</artifactId>
+        <version>${version.http-client}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-jackson</artifactId>
+        <version>${version.http-client}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.oauth-client</groupId>
+        <artifactId>google-oauth-client</artifactId>
+        <version>1.21.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-appengine</artifactId>
+        <version>${version.api-client}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client</artifactId>
+        <version>${version.api-client}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auth</groupId>
+        <artifactId>google-auth-library-credentials</artifactId>
+        <version>${google.auth.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.auth</groupId>
+        <artifactId>google-auth-library-oauth2-http</artifactId>
+        <version>${google.auth.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.api</groupId>
+        <artifactId>gax</artifactId>
+        <version>${gax.version}</version>
+      </dependency>
+      <!-- test deps -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>1.3</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotations</artifactId>
+        <version>2.0.8</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <modules>
     <module>google-cloud</module>
     <module>google-cloud-bigquery</module>
@@ -166,7 +275,7 @@
         <version>1.4.1</version>
         <executions>
           <execution>
-            <id>enforce-maven</id>
+            <id>enforce</id>
             <goals>
               <goal>enforce</goal>
             </goals>
@@ -178,6 +287,7 @@
                 <requireJavaVersion>
                   <version>[1.7,)</version>
                 </requireJavaVersion>
+                <dependencyConvergence/>
               </rules>
             </configuration>
           </execution>