diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml index e2fffd6a9cc7..64ab9255201e 100644 --- a/google-cloud-bigquery/pom.xml +++ b/google-cloud-bigquery/pom.xml @@ -52,7 +52,6 @@ junit junit - 4.12 test diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml index 1dd314b81733..0f3e621367d9 100644 --- a/google-cloud-compute/pom.xml +++ b/google-cloud-compute/pom.xml @@ -46,7 +46,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 94c9685c9c8e..d39cdd5c713d 100644 --- a/google-cloud-contrib/google-cloud-nio-examples/pom.xml +++ b/google-cloud-contrib/google-cloud-nio-examples/pom.xml @@ -23,12 +23,6 @@ google-cloud-storage ${storage.version} - - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.4 - diff --git a/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-contrib/google-cloud-nio/pom.xml index b7640a01d983..511dfa52b2a1 100644 --- a/google-cloud-contrib/google-cloud-nio/pom.xml +++ b/google-cloud-contrib/google-cloud-nio/pom.xml @@ -26,12 +26,10 @@ com.google.guava guava - 19.0 com.google.code.findbugs jsr305 - 2.0.1 javax.inject @@ -47,19 +45,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 9749ee819dff..fb7d88663634 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -22,12 +22,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 @@ -38,24 +36,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 - 1.21.0 compile @@ -67,7 +61,6 @@ com.google.http-client google-http-client-appengine - 1.21.0 compile @@ -79,7 +72,6 @@ com.google.http-client google-http-client-jackson - 1.21.0 compile @@ -91,13 +83,11 @@ junit junit - 4.12 test joda-time joda-time - 2.9.2 compile @@ -115,12 +105,10 @@ com.google.protobuf protobuf-java - 3.2.0 com.google.protobuf protobuf-java-util - 3.2.0 io.grpc @@ -146,7 +134,6 @@ com.google.api.grpc grpc-google-common-protos - 0.1.7 io.grpc @@ -157,7 +144,6 @@ com.google.api.grpc grpc-google-iam-v1 - 0.1.7 io.grpc diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 1fd5193f8d93..ab8d3262af71 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -50,7 +50,6 @@ junit junit - 4.12 test diff --git a/google-cloud-dns/pom.xml b/google-cloud-dns/pom.xml index f9d2e9765637..4ff0e621ee93 100644 --- a/google-cloud-dns/pom.xml +++ b/google-cloud-dns/pom.xml @@ -57,7 +57,6 @@ junit junit - 4.12 test diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index b656fb41a00d..f99fe338a6e8 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -65,7 +65,6 @@ junit junit - 4.12 test diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index 82db559ade1e..3da1b92bced0 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -28,15 +28,9 @@ google-cloud-nio ${project.version} - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.4 - junit junit - 4.12 test diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java index 346e5566a436..2be344bea197 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java @@ -35,7 +35,7 @@ import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; import com.google.pubsub.v1.TopicName; -import edu.emory.mathcs.backport.java.util.Collections; +import java.util.Collections; import java.util.LinkedList; import java.util.List; diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 095637bf19b1..a3a6c3b427b7 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -76,7 +76,6 @@ junit junit - 4.12 test diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 3b7bd135f463..6bf5442d8900 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -65,7 +65,6 @@ junit junit - 4.12 test diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index 350c486e4480..195ef72f880b 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -65,7 +65,6 @@ junit junit - 4.12 test diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 8e687eb68d57..da510e0ac180 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -65,7 +65,6 @@ junit junit - 4.12 test diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml index 20b7ff882f0e..8cba22f2ebd3 100644 --- a/google-cloud-resourcemanager/pom.xml +++ b/google-cloud-resourcemanager/pom.xml @@ -46,7 +46,6 @@ junit junit - 4.12 test diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 74b8c6e83788..e7522c9a62f6 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -127,48 +127,17 @@ grpc-stub ${grpc.version} - - com.google.api - gax - ${gax.version} - - - io.grpc - grpc-all - - - com.google.code.findbugs jsr305 - 3.0.0 - - - com.google.guava - guava - 19.0 joda-time joda-time - 2.9.2 - - - com.google.api-client - google-api-client - 1.20.0 - - - - com.google.guava - guava-jdk5 - - junit junit - 4.12 com.google.truth @@ -185,13 +154,6 @@ com.google.guava guava-testlib - 19.0 - test - - - org.json - json - 20151123 test diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml index daa4efc97686..be3a8be827df 100644 --- a/google-cloud-speech/pom.xml +++ b/google-cloud-speech/pom.xml @@ -76,7 +76,6 @@ junit junit - 4.12 test diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index 0f1ce9826404..0f6369fe401d 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -50,7 +50,6 @@ junit junit - 4.12 test diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 717951355e94..448825c8c5aa 100644 --- a/google-cloud-trace/pom.xml +++ b/google-cloud-trace/pom.xml @@ -65,7 +65,6 @@ junit junit - 4.12 test diff --git a/google-cloud-translate/pom.xml b/google-cloud-translate/pom.xml index 7087ca437a29..7046baccd1a0 100644 --- a/google-cloud-translate/pom.xml +++ b/google-cloud-translate/pom.xml @@ -50,7 +50,6 @@ junit junit - 4.12 test diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index 6cae09bfd5b9..f5fc945af141 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -65,7 +65,6 @@ junit junit - 4.12 test diff --git a/pom.xml b/pom.xml index eb6132bfa377..424723738e52 100644 --- a/pom.xml +++ b/pom.xml @@ -92,11 +92,15 @@ github google-cloud + 1.21.0 + 0.2.0 + 0.12.0 + 0.1.8 0.6.1 1.2.0 - 0.12.0 - 0.2.0 - 0.1.7 + 19.0 + 1.21.0 + 3.2.0 0.13.1-alpha-SNAPSHOT 0.13.1-beta-SNAPSHOT @@ -120,6 +124,121 @@ 0.13.1-beta-SNAPSHOT 0.13.1-alpha-SNAPSHOT + + + + joda-time + joda-time + 2.9.2 + + + com.google.code.findbugs + jsr305 + 3.0.0 + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.protobuf + protobuf-java-util + ${protobuf.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.api.grpc + grpc-google-common-protos + ${generatedProto.version} + + + com.google.api.grpc + grpc-google-iam-v1 + ${generatedProto.version} + + + com.google.auto.value + auto-value + 1.2 + + + com.google.http-client + google-http-client + ${http-client.version} + + + com.google.http-client + google-http-client-appengine + ${http-client.version} + + + com.google.http-client + google-http-client-jackson2 + ${http-client.version} + + + com.google.http-client + google-http-client-jackson + ${http-client.version} + + + com.google.oauth-client + google-oauth-client + 1.21.0 + + + com.google.api-client + google-api-client-appengine + ${api-client.version} + + + com.google.api-client + google-api-client + ${api-client.version} + + + 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 + + + com.google.guava + guava-testlib + ${guava.version} + + + google-cloud google-cloud-bigquery @@ -192,7 +311,7 @@ 1.4.1 - enforce-maven + enforce enforce @@ -204,6 +323,7 @@ [1.7,) +