From ffe1b559e715d3816a58d24c37f6437cf7822666 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Fri, 24 Feb 2017 16:17:03 +0100 Subject: [PATCH 01/13] Make sure dependencies converges Use the maven enforcer plugin dependencyConvergence ([1]) rule to make sure that all dependencies converge. When conflicts were detected, the higher version has been choosen. Note that this is a work in progress... [1]: http://maven.apache.org/enforcer/enforcer-rules/dependencyConvergence.html --- google-cloud-core/pom.xml | 84 ++++++++++++++++++++++++++++++++++++++- pom.xml | 3 +- 2 files changed, 84 insertions(+), 3 deletions(-) diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index 672b1565a5d1..1604501be5ec 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -31,6 +31,16 @@ com.google.guava guava-jdk5 + + com.google.http-client + google-http-client-jackson2 + + + + com.google.http-client + google-http-client + + @@ -38,12 +48,25 @@ google-http-client 1.21.0 compile + + + com.google.code.findbugs + jsr305 + + + com.google.oauth-client google-oauth-client 1.21.0 compile + + + com.google.code.findbugs + jsr305 + + com.google.guava @@ -101,12 +124,19 @@ com.google.protobuf protobuf-java - 3.0.0 + 3.0.2 io.grpc grpc-protobuf ${grpc.version} + + + com.google.guava + guava + + + com.google.api @@ -117,17 +147,57 @@ io.grpc grpc-all + + com.google.guava + guava + + + + joda-time + joda-time + + + + com.google.auth + google-auth-library-credentials + + + + com.google.auth + google-auth-library-oauth2-http + + com.google.api.grpc grpc-google-common-protos - 0.1.5 + 0.1.6 io.grpc grpc-all + + com.google.auto.value + auto-value + + + + com.google.protobuf + protobuf-java + + + + com.google.guava + guava + + + + joda-time + joda-time + + @@ -139,6 +209,16 @@ io.grpc grpc-all + + com.google.protobuf + protobuf-java + + + + com.google.api.grpc + grpc-google-common-protos + + diff --git a/pom.xml b/pom.xml index ee1e97b05549..e8dcf8723b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 1.4.1 - enforce-maven + enforce enforce @@ -178,6 +178,7 @@ [1.7,) + From c5ee626b384eddd4a92a5a306a782106cf86c8d7 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Fri, 24 Feb 2017 16:29:07 +0100 Subject: [PATCH 02/13] Fix convergence for google-cloud-bigquery by bumping oauth, http & api-client-appengine clients to 1.22.0 --- google-cloud-core/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index 1604501be5ec..b5e5f8c1c2ec 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -46,7 +46,7 @@ com.google.http-client google-http-client - 1.21.0 + 1.22.0 compile @@ -59,7 +59,7 @@ com.google.oauth-client google-oauth-client - 1.21.0 + 1.22.0 compile @@ -76,7 +76,7 @@ com.google.api-client google-api-client-appengine - 1.21.0 + 1.22.0 compile @@ -88,7 +88,7 @@ com.google.http-client google-http-client-jackson - 1.21.0 + 1.22.0 compile From a072af81096983a4b88a638bf9c2048b2de2d266 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Fri, 24 Feb 2017 16:32:22 +0100 Subject: [PATCH 03/13] Fix google-cloud-compute by bumping google-api-services-compute to v1-rev135-1.22.0 --- google-cloud-compute/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml index 0f29a06629d6..3e44c7d198e0 100644 --- a/google-cloud-compute/pom.xml +++ b/google-cloud-compute/pom.xml @@ -25,7 +25,7 @@ com.google.apis google-api-services-compute - v1-rev103-1.21.0 + v1-rev135-1.22.0 compile From 0e776644fe40025243aa45940c4bbc9e70d7d71e Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Fri, 24 Feb 2017 16:41:06 +0100 Subject: [PATCH 04/13] Make google-cloud-datastore converge --- google-cloud-datastore/pom.xml | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 9b2b26b76eba..3db72890d079 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -27,6 +27,18 @@ com.google.cloud.datastore datastore-v1-protos 1.3.0 + + + com.google.protobuf + protobuf-java + + + + com.google.api.grpc + grpc-google-common-protos + + + com.google.cloud.datastore @@ -37,6 +49,36 @@ guava-jdk5 com.google.guava + + com.google.protobuf + protobuf-java + + + + com.google.guava + guava + + + + com.google.oauth-client + google-oauth-client + + + + com.google.http-client + google-http-client-jackson + + + + com.google.http-client + google-http-client + + + + com.google.api-client + google-api-client + + From 071889f751e3610e3ce407021a1056db73bc3eda Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Fri, 24 Feb 2017 16:48:33 +0100 Subject: [PATCH 05/13] Make google-cloud-errorreporting converge --- google-cloud-errorreporting/pom.xml | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index f349b054237a..8f0febbd9aab 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -36,6 +36,31 @@ io.grpc grpc-all + + com.google.auto.value + auto-value + + + + com.google.protobuf + protobuf-java + + + + com.google.guava + guava + + + + com.google.api.grpc + grpc-google-common-protos + + + + joda-time + joda-time + + @@ -52,6 +77,13 @@ io.grpc grpc-auth ${grpc.version} + + + com.google.auth + google-auth-library-credentials + + + ${project.groupId} From fe9a4c6d78ecdde0679567fe9e2850c747e5d801 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Fri, 24 Feb 2017 16:57:49 +0100 Subject: [PATCH 06/13] Make google-cloud-language converge --- google-cloud-language/pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 5a3bc3eb1b20..217f6ce8e2a6 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -36,6 +36,31 @@ io.grpc grpc-all + + com.google.auto.value + auto-value + + + + com.google.protobuf + protobuf-java + + + + com.google.guava + guava + + + + com.google.api.grpc + grpc-google-common-protos + + + + joda-time + joda-time + + @@ -52,6 +77,13 @@ io.grpc grpc-auth ${grpc.version} + + + com.google.auth + google-auth-library-credentials + + + ${project.groupId} From 7c3940d5ea8c34cc938b5e7aed7bc9e932192547 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Mon, 27 Feb 2017 10:15:54 +0100 Subject: [PATCH 07/13] Revert "Make sure dependencies converges" This reverts commit ffe1b559e715d3816a58d24c37f6437cf7822666. --- google-cloud-core/pom.xml | 84 +-------------------------------------- pom.xml | 3 +- 2 files changed, 3 insertions(+), 84 deletions(-) diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index b5e5f8c1c2ec..1a3d348d0551 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -31,16 +31,6 @@ com.google.guava guava-jdk5 - - com.google.http-client - google-http-client-jackson2 - - - - com.google.http-client - google-http-client - - @@ -48,25 +38,12 @@ google-http-client 1.22.0 compile - - - com.google.code.findbugs - jsr305 - - - com.google.oauth-client google-oauth-client 1.22.0 compile - - - com.google.code.findbugs - jsr305 - - com.google.guava @@ -124,19 +101,12 @@ com.google.protobuf protobuf-java - 3.0.2 + 3.0.0 io.grpc grpc-protobuf ${grpc.version} - - - com.google.guava - guava - - - com.google.api @@ -147,57 +117,17 @@ io.grpc grpc-all - - com.google.guava - guava - - - - joda-time - joda-time - - - - com.google.auth - google-auth-library-credentials - - - - com.google.auth - google-auth-library-oauth2-http - - com.google.api.grpc grpc-google-common-protos - 0.1.6 + 0.1.5 io.grpc grpc-all - - com.google.auto.value - auto-value - - - - com.google.protobuf - protobuf-java - - - - com.google.guava - guava - - - - joda-time - joda-time - - @@ -209,16 +139,6 @@ io.grpc grpc-all - - com.google.protobuf - protobuf-java - - - - com.google.api.grpc - grpc-google-common-protos - - diff --git a/pom.xml b/pom.xml index e8dcf8723b5f..ee1e97b05549 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ 1.4.1 - enforce + enforce-maven enforce @@ -178,7 +178,6 @@ [1.7,) - From b2b86342cf17ccecdea8d557ad1a171518ac9f14 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Mon, 27 Feb 2017 10:15:54 +0100 Subject: [PATCH 08/13] Revert "Fix convergence for google-cloud-bigquery by bumping oauth, http & api-client-appengine clients to 1.22.0" This reverts commit c5ee626b384eddd4a92a5a306a782106cf86c8d7. --- google-cloud-core/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index 1a3d348d0551..672b1565a5d1 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -36,13 +36,13 @@ com.google.http-client google-http-client - 1.22.0 + 1.21.0 compile com.google.oauth-client google-oauth-client - 1.22.0 + 1.21.0 compile @@ -53,7 +53,7 @@ com.google.api-client google-api-client-appengine - 1.22.0 + 1.21.0 compile @@ -65,7 +65,7 @@ com.google.http-client google-http-client-jackson - 1.22.0 + 1.21.0 compile From 81b50a1c5ee08245e478f1c32dd82c3fe03386e9 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Mon, 27 Feb 2017 10:15:54 +0100 Subject: [PATCH 09/13] Revert "Fix google-cloud-compute by bumping google-api-services-compute to v1-rev135-1.22.0" This reverts commit a072af81096983a4b88a638bf9c2048b2de2d266. --- google-cloud-compute/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml index 3e44c7d198e0..0f29a06629d6 100644 --- a/google-cloud-compute/pom.xml +++ b/google-cloud-compute/pom.xml @@ -25,7 +25,7 @@ com.google.apis google-api-services-compute - v1-rev135-1.22.0 + v1-rev103-1.21.0 compile From e8c2930f0ce8dac438a74e7197448d6d45fc2ba9 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Mon, 27 Feb 2017 10:15:54 +0100 Subject: [PATCH 10/13] Revert "Make google-cloud-datastore converge" This reverts commit 0e776644fe40025243aa45940c4bbc9e70d7d71e. --- google-cloud-datastore/pom.xml | 42 ---------------------------------- 1 file changed, 42 deletions(-) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 3db72890d079..9b2b26b76eba 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -27,18 +27,6 @@ com.google.cloud.datastore datastore-v1-protos 1.3.0 - - - com.google.protobuf - protobuf-java - - - - com.google.api.grpc - grpc-google-common-protos - - - com.google.cloud.datastore @@ -49,36 +37,6 @@ guava-jdk5 com.google.guava - - com.google.protobuf - protobuf-java - - - - com.google.guava - guava - - - - com.google.oauth-client - google-oauth-client - - - - com.google.http-client - google-http-client-jackson - - - - com.google.http-client - google-http-client - - - - com.google.api-client - google-api-client - - From 1d5d4974aeb06d3263b244ad3259c5b65ed0d986 Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Mon, 27 Feb 2017 10:15:54 +0100 Subject: [PATCH 11/13] Revert "Make google-cloud-errorreporting converge" This reverts commit 071889f751e3610e3ce407021a1056db73bc3eda. --- google-cloud-errorreporting/pom.xml | 32 ----------------------------- 1 file changed, 32 deletions(-) diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index 8f0febbd9aab..f349b054237a 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -36,31 +36,6 @@ io.grpc grpc-all - - com.google.auto.value - auto-value - - - - com.google.protobuf - protobuf-java - - - - com.google.guava - guava - - - - com.google.api.grpc - grpc-google-common-protos - - - - joda-time - joda-time - - @@ -77,13 +52,6 @@ io.grpc grpc-auth ${grpc.version} - - - com.google.auth - google-auth-library-credentials - - - ${project.groupId} From 1fade094e13e793ee2d2fd117f6c378625eb752e Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Mon, 27 Feb 2017 10:15:54 +0100 Subject: [PATCH 12/13] Revert "Make google-cloud-language converge" This reverts commit fe9a4c6d78ecdde0679567fe9e2850c747e5d801. --- google-cloud-language/pom.xml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 217f6ce8e2a6..5a3bc3eb1b20 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -36,31 +36,6 @@ io.grpc grpc-all - - com.google.auto.value - auto-value - - - - com.google.protobuf - protobuf-java - - - - com.google.guava - guava - - - - com.google.api.grpc - grpc-google-common-protos - - - - joda-time - joda-time - - @@ -77,13 +52,6 @@ io.grpc grpc-auth ${grpc.version} - - - com.google.auth - google-auth-library-credentials - - - ${project.groupId} From 44409b9fa1a6f9bb03685eb3bb880b59ad7f92fe Mon Sep 17 00:00:00 2001 From: Reynald Borer Date: Mon, 27 Feb 2017 10:55:54 +0100 Subject: [PATCH 13/13] 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ ${storage.version} - + 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 @@ com.google.guava guava - 19.0 com.google.code.findbugs jsr305 - 2.0.1 javax.inject @@ -46,19 +44,16 @@ com.google.auto.value auto-value - 1.1 provided junit junit - 4.12 test com.google.guava guava-testlib - 19.0 test 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 @@ com.google.auth google-auth-library-credentials - ${google.auth.version} com.google.auth google-auth-library-oauth2-http - ${google.auth.version} com.google.guava @@ -36,24 +34,20 @@ com.google.http-client google-http-client - 1.21.0 compile com.google.oauth-client google-oauth-client - 1.21.0 compile com.google.guava guava - 19.0 com.google.api-client google-api-client-appengine - 1.21.0 compile @@ -65,7 +59,6 @@ com.google.http-client google-http-client-jackson - 1.21.0 compile @@ -77,13 +70,11 @@ junit junit - 4.12 test joda-time joda-time - 2.9.2 compile @@ -101,7 +92,6 @@ com.google.protobuf protobuf-java - 3.0.0 io.grpc @@ -111,7 +101,6 @@ com.google.api gax - ${gax.version} io.grpc @@ -122,7 +111,6 @@ com.google.api.grpc grpc-google-common-protos - 0.1.5 io.grpc 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ google-cloud-nio ${project.version} - + junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ com.google.api gax - 0.0.25 io.grpc @@ -140,37 +139,30 @@ com.google.protobuf protobuf-java-util - 3.0.0 com.google.code.findbugs jsr305 - 3.0.0 com.google.guava -guava - 19.0 + guava joda-time joda-time - 2.9.2 com.google.auth google-auth-library-credentials - 0.4.0 com.google.auth google-auth-library-oauth2-http - 0.4.0 com.google.api-client google-api-client - 1.20.0 @@ -182,7 +174,6 @@ junit junit - 4.12 com.google.truth @@ -199,7 +190,6 @@ com.google.guava guava-testlib - 19.0 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test 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 @@ junit junit - 4.12 test diff --git a/pom.xml b/pom.xml index ee1e97b05549..b5d25c310198 100644 --- a/pom.xml +++ b/pom.xml @@ -97,8 +97,117 @@ 0.9.4-alpha-SNAPSHOT 0.9.4-beta-SNAPSHOT ${beta.version} + 1.22.0 + 1.21.0 + 19.0 + 3.0.2 google-cloud + + + + joda-time + joda-time + 2.9.2 + + + com.google.code.findbugs + jsr305 + 3.0.0 + + + com.google.protobuf + protobuf-java + ${version.protobuf} + + + com.google.protobuf + protobuf-java-util + ${version.protobuf} + + + com.google.guava + guava + ${version.guava} + + + com.google.guava + guava-testlib + ${version.guava} + + + com.google.api.grpc + grpc-google-common-protos + 0.1.6 + + + com.google.auto.value + auto-value + 1.2 + + + com.google.http-client + google-http-client + ${version.http-client} + + + com.google.http-client + google-http-client-jackson2 + ${version.http-client} + + + com.google.http-client + google-http-client-jackson + ${version.http-client} + + + com.google.oauth-client + google-oauth-client + 1.21.0 + + + com.google.api-client + google-api-client-appengine + ${version.api-client} + + + com.google.api-client + google-api-client + ${version.api-client} + + + com.google.auth + google-auth-library-credentials + ${google.auth.version} + + + com.google.auth + google-auth-library-oauth2-http + ${google.auth.version} + + + com.google.api + gax + ${gax.version} + + + + junit + junit + 4.12 + + + org.hamcrest + hamcrest-core + 1.3 + + + com.google.errorprone + error_prone_annotations + 2.0.8 + + + google-cloud google-cloud-bigquery @@ -166,7 +275,7 @@ 1.4.1 - enforce-maven + enforce enforce @@ -178,6 +287,7 @@ [1.7,) +