From 21829705cc6c009025fcb07507a6a556cbf1d421 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 1 May 2017 16:14:30 -0700 Subject: [PATCH] Auto-update dependencies. (#636) * Auto-update dependencies. * Roll back speech & Vision due to weird GAX issues. Fix for GA Datastore, Storage, and more. * Fix pom.xml Downgrade to prior version. --- .../endpoints-frameworks-v2/backend/pom.xml | 2 +- .../gae-firebase-event-proxy/pom.xml | 4 +- bigquery/cloud-client/pom.xml | 4 +- compute/cmdline/pom.xml | 2 +- datastore/cloud-client/pom.xml | 2 +- datastore/pom.xml | 2 +- .../google/datastore/snippets/TaskList.java | 6 +-- .../datastore/snippets/ConceptsTest.java | 22 +++++----- flexible/analytics/pom.xml | 10 ++--- flexible/async-rest/pom.xml | 31 ++++---------- flexible/cloudsql/pom.xml | 14 +++---- flexible/cloudstorage/pom.xml | 10 ++--- flexible/cron/pom.xml | 8 ++-- flexible/datastore/pom.xml | 10 ++--- .../example/datastore/DatastoreServlet.java | 6 +-- flexible/disk/pom.xml | 8 ++-- flexible/endpoints/pom.xml | 8 ++-- flexible/extending-runtime/pom.xml | 8 ++-- flexible/helloworld/build.gradle | 2 - flexible/helloworld/pom.xml | 8 ++-- flexible/mailgun/pom.xml | 8 ++-- flexible/mailjet/pom.xml | 8 ++-- flexible/memcache/pom.xml | 8 ++-- flexible/pubsub/pom.xml | 41 +++++++++++-------- flexible/sendgrid/pom.xml | 8 ++-- flexible/sparkjava/pom.xml | 8 ++-- .../appengine/sparkdemo/UserServiceTest.java | 4 +- flexible/static-files/pom.xml | 8 ++-- flexible/twilio/pom.xml | 8 ++-- kms/pom.xml | 2 +- language/analysis/pom.xml | 2 +- language/cloud-client/pom.xml | 2 +- logging/cloud-client/pom.xml | 2 +- monitoring/cloud-client/pom.xml | 2 +- monitoring/v3/pom.xml | 2 +- pom.xml | 8 ++-- pubsub/cloud-client/pom.xml | 2 +- spanner/cloud-client/pom.xml | 2 +- .../com/example/spanner/QuickstartSample.java | 2 +- speech/cloud-client/pom.xml | 15 ++++++- storage/cloud-client/pom.xml | 2 +- storage/storage-transfer/pom.xml | 2 +- translate/cloud-client/pom.xml | 2 +- translate/pom.xml | 2 +- vision/cloud-client/pom.xml | 3 +- vision/face-detection/pom.xml | 2 +- vision/label/pom.xml | 2 +- vision/landmark-detection/pom.xml | 2 +- vision/text/pom.xml | 2 +- 49 files changed, 163 insertions(+), 165 deletions(-) diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml index df706d1feeb..cf03c0ab8de 100644 --- a/appengine/endpoints-frameworks-v2/backend/pom.xml +++ b/appengine/endpoints-frameworks-v2/backend/pom.xml @@ -31,7 +31,7 @@ UTF-8 - 2.0.6 + 2.0.7 1.0.3 YOUR_PROJECT_ID 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 77629dcf012..632822e2fd4 100644 --- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml +++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml @@ -64,12 +64,12 @@ com.fasterxml.jackson.core jackson-core - 2.9.0.pr2 + 2.9.0.pr3 com.fasterxml.jackson.core jackson-databind - 2.9.0.pr2 + 2.9.0.pr3 diff --git a/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml index 5a474d6b273..15139bb7d3a 100644 --- a/bigquery/cloud-client/pom.xml +++ b/bigquery/cloud-client/pom.xml @@ -37,12 +37,12 @@ com.google.cloud google-cloud-bigquery - 0.13.0-beta + 0.17.1-beta commons-cli commons-cli - 1.3.1 + 1.4 joda-time diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml index 32365aa38a9..3e87df1f4b0 100644 --- a/compute/cmdline/pom.xml +++ b/compute/cmdline/pom.xml @@ -89,7 +89,7 @@ limitations under the License. - v1-rev143-1.22.0 + v1-rev144-1.22.0 UTF-8 diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml index e941e8efca0..617a98401b1 100644 --- a/datastore/cloud-client/pom.xml +++ b/datastore/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-datastore - 0.13.0-beta + 1.0.0 diff --git a/datastore/pom.xml b/datastore/pom.xml index 4f52caadf2e..d0e23ea174b 100644 --- a/datastore/pom.xml +++ b/datastore/pom.xml @@ -41,7 +41,7 @@ com.google.cloud google-cloud-datastore - 0.13.0-beta + 1.0.0 diff --git a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java index 43af1c2e0d2..fed6fc3fa44 100644 --- a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java +++ b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java @@ -16,9 +16,9 @@ package com.google.datastore.snippets; +import com.google.cloud.Timestamp; import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreOptions; -import com.google.cloud.datastore.DateTime; import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.Key; import com.google.cloud.datastore.KeyFactory; @@ -57,7 +57,7 @@ Key addTask(String description) { Key key = datastore.allocateId(keyFactory.newKey()); Entity task = Entity.newBuilder(key) .set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build()) - .set("created", DateTime.now()) + .set("created", Timestamp.now()) .set("done", false) .build(); datastore.put(task); @@ -131,7 +131,7 @@ static List formatTasks(Iterator tasks) { String.format("%d : %s (done)", task.getKey().getId(), task.getString("description"))); } else { strings.add(String.format("%d : %s (created %s)", task.getKey().getId(), - task.getString("description"), task.getDateTime("created"))); + task.getString("description"), task.getTimestamp("created"))); } } return strings; diff --git a/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java index b388e657d26..928718a8f48 100644 --- a/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java +++ b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java @@ -23,10 +23,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import com.google.cloud.Timestamp; import com.google.cloud.datastore.Cursor; import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreException; -import com.google.cloud.datastore.DateTime; import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.EntityQuery; import com.google.cloud.datastore.FullEntity; @@ -51,7 +51,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; -import org.joda.time.Duration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -60,6 +59,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import org.threeten.bp.Duration; import java.io.IOException; import java.util.ArrayList; @@ -88,9 +88,9 @@ public class ConceptsTest { private KeyFactory keyFactory; private Key taskKey; private Entity testEntity; - private DateTime startDate; - private DateTime endDate; - private DateTime includedDate; + private Timestamp startDate; + private Timestamp endDate; + private Timestamp includedDate; @Rule public ExpectedException thrown = ExpectedException.none(); @@ -121,11 +121,11 @@ public void setUp() { testEntity = Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build(); Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")); calendar.set(1990, JANUARY, 1); - startDate = DateTime.copyFrom(calendar); + startDate = Timestamp.of(calendar.getTime()); calendar.set(2000, JANUARY, 1); - endDate = DateTime.copyFrom(calendar); + endDate = Timestamp.of(calendar.getTime()); calendar.set(1999, DECEMBER, 31); - includedDate = DateTime.copyFrom(calendar); + includedDate = Timestamp.of(calendar.getTime()); } /** @@ -136,7 +136,7 @@ public void setUp() { */ @AfterClass public static void afterClass() throws IOException, InterruptedException, TimeoutException { - HELPER.stop(Duration.standardMinutes(1)); + HELPER.stop(Duration.ofMinutes(1)); } private void assertValidKey(Key taskKey) { @@ -209,7 +209,7 @@ public void testProperties() { // [START properties] Entity task = Entity.newBuilder(taskKey) .set("category", "Personal") - .set("created", DateTime.now()) + .set("created", Timestamp.now()) .set("done", false) .set("priority", 4) .set("percent_complete", 10.0) @@ -752,7 +752,7 @@ public void testExplodingProperties() { Entity task = Entity.newBuilder(taskKey) .set("tags", "fun", "programming", "learn") .set("collaborators", "alice", "bob", "charlie") - .set("created", DateTime.now()) + .set("created", Timestamp.now()) .build(); // [END exploding_properties] assertValidEntity(task); diff --git a/flexible/analytics/pom.xml b/flexible/analytics/pom.xml index ede4af06a43..2d909c9cea6 100644 --- a/flexible/analytics/pom.xml +++ b/flexible/analytics/pom.xml @@ -31,16 +31,12 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 + 1.3.0 + 9.4.4.v20170414 false - - 3.3.9 - - org.apache.httpcomponents @@ -70,7 +66,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/async-rest/pom.xml b/flexible/async-rest/pom.xml index 121d083b84c..c2f45cdb466 100644 --- a/flexible/async-rest/pom.xml +++ b/flexible/async-rest/pom.xml @@ -31,19 +31,20 @@ YOUR_PLACES_APP_KEY - 1.2.1 - 9.3.8.v20160314 + false + + 1.3.0 + 9.4.4.v20170414 1.8 1.8 - false org.eclipse.jetty jetty-maven-plugin - ${jetty.version} + ${jetty} @@ -58,39 +59,23 @@ appengine-maven-plugin ${appengine.maven.plugin} - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - true - false - - - ${basedir}/src/main/webapp/WEB-INF - true - WEB-INF - - - - org.eclipse.jetty jetty-client - ${jetty.version} + ${jetty} org.eclipse.jetty jetty-util-ajax - ${jetty.version} + ${jetty} org.eclipse.jetty jetty-webapp - ${jetty.version} + ${jetty} test diff --git a/flexible/cloudsql/pom.xml b/flexible/cloudsql/pom.xml index 11c835c67af..d8597d1eb06 100644 --- a/flexible/cloudsql/pom.xml +++ b/flexible/cloudsql/pom.xml @@ -41,10 +41,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 jdbc:mysql://google/${database}?cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&socketFactory=com.google.cloud.sql.mysql.SocketFactory&user=${user}&password=${password}&useSSL=false @@ -54,17 +54,17 @@ com.google.api-client google-api-client - 1.21.0 + 1.22.0 com.google.api-client google-api-client-appengine - 1.21.0 + 1.22.0 com.google.api-client google-api-client-servlet - 1.21.0 + 1.22.0 javax.servlet @@ -124,7 +124,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml index 1189db81d20..855e1840bc7 100644 --- a/flexible/cloudstorage/pom.xml +++ b/flexible/cloudstorage/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -49,7 +49,7 @@ com.google.cloud google-cloud-storage - 0.13.0-beta + 1.0.0 @@ -68,7 +68,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/cron/pom.xml b/flexible/cron/pom.xml index 1053175a8ac..0359704f39d 100644 --- a/flexible/cron/pom.xml +++ b/flexible/cron/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -64,7 +64,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/datastore/pom.xml b/flexible/datastore/pom.xml index 3046d50d48e..8faa1fc6451 100644 --- a/flexible/datastore/pom.xml +++ b/flexible/datastore/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -49,7 +49,7 @@ com.google.cloud google-cloud-datastore - 0.13.0-beta + 1.0.0 @@ -68,7 +68,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java b/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java index e4c02b338a2..09d70055b2c 100644 --- a/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java +++ b/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java @@ -16,9 +16,9 @@ package com.example.managedvms.datastore; +import com.google.cloud.Timestamp; import com.google.cloud.datastore.Datastore; import com.google.cloud.datastore.DatastoreOptions; -import com.google.cloud.datastore.DateTime; import com.google.cloud.datastore.Entity; import com.google.cloud.datastore.FullEntity; import com.google.cloud.datastore.IncompleteKey; @@ -64,7 +64,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc // Record a visit to the datastore, storing the IP and timestamp. FullEntity curVisit = FullEntity.newBuilder(key) - .set("user_ip", userIp).set("timestamp", DateTime.now()).build(); + .set("user_ip", userIp).set("timestamp", Timestamp.now()).build(); datastore.add(curVisit); // Retrieve the last 10 visits from the datastore, ordered by timestamp. @@ -77,7 +77,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc out.print("Last 10 visits:\n"); while (results.hasNext()) { Entity entity = results.next(); - out.format("Time: %s Addr: %s\n", entity.getDateTime("timestamp"), + out.format("Time: %s Addr: %s\n", entity.getTimestamp("timestamp"), entity.getString("user_ip")); } } diff --git a/flexible/disk/pom.xml b/flexible/disk/pom.xml index ba69f28749c..90c138e0ce0 100644 --- a/flexible/disk/pom.xml +++ b/flexible/disk/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -61,7 +61,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/endpoints/pom.xml b/flexible/endpoints/pom.xml index 17a01909014..950f9069831 100644 --- a/flexible/endpoints/pom.xml +++ b/flexible/endpoints/pom.xml @@ -19,10 +19,10 @@ 1.8 1.8 - 1.0.0 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -66,7 +66,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/extending-runtime/pom.xml b/flexible/extending-runtime/pom.xml index 1d4a53209e3..ee35994917f 100644 --- a/flexible/extending-runtime/pom.xml +++ b/flexible/extending-runtime/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -61,7 +61,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/helloworld/build.gradle b/flexible/helloworld/build.gradle index 43e91fe617a..fc7ab91cf7e 100644 --- a/flexible/helloworld/build.gradle +++ b/flexible/helloworld/build.gradle @@ -42,8 +42,6 @@ dependencies { // [START gretty] gretty { - port = 8080 - contextPath = '/' servletContainer = 'jetty9' // What App Engine Flexible uses } // [END gretty] diff --git a/flexible/helloworld/pom.xml b/flexible/helloworld/pom.xml index 3c43fb9a9f1..84edb9a7b9c 100644 --- a/flexible/helloworld/pom.xml +++ b/flexible/helloworld/pom.xml @@ -32,10 +32,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 + false - false + 1.3.0 + 9.4.4.v20170414 @@ -69,7 +69,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/mailgun/pom.xml b/flexible/mailgun/pom.xml index d624b1ca4c9..af8ca0e5633 100644 --- a/flexible/mailgun/pom.xml +++ b/flexible/mailgun/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -79,7 +79,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml index a12be479917..a6c06454709 100644 --- a/flexible/mailjet/pom.xml +++ b/flexible/mailjet/pom.xml @@ -31,11 +31,11 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + 1.3.0 + 9.4.4.v20170414 + 4.0.5 @@ -70,7 +70,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/memcache/pom.xml b/flexible/memcache/pom.xml index 4da8e2ca533..aa8cd39c853 100644 --- a/flexible/memcache/pom.xml +++ b/flexible/memcache/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -69,7 +69,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/pubsub/pom.xml b/flexible/pubsub/pom.xml index c0ec8748ab8..b8a934422b0 100644 --- a/flexible/pubsub/pom.xml +++ b/flexible/pubsub/pom.xml @@ -29,13 +29,27 @@ - 1.3.0 1.8 1.8 - false - 9.3.8.v20160314 + + false + + 1.3.0 + 9.4.4.v20170414 + + + + + io.grpc + grpc-core + 1.2.0 + + + + + javax.servlet @@ -49,12 +63,12 @@ com.google.cloud google-cloud-pubsub - 0.13.0-alpha + 0.17.1-alpha com.google.cloud google-cloud-datastore - 0.13.0-beta + 1.0.0 @@ -62,20 +76,16 @@ com.google.appengine appengine-api-stubs - 1.9.38 + 1.9.51 test com.google.appengine appengine-tools-sdk - 1.9.38 + 1.9.51 test - - org.eclipse.jetty - jetty-server - 9.4.3.v20170317 - + junit junit @@ -87,11 +97,6 @@ 1.10.19 test - - org.eclipse.jetty - jetty-servlet - 9.3.14.v20161028 - @@ -108,7 +113,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/sendgrid/pom.xml b/flexible/sendgrid/pom.xml index 1eeea7f01ad..2fe0619908a 100644 --- a/flexible/sendgrid/pom.xml +++ b/flexible/sendgrid/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -68,7 +68,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/sparkjava/pom.xml b/flexible/sparkjava/pom.xml index dd42ad918dd..8739342b25d 100644 --- a/flexible/sparkjava/pom.xml +++ b/flexible/sparkjava/pom.xml @@ -33,7 +33,7 @@ limitations under the License. 1.8 1.8 - 1.2.1 + 1.3.0 ${project.build.directory}/spark-1.0-jar-with-dependencies.jar @@ -41,12 +41,12 @@ limitations under the License. com.sparkjava spark-core - 2.5.5 + 2.6.0.RC0 org.slf4j slf4j-simple - 1.8.0-alpha1 + 1.8.0-alpha2 com.google.code.gson @@ -61,7 +61,7 @@ limitations under the License. com.google.cloud google-cloud-datastore - 0.13.0-beta + 1.0.0 diff --git a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java index 687bbae86cf..410572f9d78 100644 --- a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java +++ b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java @@ -31,11 +31,11 @@ import com.google.cloud.datastore.testing.LocalDatastoreHelper; import com.google.common.collect.Iterators; -import org.joda.time.Duration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.threeten.bp.Duration; import java.io.IOException; import java.util.List; @@ -75,7 +75,7 @@ public void setUp() { @AfterClass public static void afterClass() throws IOException, InterruptedException, TimeoutException { - HELPER.stop(Duration.standardMinutes(1)); + HELPER.stop(Duration.ofMinutes(1)); } @Test diff --git a/flexible/static-files/pom.xml b/flexible/static-files/pom.xml index 93cb679f1f1..5f7b32e077f 100644 --- a/flexible/static-files/pom.xml +++ b/flexible/static-files/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -61,7 +61,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/flexible/twilio/pom.xml b/flexible/twilio/pom.xml index 22c92770a78..5123eb17c81 100644 --- a/flexible/twilio/pom.xml +++ b/flexible/twilio/pom.xml @@ -31,10 +31,10 @@ 1.8 1.8 - 1.2.1 - 9.3.8.v20160314 - false + + 1.3.0 + 9.4.4.v20170414 @@ -68,7 +68,7 @@ org.eclipse.jetty jetty-maven-plugin - ${jetty.maven.plugin} + ${jetty} diff --git a/kms/pom.xml b/kms/pom.xml index 4207d776c84..175be7d7a5f 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -16,7 +16,7 @@ com.google.apis google-api-services-cloudkms - v1-rev6-1.22.0 + v1-rev7-1.22.0 com.google.guava diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml index 75a689f1fc0..94e2238bc56 100644 --- a/language/analysis/pom.xml +++ b/language/analysis/pom.xml @@ -25,7 +25,7 @@ limitations under the License. com.google.cloud google-cloud-language - 0.13.0-beta + 0.17.1-beta com.google.guava diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml index 4720604ab19..193c1f92fa3 100644 --- a/language/cloud-client/pom.xml +++ b/language/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-language - 0.13.0-beta + 0.17.1-beta diff --git a/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml index 91ed47a8ba6..aadce631fff 100644 --- a/logging/cloud-client/pom.xml +++ b/logging/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-logging - 0.13.0-beta + 1.0.0 diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml index 73133db2c1a..ca074cb5828 100644 --- a/monitoring/cloud-client/pom.xml +++ b/monitoring/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-monitoring - 0.13.0-alpha + 0.17.1-alpha diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml index 81812561607..f507a0683bb 100644 --- a/monitoring/v3/pom.xml +++ b/monitoring/v3/pom.xml @@ -81,7 +81,7 @@ com.google.apis google-api-services-monitoring - v3-rev397-1.22.0 + v3-rev399-1.22.0 com.google.code.gson diff --git a/pom.xml b/pom.xml index cd46ab51242..d04690edd50 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,10 @@ com.google.cloud.samples shared-configuration 1.0.2 + + @@ -40,10 +44,6 @@ quickstart-db - - 3.3.9 - - appengine diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml index b0717ceda42..64ab7a1379c 100644 --- a/pubsub/cloud-client/pom.xml +++ b/pubsub/cloud-client/pom.xml @@ -31,7 +31,7 @@ 1.8 1.8 UTF-8 - 0.13.0-alpha + 0.17.1-alpha diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml index fd0259cddfe..fadca89a04d 100644 --- a/spanner/cloud-client/pom.xml +++ b/spanner/cloud-client/pom.xml @@ -52,7 +52,7 @@ limitations under the License. com.google.cloud google-cloud-spanner - 0.13.0-beta + 0.17.1-beta com.google.guava diff --git a/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java b/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java index 6b0fdc69c8c..8904edcbd4c 100644 --- a/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java +++ b/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java @@ -57,7 +57,7 @@ public static void main(String... args) throws Exception { } } finally { // Closes the client which will free up the resources used - spanner.closeAsync().get(); + spanner.closeAsync(); } } } diff --git a/speech/cloud-client/pom.xml b/speech/cloud-client/pom.xml index 6ccbf48580a..88d87f58c28 100644 --- a/speech/cloud-client/pom.xml +++ b/speech/cloud-client/pom.xml @@ -33,12 +33,25 @@ UTF-8 + + + com.google.cloud google-cloud - 0.13.0-alpha + 0.14.0-alpha diff --git a/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml index 6722813d5a0..64a2aef5a46 100644 --- a/storage/cloud-client/pom.xml +++ b/storage/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-storage - 0.13.0-beta + 1.0.0 diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml index 86ab6f63175..54efe031353 100644 --- a/storage/storage-transfer/pom.xml +++ b/storage/storage-transfer/pom.xml @@ -41,7 +41,7 @@ com.google.apis google-api-services-storagetransfer - v1-rev12-1.22.0 + v1-rev13-1.22.0 com.google.guava diff --git a/translate/cloud-client/pom.xml b/translate/cloud-client/pom.xml index be6f633d856..2db68468e79 100644 --- a/translate/cloud-client/pom.xml +++ b/translate/cloud-client/pom.xml @@ -37,7 +37,7 @@ com.google.cloud google-cloud-translate - 0.13.0-beta + 0.17.1-beta diff --git a/translate/pom.xml b/translate/pom.xml index 00cfbd5794d..fe7ee486b01 100644 --- a/translate/pom.xml +++ b/translate/pom.xml @@ -38,7 +38,7 @@ limitations under the License. com.google.cloud google-cloud-translate - 0.13.0-beta + 0.17.1-beta junit diff --git a/vision/cloud-client/pom.xml b/vision/cloud-client/pom.xml index 3f744ea2f34..80e5f9146df 100644 --- a/vision/cloud-client/pom.xml +++ b/vision/cloud-client/pom.xml @@ -38,7 +38,7 @@ com.google.cloud google-cloud-vision - 0.13.0-beta + 0.14.0-beta @@ -49,6 +49,7 @@ 4.12 test + com.google.truth truth diff --git a/vision/face-detection/pom.xml b/vision/face-detection/pom.xml index 46eec9371fe..94fb1ef54f9 100644 --- a/vision/face-detection/pom.xml +++ b/vision/face-detection/pom.xml @@ -39,7 +39,7 @@ com.google.apis google-api-services-vision - v1-rev352-1.22.0 + v1-rev353-1.22.0 com.google.api-client diff --git a/vision/label/pom.xml b/vision/label/pom.xml index 534b4286c5f..88cd4e15e69 100644 --- a/vision/label/pom.xml +++ b/vision/label/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-vision - v1-rev352-1.22.0 + v1-rev353-1.22.0 com.google.api-client diff --git a/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml index 63b2f417d88..029144faf87 100644 --- a/vision/landmark-detection/pom.xml +++ b/vision/landmark-detection/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-vision - v1-rev352-1.22.0 + v1-rev353-1.22.0 com.google.api-client diff --git a/vision/text/pom.xml b/vision/text/pom.xml index 828a81f9c65..e57eb7b5e98 100644 --- a/vision/text/pom.xml +++ b/vision/text/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-vision - v1-rev352-1.22.0 + v1-rev353-1.22.0 com.google.api-client