Merge branch 'master' into vision-v1p1beta1-samples

Author: nnegrey

README.md

@@ -1,22 +1,15 @@
 # java-docs-samples
 
-[![Circle-CI Build Status](https://circleci.com/gh/GoogleCloudPlatform/java-docs-samples.svg?style=shield&circle-token=117b41ead030b212fc7d519519ee9262c4f3480b)](https://circleci.com/gh/GoogleCloudPlatform/java-docs-samples)
-[![ghit.me](https://ghit.me/badge.svg?repo=GoogleCloudPlatform/java-docs-samples)](https://ghit.me/repo/GoogleCloudPlatform/java-docs-samples)
+![Kokoro Build Status](https://storage.googleapis.com/cloud-devrel-kokoro-resources/java/badges/java-docs-samples.png)
 [![Coverage Status](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples/branch/master/graph/badge.svg)](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples)
 
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=README.md">
+<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
 
 While this library is still supported, we suggest trying the newer [Cloud Client Library](https://developers.google.com/api-client-library/java/apis/vision/v1) for Google Cloud Vision, especially for new projects. For more information, please see the notice on the [API Client Library Page](https://developers.google.com/api-client-library/java/apis/vision/v1).
 
 This is a repository that contains java code snippets on [Cloud Platform Documentation](https://cloud.google.com/docs/).
 
-The repo is organized as follows:
-
-* [App Engine Standard](appengine)
-  * [TaskQueue](taskqueue) <!-- shouldn't this be in appengien ?? -->
-  * [Unit Tests](unittests)
-* [App Engine Flexible](flexible)
-* [Compute Engine](compute)
-
 Technology Samples:
 
 * [Bigquery](bigquery)

appengine-java8/analytics/pom.xml

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.3</version>
+      <version>4.5.4</version>
     </dependency>
 
     <dependency>
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.12.0</version>
+      <version>2.13.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

appengine-java8/datastore/src/test/java/com/example/appengine/TransactionsTest.java

@@ -298,7 +298,7 @@ public void transactionalTaskEnqueuing() throws Exception {
     Transaction txn = datastore.beginTransaction();
     // ...
 
-    queue.add(TaskOptions.Builder.withUrl("/path/to/handler"));
+    queue.add(txn, TaskOptions.Builder.withUrl("/path/to/handler"));
 
     // ...
 

appengine-java8/endpoints-v2-migration/build.gradle

@@ -20,10 +20,10 @@ buildscript {    // Configuration for building
   }
   dependencies {
     // App Engine Gradle plugin
-    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.0.2'
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
 
     // Endpoints Frameworks Gradle plugin
-    classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.3.3'
+    classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2'
   }
 }
 // [END buildscript]

appengine-java8/remote-server/pom.xml

@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.3</version>
+      <version>4.5.4</version>
     </dependency>
 
     <dependency>

appengine-java8/taskqueues-deferred/pom.xml

@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.12.0</version>
+      <version>2.13.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>

appengine/analytics/pom.xml

@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.3</version>
+      <version>4.5.4</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

appengine/endpoints-frameworks-v2/migration-example/build.gradle

@@ -20,10 +20,10 @@ buildscript {    // Configuration for building
   }
   dependencies {
     // App Engine Gradle plugin
-    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.0.2'
+    classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3'
 
     // Endpoints Frameworks Gradle plugin
-    classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.3.3'
+    classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.2'
   }
 }
 // [END buildscript]

appengine/firebase-tictactoe/pom.xml

@@ -55,7 +55,7 @@
        <dependency>
            <groupId>org.mockito</groupId>
            <artifactId>mockito-core</artifactId>
-           <version>2.12.0</version>
+           <version>2.13.0</version>
        </dependency>
        <dependency>
          <groupId>com.google.appengine</groupId>

appengine/pom.xml

@@ -82,8 +82,7 @@
         <module>sockets</module>
 
         <module>static-files</module>
-
-        <module>taskqueue-push</module>
+        <module>taskqueue</module>
         <module>twilio</module>
         <module>urlfetch</module>
         <module>users</module>
@@ -114,7 +113,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.12.0</version>
+            <version>2.13.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>