From 2e131b73ac4abf0f8873f22e6f72570165b2b1ed Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Thu, 1 Mar 2018 15:32:11 -0800 Subject: [PATCH 1/3] Fix a Spanner region tag. (#1047) --- .../src/main/java/com/example/spanner/SpannerSample.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java b/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java index b6a4283ff68..1ad6c4dfa68 100644 --- a/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java +++ b/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java @@ -274,7 +274,7 @@ public Void run(TransactionContext transaction) throws Exception { } // [END spanner_read_write_transaction] - // [START spanner_query_with_new_column] + // [START spanner_query_data_with_new_column] static void queryMarketingBudget(DatabaseClient dbClient) { // Rows without an explicit value for MarketingBudget will have a MarketingBudget equal to // null. @@ -292,7 +292,7 @@ static void queryMarketingBudget(DatabaseClient dbClient) { resultSet.isNull("MarketingBudget") ? "NULL" : resultSet.getLong("MarketingBudget")); } } - // [END spanner_query_with_new_column] + // [END spanner_query_data_with_new_column] // [START spanner_create_index] static void addIndex(DatabaseAdminClient adminClient, DatabaseId dbId) { From 31e3533e2b56bc0d59273aec07c833c3887b8f00 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Fri, 2 Mar 2018 16:20:22 -0800 Subject: [PATCH 2/3] Auto Update Dependencies (#1048) --- appengine-java8/analytics/pom.xml | 6 +++--- appengine-java8/appidentity/pom.xml | 8 ++++---- appengine-java8/bigquery/pom.xml | 12 ++++++------ .../appengine/bigquerylogging/BigQueryRunner.java | 4 ++-- .../bigquerylogging/BigQueryRunnerTest.java | 2 +- appengine-java8/cloudsql-postgres/pom.xml | 2 +- appengine-java8/cloudsql/pom.xml | 2 +- appengine-java8/datastore-indexes-exploding/pom.xml | 8 ++++---- appengine-java8/datastore-indexes-perfect/pom.xml | 8 ++++---- appengine-java8/datastore-indexes/pom.xml | 8 ++++---- appengine-java8/datastore/pom.xml | 8 ++++---- appengine-java8/endpoints-v2-backend/pom.xml | 4 ++-- appengine-java8/endpoints-v2-guice/pom.xml | 6 +++--- appengine-java8/endpoints-v2-migration/pom.xml | 4 ++-- appengine-java8/endpoints-v2-skeleton/pom.xml | 4 ++-- appengine-java8/firebase-event-proxy/pom.xml | 6 +++--- appengine-java8/firebase-tictactoe/pom.xml | 8 ++++---- appengine-java8/gaeinfo/pom.xml | 4 ++-- appengine-java8/guestbook-cloud-datastore/pom.xml | 10 +++++----- appengine-java8/guestbook-objectify/pom.xml | 8 ++++---- appengine-java8/images/pom.xml | 2 +- appengine-java8/memcache/pom.xml | 4 ++-- appengine-java8/metadata/pom.xml | 2 +- appengine-java8/multitenancy/pom.xml | 8 ++++---- appengine-java8/oauth2/pom.xml | 2 +- appengine-java8/pubsub/pom.xml | 4 ++-- .../com/example/appengine/pubsub/PubSubPublish.java | 8 +++++--- appengine-java8/remote-client/pom.xml | 4 ++-- appengine-java8/remote-server/pom.xml | 2 +- appengine-java8/requests/pom.xml | 8 ++++---- appengine-java8/search/pom.xml | 8 ++++---- appengine-java8/spanner/pom.xml | 4 ++-- appengine-java8/taskqueues-deferred/pom.xml | 6 +++--- appengine-java8/taskqueues-pull/pom.xml | 6 +++--- appengine-java8/taskqueues-push/pom.xml | 8 ++++---- appengine-java8/translate-pubsub/pom.xml | 6 +++--- .../appengine/translatepubsub/PubSubPublish.java | 7 +++++-- appengine-java8/users/pom.xml | 8 ++++---- appengine/analytics/pom.xml | 2 +- appengine/appidentity/pom.xml | 8 ++++---- appengine/cloudsql/pom.xml | 2 +- appengine/datastore/indexes-exploding/pom.xml | 8 ++++---- appengine/datastore/indexes-perfect/pom.xml | 8 ++++---- appengine/datastore/indexes/pom.xml | 8 ++++---- appengine/endpoints-frameworks-v2/backend/pom.xml | 4 ++-- .../endpoints-frameworks-v2/guice-example/pom.xml | 6 +++--- .../migration-example/pom.xml | 4 ++-- appengine/endpoints-v1-helloworld/pom.xml | 8 ++++---- .../gae-firebase-event-proxy/pom.xml | 6 +++--- appengine/firebase-tictactoe/pom.xml | 6 +++--- appengine/gaeinfo/pom.xml | 2 +- appengine/guestbook-objectify/pom.xml | 8 ++++---- appengine/images/pom.xml | 2 +- appengine/logs/pom.xml | 2 +- appengine/mail/pom.xml | 2 +- appengine/memcache/pom.xml | 4 ++-- appengine/multitenancy/pom.xml | 8 ++++---- appengine/oauth2/pom.xml | 2 +- appengine/pusher-chat/pom.xml | 2 +- appengine/remote/remote-client/pom.xml | 4 ++-- appengine/remote/remote-server/pom.xml | 2 +- appengine/requests/pom.xml | 8 ++++---- appengine/search/pom.xml | 8 ++++---- appengine/sockets/pom.xml | 2 +- appengine/taskqueue/defer-samples/pom.xml | 6 +++--- appengine/taskqueue/pull-samples/pom.xml | 6 +++--- appengine/taskqueue/push-samples/pom.xml | 8 ++++---- appengine/users/pom.xml | 8 ++++---- bigquery/cloud-client/pom.xml | 2 +- bigquery/datatransfer/cloud-client/pom.xml | 2 +- .../bigquerydatatransfer/QuickstartSample.java | 3 ++- datastore/cloud-client/pom.xml | 2 +- datastore/pom.xml | 2 +- dlp/pom.xml | 2 +- dlp/src/main/java/com/example/dlp/Inspect.java | 7 +++---- errorreporting/pom.xml | 2 +- firestore/pom.xml | 2 +- flexible/cloud-tasks/pom.xml | 2 +- flexible/cloudstorage/pom.xml | 2 +- flexible/datastore/pom.xml | 2 +- flexible/errorreporting/pom.xml | 2 +- .../errorreporting/ErrorReportingExample.java | 4 +--- flexible/gaeinfo/pom.xml | 4 ++-- flexible/memcache/pom.xml | 2 +- flexible/pubsub/pom.xml | 8 ++++---- .../com/example/flexible/pubsub/PubSubPublish.java | 4 ++-- flexible/sparkjava/pom.xml | 2 +- iap/pom.xml | 2 +- language/analysis/pom.xml | 2 +- language/cloud-client/pom.xml | 2 +- logging/cloud-client/pom.xml | 2 +- logging/jul/pom.xml | 2 +- logging/logback/pom.xml | 2 +- pubsub/cloud-client/pom.xml | 2 +- .../pubsub/CreatePullSubscriptionExample.java | 10 ++++++---- .../java/com/example/pubsub/CreateTopicExample.java | 5 +++-- .../java/com/example/pubsub/PublisherExample.java | 4 ++-- .../java/com/example/pubsub/SubscriberExample.java | 5 +++-- .../test/java/com/example/pubsub/QuickStartIT.java | 8 ++++---- spanner/cloud-client/pom.xml | 2 +- speech/cloud-client/pom.xml | 2 +- storage/cloud-client/pom.xml | 2 +- storage/storage-transfer/pom.xml | 2 +- .../xml-api/serviceaccount-appengine-sample/pom.xml | 2 +- translate/cloud-client/pom.xml | 2 +- translate/pom.xml | 2 +- unittests/pom.xml | 8 ++++---- video/cloud-client/pom.xml | 2 +- vision/beta/cloud-client/pom.xml | 2 +- vision/cloud-client/pom.xml | 2 +- 110 files changed, 255 insertions(+), 248 deletions(-) diff --git a/appengine-java8/analytics/pom.xml b/appengine-java8/analytics/pom.xml index bdac5a00683..cb941f40bdb 100644 --- a/appengine-java8/analytics/pom.xml +++ b/appengine-java8/analytics/pom.xml @@ -33,7 +33,7 @@ 1.8 1.8 - 1.9.62 + 1.9.63 @@ -41,7 +41,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -74,7 +74,7 @@ com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/appidentity/pom.xml b/appengine-java8/appidentity/pom.xml index 56593000687..7d4a522e041 100644 --- a/appengine-java8/appidentity/pom.xml +++ b/appengine-java8/appidentity/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -66,13 +66,13 @@ com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test @@ -91,7 +91,7 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/bigquery/pom.xml b/appengine-java8/bigquery/pom.xml index 7bf4e1f3338..6d233cfc872 100644 --- a/appengine-java8/bigquery/pom.xml +++ b/appengine-java8/bigquery/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -53,12 +53,12 @@ com.google.cloud google-cloud-bigquery - 0.34.0-beta + 0.37.0-beta com.google.cloud google-cloud-monitoring - 0.34.0-beta + 0.37.0-beta @@ -77,13 +77,13 @@ com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test @@ -102,7 +102,7 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java b/appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java index 497b20cf60f..6349c7819a8 100644 --- a/appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java +++ b/appengine-java8/bigquery/src/main/java/com/example/appengine/bigquerylogging/BigQueryRunner.java @@ -30,8 +30,8 @@ import com.google.cloud.bigquery.QueryJobConfiguration; import com.google.cloud.bigquery.TableResult; import com.google.cloud.monitoring.v3.MetricServiceClient; -import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; -import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListTimeSeriesPagedResponse; +import com.google.cloud.monitoring.v3.MetricServiceClient.ListMetricDescriptorsPagedResponse; +import com.google.cloud.monitoring.v3.MetricServiceClient.ListTimeSeriesPagedResponse; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/appengine-java8/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java b/appengine-java8/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java index 0b6baf2809f..d38a25d7183 100644 --- a/appengine-java8/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java +++ b/appengine-java8/bigquery/src/test/java/com/example/appengine/bigquerylogging/BigQueryRunnerTest.java @@ -27,7 +27,7 @@ import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.bigquery.BigQueryOptions; import com.google.cloud.monitoring.v3.MetricServiceClient; -import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; +import com.google.cloud.monitoring.v3.MetricServiceClient.ListMetricDescriptorsPagedResponse; import com.google.cloud.monitoring.v3.stub.MetricServiceStub; import com.google.monitoring.v3.CreateMetricDescriptorRequest; import com.google.monitoring.v3.CreateTimeSeriesRequest; diff --git a/appengine-java8/cloudsql-postgres/pom.xml b/appengine-java8/cloudsql-postgres/pom.xml index 52c7d016489..5265f433bfc 100644 --- a/appengine-java8/cloudsql-postgres/pom.xml +++ b/appengine-java8/cloudsql-postgres/pom.xml @@ -51,7 +51,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine-java8/cloudsql/pom.xml b/appengine-java8/cloudsql/pom.xml index 433829ba05e..80967a59f33 100644 --- a/appengine-java8/cloudsql/pom.xml +++ b/appengine-java8/cloudsql/pom.xml @@ -51,7 +51,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine-java8/datastore-indexes-exploding/pom.xml b/appengine-java8/datastore-indexes-exploding/pom.xml index fab39316765..13febbd1006 100644 --- a/appengine-java8/datastore-indexes-exploding/pom.xml +++ b/appengine-java8/datastore-indexes-exploding/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -65,19 +65,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/datastore-indexes-perfect/pom.xml b/appengine-java8/datastore-indexes-perfect/pom.xml index 86fcf37d20c..0485d83a2fa 100644 --- a/appengine-java8/datastore-indexes-perfect/pom.xml +++ b/appengine-java8/datastore-indexes-perfect/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -65,19 +65,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/datastore-indexes/pom.xml b/appengine-java8/datastore-indexes/pom.xml index b9e9e4f818b..5d72b35efe4 100644 --- a/appengine-java8/datastore-indexes/pom.xml +++ b/appengine-java8/datastore-indexes/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -66,19 +66,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/datastore/pom.xml b/appengine-java8/datastore/pom.xml index cb31d9ab19e..4a19ab1477a 100644 --- a/appengine-java8/datastore/pom.xml +++ b/appengine-java8/datastore/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -92,19 +92,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml index 2202beac269..16b01750f2c 100644 --- a/appengine-java8/endpoints-v2-backend/pom.xml +++ b/appengine-java8/endpoints-v2-backend/pom.xml @@ -37,7 +37,7 @@ UTF-8 - 2.0.12 + 2.0.13 1.0.4 YOUR_PROJECT_ID @@ -58,7 +58,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/appengine-java8/endpoints-v2-guice/pom.xml b/appengine-java8/endpoints-v2-guice/pom.xml index b10f8721aeb..52d6154755a 100644 --- a/appengine-java8/endpoints-v2-guice/pom.xml +++ b/appengine-java8/endpoints-v2-guice/pom.xml @@ -36,7 +36,7 @@ 1.8 UTF-8 - 2.0.12 + 2.0.13 1.0.4 YOUR_PROJECT_ID @@ -53,7 +53,7 @@ com.google.endpoints endpoints-framework-guice - 2.0.12 + 2.0.13 @@ -64,7 +64,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/appengine-java8/endpoints-v2-migration/pom.xml b/appengine-java8/endpoints-v2-migration/pom.xml index d8ad575c832..edbd3882f8e 100644 --- a/appengine-java8/endpoints-v2-migration/pom.xml +++ b/appengine-java8/endpoints-v2-migration/pom.xml @@ -44,13 +44,13 @@ limitations under the License. com.google.endpoints endpoints-framework - 2.0.12 + 2.0.13 com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/appengine-java8/endpoints-v2-skeleton/pom.xml b/appengine-java8/endpoints-v2-skeleton/pom.xml index 0ca0744d263..3091aacbfbc 100644 --- a/appengine-java8/endpoints-v2-skeleton/pom.xml +++ b/appengine-java8/endpoints-v2-skeleton/pom.xml @@ -44,12 +44,12 @@ com.google.endpoints endpoints-framework - 2.0.12 + 2.0.13 com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/appengine-java8/firebase-event-proxy/pom.xml b/appengine-java8/firebase-event-proxy/pom.xml index be6f8242471..06746b828d6 100644 --- a/appengine-java8/firebase-event-proxy/pom.xml +++ b/appengine-java8/firebase-event-proxy/pom.xml @@ -45,7 +45,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -80,13 +80,13 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/firebase-tictactoe/pom.xml b/appengine-java8/firebase-tictactoe/pom.xml index 6f0975858b7..128cdfa1b1d 100644 --- a/appengine-java8/firebase-tictactoe/pom.xml +++ b/appengine-java8/firebase-tictactoe/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -88,19 +88,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/gaeinfo/pom.xml b/appengine-java8/gaeinfo/pom.xml index 552a006e326..52d27796a0a 100644 --- a/appengine-java8/gaeinfo/pom.xml +++ b/appengine-java8/gaeinfo/pom.xml @@ -42,7 +42,7 @@ Copyright 2017 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -56,7 +56,7 @@ Copyright 2017 Google Inc. com.squareup.okhttp3 okhttp - 3.9.1 + 3.10.0 diff --git a/appengine-java8/guestbook-cloud-datastore/pom.xml b/appengine-java8/guestbook-cloud-datastore/pom.xml index 4c140fe16ea..f9cb164ebd2 100644 --- a/appengine-java8/guestbook-cloud-datastore/pom.xml +++ b/appengine-java8/guestbook-cloud-datastore/pom.xml @@ -45,7 +45,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -65,7 +65,7 @@ com.google.cloud google-cloud - 0.34.0-alpha + 0.37.0-alpha @@ -90,19 +90,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/guestbook-objectify/pom.xml b/appengine-java8/guestbook-objectify/pom.xml index be3f763663c..be99313ff26 100644 --- a/appengine-java8/guestbook-objectify/pom.xml +++ b/appengine-java8/guestbook-objectify/pom.xml @@ -43,7 +43,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -89,19 +89,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/images/pom.xml b/appengine-java8/images/pom.xml index 78b3ac5adc7..0bb894bdb74 100644 --- a/appengine-java8/images/pom.xml +++ b/appengine-java8/images/pom.xml @@ -39,7 +39,7 @@ Copyright 2015 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine-java8/memcache/pom.xml b/appengine-java8/memcache/pom.xml index 58a1231dc2d..1f5fff2c019 100644 --- a/appengine-java8/memcache/pom.xml +++ b/appengine-java8/memcache/pom.xml @@ -48,12 +48,12 @@ Copyright 2015 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 com.googlecode.xmemcached xmemcached - 2.4.0 + 2.4.2 diff --git a/appengine-java8/metadata/pom.xml b/appengine-java8/metadata/pom.xml index 2e04a8e6760..bc917b9051f 100644 --- a/appengine-java8/metadata/pom.xml +++ b/appengine-java8/metadata/pom.xml @@ -51,7 +51,7 @@ Copyright 2017 Google Inc. com.squareup.okhttp3 okhttp - 3.9.1 + 3.10.0 diff --git a/appengine-java8/multitenancy/pom.xml b/appengine-java8/multitenancy/pom.xml index 20ca39f919e..a872735fc43 100644 --- a/appengine-java8/multitenancy/pom.xml +++ b/appengine-java8/multitenancy/pom.xml @@ -42,7 +42,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -88,19 +88,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/oauth2/pom.xml b/appengine-java8/oauth2/pom.xml index 8860cebce6e..d2a722f2e2f 100644 --- a/appengine-java8/oauth2/pom.xml +++ b/appengine-java8/oauth2/pom.xml @@ -38,7 +38,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine-java8/pubsub/pom.xml b/appengine-java8/pubsub/pom.xml index f11bf715bac..90f90ca90b7 100644 --- a/appengine-java8/pubsub/pom.xml +++ b/appengine-java8/pubsub/pom.xml @@ -52,12 +52,12 @@ com.google.cloud google-cloud-pubsub - 0.34.0-beta + 0.37.0-beta com.google.cloud google-cloud-datastore - 1.16.0 + 1.19.0 diff --git a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java index bcf19d66b49..73d850284e2 100644 --- a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java +++ b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java @@ -19,8 +19,8 @@ import com.google.cloud.ServiceOptions; import com.google.cloud.pubsub.v1.Publisher; import com.google.protobuf.ByteString; +import com.google.pubsub.v1.ProjectTopicName; import com.google.pubsub.v1.PubsubMessage; -import com.google.pubsub.v1.TopicName; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -40,9 +40,11 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) String topicId = System.getenv("PUBSUB_TOPIC"); // create a publisher on the topic if (publisher == null) { - publisher = Publisher.defaultBuilder( - TopicName.create(ServiceOptions.getDefaultProjectId(), topicId)) + ProjectTopicName topicName = ProjectTopicName.newBuilder() + .setProject(ServiceOptions.getDefaultProjectId()) + .setTopic(topicId) .build(); + publisher = Publisher.newBuilder(topicName).build(); } // construct a pubsub message from the payload final String payload = req.getParameter("payload"); diff --git a/appengine-java8/remote-client/pom.xml b/appengine-java8/remote-client/pom.xml index 1bcc0b1c107..12c90404fc3 100644 --- a/appengine-java8/remote-client/pom.xml +++ b/appengine-java8/remote-client/pom.xml @@ -39,12 +39,12 @@ com.google.appengine appengine-remote-api - 1.9.62 + 1.9.63 com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine-java8/remote-server/pom.xml b/appengine-java8/remote-server/pom.xml index caaf3b6de44..0641d1b135b 100644 --- a/appengine-java8/remote-server/pom.xml +++ b/appengine-java8/remote-server/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 org.apache.httpcomponents diff --git a/appengine-java8/requests/pom.xml b/appengine-java8/requests/pom.xml index 467a12add10..466b53291c6 100644 --- a/appengine-java8/requests/pom.xml +++ b/appengine-java8/requests/pom.xml @@ -40,7 +40,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-maven-plugin - 1.9.62 + 1.9.63 @@ -78,19 +78,19 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/search/pom.xml b/appengine-java8/search/pom.xml index 7396576efd9..a65ed7f032a 100644 --- a/appengine-java8/search/pom.xml +++ b/appengine-java8/search/pom.xml @@ -39,7 +39,7 @@ Copyright 2015 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -65,19 +65,19 @@ Copyright 2015 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/spanner/pom.xml b/appengine-java8/spanner/pom.xml index ff986e9fd03..36a06c7eb62 100644 --- a/appengine-java8/spanner/pom.xml +++ b/appengine-java8/spanner/pom.xml @@ -44,7 +44,7 @@ com.google.cloud google-cloud-spanner - 0.34.0-beta + 0.37.0-beta javax.servlet @@ -55,7 +55,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine-java8/taskqueues-deferred/pom.xml b/appengine-java8/taskqueues-deferred/pom.xml index e293ccbd4cc..9b3757a43b1 100644 --- a/appengine-java8/taskqueues-deferred/pom.xml +++ b/appengine-java8/taskqueues-deferred/pom.xml @@ -40,7 +40,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -71,12 +71,12 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 diff --git a/appengine-java8/taskqueues-pull/pom.xml b/appengine-java8/taskqueues-pull/pom.xml index af3cf454ebf..889669fdbe5 100644 --- a/appengine-java8/taskqueues-pull/pom.xml +++ b/appengine-java8/taskqueues-pull/pom.xml @@ -43,7 +43,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -62,13 +62,13 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/taskqueues-push/pom.xml b/appengine-java8/taskqueues-push/pom.xml index 673a0b5bfd7..343d31e831e 100644 --- a/appengine-java8/taskqueues-push/pom.xml +++ b/appengine-java8/taskqueues-push/pom.xml @@ -53,7 +53,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -71,19 +71,19 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine-java8/translate-pubsub/pom.xml b/appengine-java8/translate-pubsub/pom.xml index b74a5fd2007..60bc98e8097 100644 --- a/appengine-java8/translate-pubsub/pom.xml +++ b/appengine-java8/translate-pubsub/pom.xml @@ -49,17 +49,17 @@ com.google.cloud google-cloud-pubsub - 0.34.0-beta + 0.37.0-beta com.google.cloud google-cloud-datastore - 1.16.0 + 1.19.0 com.google.cloud google-cloud-translate - 1.16.0 + 1.19.0 diff --git a/appengine-java8/translate-pubsub/src/main/java/com/example/appengine/translatepubsub/PubSubPublish.java b/appengine-java8/translate-pubsub/src/main/java/com/example/appengine/translatepubsub/PubSubPublish.java index 9bd07b4d097..2819496dc43 100644 --- a/appengine-java8/translate-pubsub/src/main/java/com/example/appengine/translatepubsub/PubSubPublish.java +++ b/appengine-java8/translate-pubsub/src/main/java/com/example/appengine/translatepubsub/PubSubPublish.java @@ -20,8 +20,8 @@ import com.google.cloud.pubsub.v1.Publisher; import com.google.gson.Gson; import com.google.protobuf.ByteString; +import com.google.pubsub.v1.ProjectTopicName; import com.google.pubsub.v1.PubsubMessage; -import com.google.pubsub.v1.TopicName; import java.io.IOException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -56,7 +56,10 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx // create a publisher on the topic if (publisher == null) { this.publisher = publisher = Publisher.newBuilder( - TopicName.of(ServiceOptions.getDefaultProjectId(), topicId)) + ProjectTopicName.newBuilder() + .setProject(ServiceOptions.getDefaultProjectId()) + .setTopic(topicId) + .build()) .build(); } diff --git a/appengine-java8/users/pom.xml b/appengine-java8/users/pom.xml index b311738b532..d8c4340ff3a 100644 --- a/appengine-java8/users/pom.xml +++ b/appengine-java8/users/pom.xml @@ -40,7 +40,7 @@ Copyright 2015 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 com.google.guava @@ -78,19 +78,19 @@ Copyright 2015 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/analytics/pom.xml b/appengine/analytics/pom.xml index 50f62420e4a..b3088e3a3b3 100644 --- a/appengine/analytics/pom.xml +++ b/appengine/analytics/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 org.apache.httpcomponents diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml index 912d4b2de1b..8576eb9dd90 100644 --- a/appengine/appidentity/pom.xml +++ b/appengine/appidentity/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 com.google.guava @@ -75,19 +75,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml index 20a0609d27e..0ce5b289af0 100644 --- a/appengine/cloudsql/pom.xml +++ b/appengine/cloudsql/pom.xml @@ -61,7 +61,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine/datastore/indexes-exploding/pom.xml b/appengine/datastore/indexes-exploding/pom.xml index 63658aa97c5..63b8222e57f 100644 --- a/appengine/datastore/indexes-exploding/pom.xml +++ b/appengine/datastore/indexes-exploding/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -64,19 +64,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/datastore/indexes-perfect/pom.xml b/appengine/datastore/indexes-perfect/pom.xml index f1cfc805b4a..022755233c6 100644 --- a/appengine/datastore/indexes-perfect/pom.xml +++ b/appengine/datastore/indexes-perfect/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -64,19 +64,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/datastore/indexes/pom.xml b/appengine/datastore/indexes/pom.xml index 53cc169b5ca..ffa5cb15eb1 100644 --- a/appengine/datastore/indexes/pom.xml +++ b/appengine/datastore/indexes/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -64,19 +64,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml index f658555c89b..d7c419bff93 100644 --- a/appengine/endpoints-frameworks-v2/backend/pom.xml +++ b/appengine/endpoints-frameworks-v2/backend/pom.xml @@ -35,7 +35,7 @@ UTF-8 - 2.0.12 + 2.0.13 YOUR_PROJECT_ID 1.7 @@ -65,7 +65,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/appengine/endpoints-frameworks-v2/guice-example/pom.xml b/appengine/endpoints-frameworks-v2/guice-example/pom.xml index 15833f0ae17..57149529593 100644 --- a/appengine/endpoints-frameworks-v2/guice-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/guice-example/pom.xml @@ -35,7 +35,7 @@ UTF-8 - 2.0.12 + 2.0.13 YOUR_PROJECT_ID 1.7 @@ -54,7 +54,7 @@ com.google.endpoints endpoints-framework-guice - 2.0.12 + 2.0.13 @@ -65,7 +65,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml index 5d4424c10a9..c4ba63ac806 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml @@ -57,14 +57,14 @@ limitations under the License. com.google.endpoints endpoints-framework - 2.0.12 + 2.0.13 com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/appengine/endpoints-v1-helloworld/pom.xml b/appengine/endpoints-v1-helloworld/pom.xml index d7b82404b45..d8bb8850798 100644 --- a/appengine/endpoints-v1-helloworld/pom.xml +++ b/appengine/endpoints-v1-helloworld/pom.xml @@ -47,12 +47,12 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 com.google.appengine appengine-endpoints - 1.9.62 + 1.9.63 javax.servlet @@ -82,13 +82,13 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml index 6480efeadd1..401b1800d14 100644 --- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml +++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml @@ -49,7 +49,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -82,13 +82,13 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test diff --git a/appengine/firebase-tictactoe/pom.xml b/appengine/firebase-tictactoe/pom.xml index 8315104dddb..df1568cd09c 100644 --- a/appengine/firebase-tictactoe/pom.xml +++ b/appengine/firebase-tictactoe/pom.xml @@ -44,7 +44,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 com.google.api-client @@ -70,13 +70,13 @@ com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-testing - 1.9.62 + 1.9.63 diff --git a/appengine/gaeinfo/pom.xml b/appengine/gaeinfo/pom.xml index 06cd27096a2..8571424a261 100644 --- a/appengine/gaeinfo/pom.xml +++ b/appengine/gaeinfo/pom.xml @@ -43,7 +43,7 @@ Copyright 2017 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine/guestbook-objectify/pom.xml b/appengine/guestbook-objectify/pom.xml index b66c3ec492e..e966248c527 100644 --- a/appengine/guestbook-objectify/pom.xml +++ b/appengine/guestbook-objectify/pom.xml @@ -47,7 +47,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -90,19 +90,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml index ea282979134..ef546536465 100644 --- a/appengine/images/pom.xml +++ b/appengine/images/pom.xml @@ -21,7 +21,7 @@ Copyright 2015 Google Inc. appengine-images - 1.9.62 + 1.9.63 diff --git a/appengine/multitenancy/pom.xml b/appengine/multitenancy/pom.xml index bcb314fedd8..7cc8dead336 100644 --- a/appengine/multitenancy/pom.xml +++ b/appengine/multitenancy/pom.xml @@ -48,7 +48,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -91,19 +91,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/oauth2/pom.xml b/appengine/oauth2/pom.xml index 6c4a6f003f8..3416dabf500 100644 --- a/appengine/oauth2/pom.xml +++ b/appengine/oauth2/pom.xml @@ -40,7 +40,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine/pusher-chat/pom.xml b/appengine/pusher-chat/pom.xml index 984b6d0e2a0..dc3482e414b 100644 --- a/appengine/pusher-chat/pom.xml +++ b/appengine/pusher-chat/pom.xml @@ -61,7 +61,7 @@ Copyright 2017 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine/remote/remote-client/pom.xml b/appengine/remote/remote-client/pom.xml index a359669fcab..e098d860dc3 100644 --- a/appengine/remote/remote-client/pom.xml +++ b/appengine/remote/remote-client/pom.xml @@ -40,12 +40,12 @@ com.google.appengine appengine-remote-api - 1.9.62 + 1.9.63 com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine/remote/remote-server/pom.xml b/appengine/remote/remote-server/pom.xml index 836e322730d..b4cc4b739f2 100644 --- a/appengine/remote/remote-server/pom.xml +++ b/appengine/remote/remote-server/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 org.apache.httpcomponents diff --git a/appengine/requests/pom.xml b/appengine/requests/pom.xml index c657aaf2000..e7f45751af5 100644 --- a/appengine/requests/pom.xml +++ b/appengine/requests/pom.xml @@ -40,7 +40,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-maven-plugin - 1.9.62 + 1.9.63 com.google.guava @@ -75,19 +75,19 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/search/pom.xml b/appengine/search/pom.xml index 770d5671982..f73e2730ce6 100644 --- a/appengine/search/pom.xml +++ b/appengine/search/pom.xml @@ -34,7 +34,7 @@ Copyright 2015 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -60,19 +60,19 @@ Copyright 2015 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/sockets/pom.xml b/appengine/sockets/pom.xml index 79e943acc8b..9387c93fbcd 100755 --- a/appengine/sockets/pom.xml +++ b/appengine/sockets/pom.xml @@ -47,7 +47,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/appengine/taskqueue/defer-samples/pom.xml b/appengine/taskqueue/defer-samples/pom.xml index c84d9a07412..e5c065b4ee0 100644 --- a/appengine/taskqueue/defer-samples/pom.xml +++ b/appengine/taskqueue/defer-samples/pom.xml @@ -40,7 +40,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -68,12 +68,12 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 diff --git a/appengine/taskqueue/pull-samples/pom.xml b/appengine/taskqueue/pull-samples/pom.xml index 057a17f007a..740aa7ffd22 100644 --- a/appengine/taskqueue/pull-samples/pom.xml +++ b/appengine/taskqueue/pull-samples/pom.xml @@ -42,7 +42,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -60,13 +60,13 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test diff --git a/appengine/taskqueue/push-samples/pom.xml b/appengine/taskqueue/push-samples/pom.xml index f14d911a8f0..a8e750d756b 100644 --- a/appengine/taskqueue/push-samples/pom.xml +++ b/appengine/taskqueue/push-samples/pom.xml @@ -52,7 +52,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -70,19 +70,19 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/appengine/users/pom.xml b/appengine/users/pom.xml index 9c563462f63..4110e62cf20 100644 --- a/appengine/users/pom.xml +++ b/appengine/users/pom.xml @@ -37,7 +37,7 @@ Copyright 2015 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 com.google.guava @@ -72,19 +72,19 @@ Copyright 2015 Google Inc. com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml index f1fb6264ed8..190bfa161d9 100644 --- a/bigquery/cloud-client/pom.xml +++ b/bigquery/cloud-client/pom.xml @@ -40,7 +40,7 @@ com.google.cloud google-cloud-bigquery - 0.34.0-beta + 0.37.0-beta diff --git a/bigquery/datatransfer/cloud-client/pom.xml b/bigquery/datatransfer/cloud-client/pom.xml index c3f4ed4bf5b..d1824ff8cf6 100644 --- a/bigquery/datatransfer/cloud-client/pom.xml +++ b/bigquery/datatransfer/cloud-client/pom.xml @@ -40,7 +40,7 @@ com.google.cloud google-cloud-bigquerydatatransfer - 0.34.0-beta + 0.37.0-beta diff --git a/bigquery/datatransfer/cloud-client/src/main/java/com/example/bigquerydatatransfer/QuickstartSample.java b/bigquery/datatransfer/cloud-client/src/main/java/com/example/bigquerydatatransfer/QuickstartSample.java index 69954ba651c..4091dd7d20e 100644 --- a/bigquery/datatransfer/cloud-client/src/main/java/com/example/bigquerydatatransfer/QuickstartSample.java +++ b/bigquery/datatransfer/cloud-client/src/main/java/com/example/bigquerydatatransfer/QuickstartSample.java @@ -18,10 +18,11 @@ // [START bigquery_datatransfer_quickstart] // Imports the Google Cloud client library + import com.google.cloud.bigquery.datatransfer.v1.DataSource; import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClient; +import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClient.ListDataSourcesPagedResponse; import com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest; -import com.google.cloud.bigquery.datatransfer.v1.PagedResponseWrappers.ListDataSourcesPagedResponse; public class QuickstartSample { /** diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml index 8ce06bf058e..0f0e8dd76cb 100644 --- a/datastore/cloud-client/pom.xml +++ b/datastore/cloud-client/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-datastore - 1.16.0 + 1.19.0 diff --git a/datastore/pom.xml b/datastore/pom.xml index 1f1dfb73196..f70964b03e7 100644 --- a/datastore/pom.xml +++ b/datastore/pom.xml @@ -44,7 +44,7 @@ com.google.cloud google-cloud-datastore - 1.16.0 + 1.19.0 diff --git a/dlp/pom.xml b/dlp/pom.xml index 2cba3cee7d7..3a78ca3846e 100644 --- a/dlp/pom.xml +++ b/dlp/pom.xml @@ -44,7 +44,7 @@ com.google.cloud google-cloud-dlp - 0.34.0-beta + 0.37.0-beta diff --git a/dlp/src/main/java/com/example/dlp/Inspect.java b/dlp/src/main/java/com/example/dlp/Inspect.java index 30f7b2c6901..1d2edf45027 100644 --- a/dlp/src/main/java/com/example/dlp/Inspect.java +++ b/dlp/src/main/java/com/example/dlp/Inspect.java @@ -19,7 +19,6 @@ import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.ServiceOptions; import com.google.cloud.dlp.v2beta1.DlpServiceClient; -import com.google.longrunning.Operation; import com.google.privacy.dlp.v2beta1.BigQueryOptions; import com.google.privacy.dlp.v2beta1.BigQueryTable; import com.google.privacy.dlp.v2beta1.CloudStorageOptions; @@ -241,7 +240,7 @@ private static void inspectGcsFile( // ... // block on response, returning job id of the operation InspectOperationResult inspectOperationResult = responseFuture.get(); - ResultName resultName = inspectOperationResult.getNameAsResultName(); + String resultName = inspectOperationResult.getName(); InspectResult inspectResult = dlpServiceClient.listInspectFindings(resultName).getResult(); if (inspectResult.getFindingsCount() > 0) { @@ -315,7 +314,7 @@ private static void inspectDatastore( // ... // block on response, returning job id of the operation InspectOperationResult inspectOperationResult = responseFuture.get(); - ResultName resultName = inspectOperationResult.getNameAsResultName(); + String resultName = inspectOperationResult.getName(); InspectResult inspectResult = dlpServiceClient.listInspectFindings(resultName).getResult(); if (inspectResult.getFindingsCount() > 0) { @@ -394,7 +393,7 @@ private static void inspectBigquery( // ... // block on response, returning job id of the operation InspectOperationResult inspectOperationResult = responseFuture.get(); - ResultName resultName = inspectOperationResult.getNameAsResultName(); + String resultName = inspectOperationResult.getName(); InspectResult inspectResult = dlpServiceClient.listInspectFindings(resultName).getResult(); if (inspectResult.getFindingsCount() > 0) { diff --git a/errorreporting/pom.xml b/errorreporting/pom.xml index 6bb5fd46895..87c6cecd48a 100644 --- a/errorreporting/pom.xml +++ b/errorreporting/pom.xml @@ -38,7 +38,7 @@ limitations under the License. com.google.cloud google-cloud-errorreporting - 0.34.0-beta + 0.37.0-beta diff --git a/firestore/pom.xml b/firestore/pom.xml index f3df234db3e..dc56cb6e6e4 100644 --- a/firestore/pom.xml +++ b/firestore/pom.xml @@ -45,7 +45,7 @@ com.google.cloud google-cloud-firestore - 0.34.0-beta + 0.37.0-beta diff --git a/flexible/cloud-tasks/pom.xml b/flexible/cloud-tasks/pom.xml index 3cc5dc43b35..6fa6f45fbdf 100644 --- a/flexible/cloud-tasks/pom.xml +++ b/flexible/cloud-tasks/pom.xml @@ -51,7 +51,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml index 8a08c666b31..d6eb0ba0877 100644 --- a/flexible/cloudstorage/pom.xml +++ b/flexible/cloudstorage/pom.xml @@ -52,7 +52,7 @@ com.google.cloud google-cloud-storage - 1.16.0 + 1.19.0 diff --git a/flexible/datastore/pom.xml b/flexible/datastore/pom.xml index 4c1167016f6..6f1b8f570e2 100644 --- a/flexible/datastore/pom.xml +++ b/flexible/datastore/pom.xml @@ -49,7 +49,7 @@ com.google.cloud google-cloud-datastore - 1.16.0 + 1.19.0 diff --git a/flexible/errorreporting/pom.xml b/flexible/errorreporting/pom.xml index bbcb81a947f..8e71fbf36b0 100644 --- a/flexible/errorreporting/pom.xml +++ b/flexible/errorreporting/pom.xml @@ -50,7 +50,7 @@ com.google.cloud google-cloud-errorreporting - 0.34.0-beta + 0.37.0-beta diff --git a/flexible/errorreporting/src/main/java/com/example/flexible/errorreporting/ErrorReportingExample.java b/flexible/errorreporting/src/main/java/com/example/flexible/errorreporting/ErrorReportingExample.java index 4c3583381c2..82cd570d570 100644 --- a/flexible/errorreporting/src/main/java/com/example/flexible/errorreporting/ErrorReportingExample.java +++ b/flexible/errorreporting/src/main/java/com/example/flexible/errorreporting/ErrorReportingExample.java @@ -24,8 +24,6 @@ import com.google.devtools.clouderrorreporting.v1beta1.SourceLocation; import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; @@ -72,7 +70,7 @@ private void logCustomErrorEvent() { .build(); // default project id - ProjectName projectName = ProjectName.create(ServiceOptions.getDefaultProjectId()); + ProjectName projectName = ProjectName.of(ServiceOptions.getDefaultProjectId()); reportErrorsServiceClient.reportErrorEvent(projectName, customErrorEvent); } catch (Exception e) { logger.log(Level.SEVERE, "Exception encountered logging custom event", e); diff --git a/flexible/gaeinfo/pom.xml b/flexible/gaeinfo/pom.xml index 9a432e075d7..f2aaf09559c 100644 --- a/flexible/gaeinfo/pom.xml +++ b/flexible/gaeinfo/pom.xml @@ -42,7 +42,7 @@ Copyright 2017 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 @@ -56,7 +56,7 @@ Copyright 2017 Google Inc. com.squareup.okhttp3 okhttp - 3.9.1 + 3.10.0 diff --git a/flexible/memcache/pom.xml b/flexible/memcache/pom.xml index 4163759e5d6..967b0064703 100644 --- a/flexible/memcache/pom.xml +++ b/flexible/memcache/pom.xml @@ -53,7 +53,7 @@ com.googlecode.xmemcached xmemcached - 2.4.0 + 2.4.2 diff --git a/flexible/pubsub/pom.xml b/flexible/pubsub/pom.xml index 6bc076c7323..73eab429950 100644 --- a/flexible/pubsub/pom.xml +++ b/flexible/pubsub/pom.xml @@ -66,12 +66,12 @@ com.google.cloud google-cloud-pubsub - 0.34.0-beta + 0.37.0-beta com.google.cloud google-cloud-datastore - 1.16.0 + 1.19.0 @@ -79,13 +79,13 @@ com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java b/flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java index 11706cf755d..15ea29be6a4 100644 --- a/flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java +++ b/flexible/pubsub/src/main/java/com/example/flexible/pubsub/PubSubPublish.java @@ -19,8 +19,8 @@ import com.google.cloud.ServiceOptions; import com.google.cloud.pubsub.v1.Publisher; import com.google.protobuf.ByteString; +import com.google.pubsub.v1.ProjectTopicName; import com.google.pubsub.v1.PubsubMessage; -import com.google.pubsub.v1.TopicName; import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -42,7 +42,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) // create a publisher on the topic if (publisher == null) { publisher = Publisher.newBuilder( - TopicName.of(ServiceOptions.getDefaultProjectId(), topicId)) + ProjectTopicName.of(ServiceOptions.getDefaultProjectId(), topicId)) .build(); } // construct a pubsub message from the payload diff --git a/flexible/sparkjava/pom.xml b/flexible/sparkjava/pom.xml index 9825f958381..b3a8b14e54b 100644 --- a/flexible/sparkjava/pom.xml +++ b/flexible/sparkjava/pom.xml @@ -64,7 +64,7 @@ limitations under the License. com.google.cloud google-cloud-datastore - 1.16.0 + 1.19.0 diff --git a/iap/pom.xml b/iap/pom.xml index 4b6f403910d..9340c8111e9 100644 --- a/iap/pom.xml +++ b/iap/pom.xml @@ -63,7 +63,7 @@ com.nimbusds nimbus-jose-jwt - 5.4 + 5.5 diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml index 6e608005636..a4a072740c6 100644 --- a/language/analysis/pom.xml +++ b/language/analysis/pom.xml @@ -39,7 +39,7 @@ limitations under the License. com.google.cloud google-cloud-language - 1.16.0 + 1.19.0 com.google.guava diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml index 6fe3ca48b48..7054f67b252 100644 --- a/language/cloud-client/pom.xml +++ b/language/cloud-client/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-language - 1.16.0 + 1.19.0 com.google.guava diff --git a/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml index a7a8f82d20c..8df32c32f68 100644 --- a/logging/cloud-client/pom.xml +++ b/logging/cloud-client/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-logging - 1.16.0 + 1.19.0 diff --git a/logging/jul/pom.xml b/logging/jul/pom.xml index c02913055ed..52185eadfed 100644 --- a/logging/jul/pom.xml +++ b/logging/jul/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-logging - 1.16.0 + 1.19.0 diff --git a/logging/logback/pom.xml b/logging/logback/pom.xml index 1df3f82efb7..4074bee3517 100644 --- a/logging/logback/pom.xml +++ b/logging/logback/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-logging-logback - 0.34.0-alpha + 0.37.0-alpha diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml index 21d96e04f40..3e5d0d60009 100644 --- a/pubsub/cloud-client/pom.xml +++ b/pubsub/cloud-client/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-pubsub - 0.34.0-beta + 0.37.0-beta diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java index 4fc3a3216c1..1d827850b98 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java @@ -17,13 +17,14 @@ package com.example.pubsub; // [START pubsub_quickstart_create_subscription] + import com.google.api.gax.rpc.ApiException; import com.google.cloud.ServiceOptions; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; +import com.google.pubsub.v1.ProjectSubscriptionName; +import com.google.pubsub.v1.ProjectTopicName; import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.Subscription; -import com.google.pubsub.v1.SubscriptionName; -import com.google.pubsub.v1.TopicName; public class CreatePullSubscriptionExample { @@ -44,10 +45,11 @@ public static void main(String... args) throws Exception { // Your subscription ID eg. "my-sub" String subscriptionId = args[1]; - TopicName topicName = TopicName.of(projectId, topicId); + ProjectTopicName topicName = ProjectTopicName.of(projectId, topicId); // Create a new subscription - SubscriptionName subscriptionName = SubscriptionName.of(projectId, subscriptionId); + ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of( + projectId, subscriptionId); try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) { // create a pull subscription with default acknowledgement deadline (= 10 seconds) Subscription subscription = diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java index 7deccf1c562..d9c2ba9c1e8 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java @@ -18,10 +18,11 @@ // [START pubsub_quickstart_create_topic] // Imports the Google Cloud client library + import com.google.api.gax.rpc.ApiException; import com.google.cloud.ServiceOptions; import com.google.cloud.pubsub.v1.TopicAdminClient; -import com.google.pubsub.v1.TopicName; +import com.google.pubsub.v1.ProjectTopicName; public class CreateTopicExample { @@ -40,7 +41,7 @@ public static void main(String... args) throws Exception { String topicId = args[0]; // Create a new topic - TopicName topic = TopicName.of(projectId, topicId); + ProjectTopicName topic = ProjectTopicName.of(projectId, topicId); try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) { topicAdminClient.createTopic(topic); } catch (ApiException e) { diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java index dc0acf0ca5a..454eeeeae7f 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java @@ -24,8 +24,8 @@ import com.google.cloud.ServiceOptions; import com.google.cloud.pubsub.v1.Publisher; import com.google.protobuf.ByteString; +import com.google.pubsub.v1.ProjectTopicName; import com.google.pubsub.v1.PubsubMessage; -import com.google.pubsub.v1.TopicName; public class PublisherExample { @@ -39,7 +39,7 @@ public static void main(String... args) throws Exception { // topic id, eg. "my-topic" String topicId = args[0]; int messageCount = Integer.parseInt(args[1]); - TopicName topicName = TopicName.of(PROJECT_ID, topicId); + ProjectTopicName topicName = ProjectTopicName.of(PROJECT_ID, topicId); Publisher publisher = null; try { // Create a publisher instance with default settings bound to the topic diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java index 71897b7384c..31eef0d5489 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java @@ -22,8 +22,8 @@ import com.google.cloud.pubsub.v1.AckReplyConsumer; import com.google.cloud.pubsub.v1.MessageReceiver; import com.google.cloud.pubsub.v1.Subscriber; +import com.google.pubsub.v1.ProjectSubscriptionName; import com.google.pubsub.v1.PubsubMessage; -import com.google.pubsub.v1.SubscriptionName; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; @@ -47,7 +47,8 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { public static void main(String... args) throws Exception { // set subscriber id, eg. my-sub String subscriptionId = args[0]; - SubscriptionName subscriptionName = SubscriptionName.of(PROJECT_ID, subscriptionId); + ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of( + PROJECT_ID, subscriptionId); Subscriber subscriber = null; try { // create a subscriber bound to the asynchronous message receiver diff --git a/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java b/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java index bfa268c6911..dfaf1045a4b 100644 --- a/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java +++ b/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java @@ -21,8 +21,8 @@ import com.google.cloud.ServiceOptions; import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.cloud.pubsub.v1.TopicAdminClient; -import com.google.pubsub.v1.SubscriptionName; -import com.google.pubsub.v1.TopicName; +import com.google.pubsub.v1.ProjectSubscriptionName; +import com.google.pubsub.v1.ProjectTopicName; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -133,7 +133,7 @@ private String formatForTest(String name) { private void deleteTestTopic() throws Exception { try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) { - topicAdminClient.deleteTopic(TopicName.of(projectId, topicId)); + topicAdminClient.deleteTopic(ProjectTopicName.of(projectId, topicId)); } catch (IOException e) { System.err.println("Error deleting topic " + e.getMessage()); } @@ -142,7 +142,7 @@ private void deleteTestTopic() throws Exception { private void deleteTestSubscription() throws Exception { try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) { subscriptionAdminClient.deleteSubscription( - SubscriptionName.of(projectId, subscriptionId)); + ProjectSubscriptionName.of(projectId, subscriptionId)); } catch (IOException e) { System.err.println("Error deleting subscription " + e.getMessage()); } diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml index a5fee84cb1a..13cc1e3f339 100644 --- a/spanner/cloud-client/pom.xml +++ b/spanner/cloud-client/pom.xml @@ -33,7 +33,7 @@ limitations under the License. 1.8 1.8 UTF-8 - 0.12.0 + 0.12.2 diff --git a/speech/cloud-client/pom.xml b/speech/cloud-client/pom.xml index 2fdecf10f72..730fd6061b5 100644 --- a/speech/cloud-client/pom.xml +++ b/speech/cloud-client/pom.xml @@ -40,7 +40,7 @@ com.google.cloud google-cloud-speech - 0.35.0-alpha + 0.37.0-alpha diff --git a/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml index d36610279fc..37e05be0061 100644 --- a/storage/cloud-client/pom.xml +++ b/storage/cloud-client/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-storage - 1.16.0 + 1.19.0 diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml index f9d781143e2..bf2ddf99955 100644 --- a/storage/storage-transfer/pom.xml +++ b/storage/storage-transfer/pom.xml @@ -43,7 +43,7 @@ com.google.apis google-api-services-storagetransfer - v1-rev48-1.23.0 + v1-rev50-1.23.0 com.google.guava diff --git a/storage/xml-api/serviceaccount-appengine-sample/pom.xml b/storage/xml-api/serviceaccount-appengine-sample/pom.xml index e5434166401..a39b1e170ec 100644 --- a/storage/xml-api/serviceaccount-appengine-sample/pom.xml +++ b/storage/xml-api/serviceaccount-appengine-sample/pom.xml @@ -112,7 +112,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 diff --git a/translate/cloud-client/pom.xml b/translate/cloud-client/pom.xml index 6c1248734e5..ef09d3288b0 100644 --- a/translate/cloud-client/pom.xml +++ b/translate/cloud-client/pom.xml @@ -40,7 +40,7 @@ com.google.cloud google-cloud-translate - 1.16.0 + 1.19.0 diff --git a/translate/pom.xml b/translate/pom.xml index 3ce5400031a..1328c476618 100644 --- a/translate/pom.xml +++ b/translate/pom.xml @@ -41,7 +41,7 @@ limitations under the License. com.google.cloud google-cloud-translate - 1.16.0 + 1.19.0 junit diff --git a/unittests/pom.xml b/unittests/pom.xml index 2234e715e7c..40427a37562 100644 --- a/unittests/pom.xml +++ b/unittests/pom.xml @@ -29,7 +29,7 @@ com.google.appengine appengine-api-1.0-sdk - 1.9.62 + 1.9.63 javax.servlet @@ -53,19 +53,19 @@ com.google.appengine appengine-testing - 1.9.62 + 1.9.63 test com.google.appengine appengine-api-stubs - 1.9.62 + 1.9.63 test com.google.appengine appengine-tools-sdk - 1.9.62 + 1.9.63 test diff --git a/video/cloud-client/pom.xml b/video/cloud-client/pom.xml index aff8ad27dde..cc8f3cffeed 100644 --- a/video/cloud-client/pom.xml +++ b/video/cloud-client/pom.xml @@ -45,7 +45,7 @@ com.google.cloud google-cloud-video-intelligence - 0.34.0-beta + 0.37.0-beta diff --git a/vision/beta/cloud-client/pom.xml b/vision/beta/cloud-client/pom.xml index 554c53d9849..c0d9e8e893d 100644 --- a/vision/beta/cloud-client/pom.xml +++ b/vision/beta/cloud-client/pom.xml @@ -40,7 +40,7 @@ com.google.cloud google-cloud-vision - 1.16.0 + 1.19.0 diff --git a/vision/cloud-client/pom.xml b/vision/cloud-client/pom.xml index 8d392413ec2..a6bbfc47835 100644 --- a/vision/cloud-client/pom.xml +++ b/vision/cloud-client/pom.xml @@ -40,7 +40,7 @@ com.google.cloud google-cloud-vision - 1.16.0 + 1.19.0 From 1dcc8c0d4d420b12b2c2d8fdc2864b28a3d37a73 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Fri, 2 Mar 2018 17:04:24 -0800 Subject: [PATCH 3/3] Post-GA nits (#1040) * Fixes keyFactory type for ES vs EC keys in HTTP example (MQTT was done before) and adds more comprehensive examples to README * Correct environment variable and improved style in manager examples. --- iot/api-client/manager/README.md | 144 +++++++++++------- .../cloud/iot/examples/HttpExample.java | 2 +- 2 files changed, 89 insertions(+), 57 deletions(-) diff --git a/iot/api-client/manager/README.md b/iot/api-client/manager/README.md index f4b7d3031c7..02271d0bbba 100644 --- a/iot/api-client/manager/README.md +++ b/iot/api-client/manager/README.md @@ -8,6 +8,10 @@ This sample app demonstrates device management for Google Cloud IoT Core. Note that before you can run the sample, you must configure a Google Cloud PubSub topic for Cloud IoT as described in [the parent README](../README.md). +Before running the samples, you can set the `GOOGLE_CLOUD_PROJECT` and +`GOOGLE_APPLICATION_CREDENTIALS` environment variables to avoid passing them to +the sample every time you run it. + ## Setup Run the following command to install the libraries and build the sample with Maven: @@ -24,7 +28,7 @@ The following description summarizes the sample usage: Cloud IoT Core Commandline Example (Device / Registry management): - --cloud_region GCP cloud region. + --cloud_region GCP cloud region (default us-central1). --command Command to run: create-iot-topic create-rsa @@ -58,85 +62,109 @@ run the sample as: Create a PubSub topic, `hello-java`, for the project, `blue-jet-123`: mvn exec:java \ - -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ - -Dexec.args="-project_id=blue-jet-123 \ - -command=create-iot-topic \ - -pubsub_topic=hello-java " + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -command=create-iot-topic \ + -pubsub_topic=hello-java" Create an ES device: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -ec_public_key_file ../ec_public.pem \ - -device_id="java-device-0" -command=create-es + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -cloud_region=us-central1 \ + -registry_name=hello-java \ + -ec_public_key_file ../ec_public.pem \ + -device_id=java-device-0 \ + -command=create-es" Create an RSA device: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -rsa_certificate_file ../rsa_cert.pem \ - -device_id="java-device-1" -command=create-rsa + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -rsa_certificate_file ../rsa_cert.pem \ + -device_id=java-device-1 \ + -command=create-rsa" Create a device without authorization: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -device_id="java-device-3" \ - -command=create-unauth + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -device_id=java-device-3 \ + -command=create-unauth" Create a device registry: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -command=create-registry + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -command=create-registry" Delete a device registry: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -command=delete-registry + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -command=delete-registry" Get a device registry: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -command=get-registry + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -command=get-registry" List devices: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -command=list-devices + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -command=list-devices" List device registries: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -command=list-registries + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -command=list-registries" Patch a device with ES: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -ec_public_key_file ../ec_public.pem \ - -device_id="java-device-1" -command=patch-device-es + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -ec_public_key_file ../ec_public.pem \ + -device_id=java-device-1 -command=patch-device-es" Patch a device with RSA: - java -cp target/cloudiot-manager-demo-1.0-jar-with-dependencies.jar \ - com.example.cloud.iot.examples.DeviceRegistryExample \ - -project_id=blue-jet-123 -pubsub_topic=hello-java \ - -registry_name=hello-java -rsa_certificate_file ../rsa_cert.pem \ - -device_id="java-device-0" -command=patch-device-rsa + mvn exec:java \ + -Dexec.mainClass="com.example.cloud.iot.examples.DeviceRegistryExample" \ + -Dexec.args="-project_id=blue-jet-123 \ + -pubsub_topic=hello-java \ + -registry_name=hello-java \ + -rsa_certificate_file ../rsa_cert.pem \ + -device_id=java-device-0 \ + -command=patch-device-rsa" # Cloud IoT Core Java HTTP example @@ -169,9 +197,9 @@ The following command summarizes the sample usage: -algorithm=" ``` -For example, if your project ID is `blue-jet-123`, your service account -credentials are stored in your home folder in creds.json and you have generated -your credentials using the [`generate_keys.sh`](../generate_keys.sh) script +For example, if your project ID is `blue-jet-123`, the Cloud region associated +with your device registry is europe-west1, and you have generated your +credentials using the [`generate_keys.sh`](../generate_keys.sh) script provided in the parent folder, you can run the sample as: ``` @@ -179,6 +207,7 @@ provided in the parent folder, you can run the sample as: -Dexec.mainClass="com.example.cloud.iot.examples.HttpExample" \ -Dexec.args="-project_id=blue-jet-123 \ -registry_id=my-registry \ + -cloud_region=europe-west1 \ -device_id=my-java-device \ -private_key_file=../rsa_private_pkcs8 \ -algorithm=RS256" @@ -191,6 +220,7 @@ To publish state messages, run the sample as follows: -Dexec.mainClass="com.example.cloud.iot.examples.HttpExample" \ -Dexec.args="-project_id=blue-jet-123 \ -registry_id=my-registry \ + -cloud_region=us-central1 \ -device_id=my-java-device \ -private_key_file=../rsa_private_pkcs8 \ -message_type=state \ @@ -238,19 +268,21 @@ The following command summarizes the sample usage: -Dexec.mainClass="com.example.cloud.iot.examples.MqttExample" \ -Dexec.args="-project_id=my-iot-project \ -registry_id=my-registry \ + -cloud_region=us-central1 \ -device_id=my-device \ -private_key_file=rsa_private_pkcs8 \ -algorithm=RS256" -For example, if your project ID is `blue-jet-123`, your service account -credentials are stored in your home folder in creds.json and you have generated -your credentials using the [`generate_keys.sh`](../generate_keys.sh) script +For example, if your project ID is `blue-jet-123`, your device registry is +located in the `asia-east1` region, and you have generated your +credentials using the [`generate_keys.sh`](../generate_keys.sh) script provided in the parent folder, you can run the sample as: mvn exec:java \ -Dexec.mainClass="com.example.cloud.iot.examples.MqttExample" \ -Dexec.args="-project_id=blue-jet-123 \ -registry_id=my-registry \ + -cloud_region=asia-east1 \ -device_id=my-device \ -private_key_file=../rsa_private_pkcs8 \ -algorithm=RS256" diff --git a/iot/api-client/manager/src/main/java/com/example/cloud/iot/examples/HttpExample.java b/iot/api-client/manager/src/main/java/com/example/cloud/iot/examples/HttpExample.java index 18ad0aa7239..f7eb77e14f0 100644 --- a/iot/api-client/manager/src/main/java/com/example/cloud/iot/examples/HttpExample.java +++ b/iot/api-client/manager/src/main/java/com/example/cloud/iot/examples/HttpExample.java @@ -102,7 +102,7 @@ private static String createJwtEs(String projectId, String privateKeyFile) throw byte[] keyBytes = Files.readAllBytes(Paths.get(privateKeyFile)); PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes); - KeyFactory kf = KeyFactory.getInstance("ES256"); + KeyFactory kf = KeyFactory.getInstance("EC"); return jwtBuilder.signWith(SignatureAlgorithm.ES256, kf.generatePrivate(spec)).compact(); }