ConnectionMaster · pull · Jan 25, 2021 · Jan 25, 2021 · Feb 2, 2021 · Feb 3, 2021
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -43,9 +43,9 @@ if [[ -z ${JAVA_VERSION+x} ]]; then
 fi
 
 if [[ "$SCRIPT_DEBUG" != "true" ]]; then
-    # Update `gcloud` and log versioning for debugging.
-    gcloud components install beta --quiet
-    gcloud components update --quiet
+    # Update `gcloud` and log versioning for debugging
+    apt update && apt upgrade google-cloud-sdk
+
     echo "********** GCLOUD INFO ***********"
     gcloud -v
     echo "********** MAVEN INFO  ***********"

diff --git a/appengine-standard-java8/helloworld-gae-javasdk-tools/README.md b/appengine-standard-java8/helloworld-gae-javasdk-tools/README.md
@@ -46,17 +46,17 @@ version. Change this field to specify a specific version name.
 ## Maven
 ### Running locally
 
-    mvn clean appengine:devserver
+    mvn clean package appengine:run
 
-To use vist: http://localhost:8080/
+To use visit: http://localhost:8080/
 
 ### Deploying
 
 Update `src/main/webapp/WEB-INF/appengine-web.xml` `<application>` tag with the Project ID.
 
-    mvn clean appengine:update
+    mvn clean package appengine:deploy
 
-To use vist:  https://YOUR-PROJECT-ID.appspot.com
+To use visit:  https://YOUR-PROJECT-ID.appspot.com
 
 ## Gradle
 
@@ -68,7 +68,7 @@ For more information see the [plugin project](https://github.com/GoogleCloudPlat
 
 If you do not have gradle installed, you can run using `./gradlew appengineRun`.
 
-To use vist: http://localhost:8080/
+To use visit: http://localhost:8080/
 
 ### Deploying
 
@@ -78,9 +78,9 @@ Update `src/main/webapp/WEB-INF/appengine-web.xml` `<application>` tag with the
 
 If you do not have gradle installed, you can deploy using `./gradlew appengineDeploy`.
 
-To use vist:  https://1-dot-YOUR-PROJECT-ID.appspot.com
+To use visit:  https://1-dot-YOUR-PROJECT-ID.appspot.com
 
-This is using verison-dot-project naming.
+This is using version-dot-project naming.
 
 ## Testing
 

diff --git a/appengine-standard-java8/helloworld-gae-javasdk-tools/build.gradle b/appengine-standard-java8/helloworld-gae-javasdk-tools/build.gradle
@@ -32,7 +32,7 @@ apply plugin: 'war'                               // standard Web Archive plugin
 apply plugin: 'appengine'  // App Engine tasks
 
 dependencies {
-  appengineSdk 'com.google.appengine:appengine-java-sdk:1.9.53'
+  appengineSdk 'com.google.appengine:appengine-java-sdk:1.9.91'
 
   compile 'com.google.appengine:appengine-api-1.0-sdk:+'  // Latest App Engine Api's
   providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
@@ -43,7 +43,7 @@ dependencies {
 //  compile 'com.google.cloud:google-cloud:+'   // Latest Cloud API's http://googlecloudplatform.github.io/google-cloud-java
 
   testCompile 'junit:junit:4.12'
-  testCompile 'com.google.truth:truth:0.33'
+  testCompile 'com.google.truth:truth:1.1.3'
   testCompile 'org.mockito:mockito-all:1.10.19'
 
   testCompile 'com.google.appengine:appengine-testing:+'

diff --git a/...gine-standard-java8/helloworld-gae-javasdk-tools/gradle/wrapper/gradle-wrapper.properties b/...gine-standard-java8/helloworld-gae-javasdk-tools/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
diff --git a/appengine-standard-java8/helloworld-gae-javasdk-tools/pom.xml b/appengine-standard-java8/helloworld-gae-javasdk-tools/pom.xml
@@ -29,7 +29,7 @@ limitations under the License.
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.23</version>
   </parent>
   <!-- [END_EXCLUDE] -->
 
@@ -53,7 +53,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.84</version>
+      <version>1.9.91</version>
     </dependency>
     <!-- [END api-dependencies] -->
 
@@ -77,40 +77,40 @@ limitations under the License.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-testing</artifactId>
-      <version>1.9.84</version>
+      <version>1.9.91</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-stubs</artifactId>
-      <version>1.9.84</version>
+      <version>1.9.91</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-tools-sdk</artifactId>
-      <version>1.9.84</version>
+      <version>1.9.91</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.7.7</version>
+      <version>4.0.0</version>
       <scope>test</scope>
     </dependency>
     <!-- [END_EXCLUDE] -->
@@ -122,9 +122,9 @@ limitations under the License.
     <plugins>
       <!-- [START gaejavaplugin] -->
       <plugin>
-        <groupId>com.google.appengine</groupId>
+        <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.3.0</version>
+        <version>2.4.1</version>
         <configuration>
           <!-- can be set w/ -DprojectId=myProjectId on command line -->
           <projectId>myProjectId</projectId>
@@ -161,7 +161,7 @@ limitations under the License.
 
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2</version>
       </plugin>
 
       <plugin>
@@ -196,7 +196,7 @@ limitations under the License.
 
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.4.1</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <id>enforce-maven</id>

diff --git a/appengine-standard-java8/kotlin-appengine-standard/README.md b/appengine-standard-java8/kotlin-appengine-standard/README.md
@@ -48,13 +48,13 @@ version. Change this field to specify a specific version name.
 
 `mvn package appengine:run`
 
-To use vist: http://localhost:8080/
+To use visit: http://localhost:8080/
 
 ### Deploying
 
 `mvn package appengine:deploy`
 
-To use vist:  https://YOUR-PROJECT-ID.appspot.com
+To use visit:  https://YOUR-PROJECT-ID.appspot.com
 
 ## Testing
 

diff --git a/appengine-standard-java8/kotlin-appengine-standard/pom.xml b/appengine-standard-java8/kotlin-appengine-standard/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.23</version>
   </parent>
 
   <properties>
@@ -40,7 +40,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.84</version>
+      <version>1.9.91</version>
     </dependency>
     <dependency>
       <groupId>jstl</groupId>
@@ -56,7 +56,7 @@ limitations under the License.
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>1.4.21-2</version>
+      <version>1.5.31</version>
     </dependency>
   </dependencies>
 
@@ -68,7 +68,7 @@ limitations under the License.
       <plugin>
         <artifactId>kotlin-maven-plugin</artifactId>
         <groupId>org.jetbrains.kotlin</groupId>
-        <version>1.4.21-2</version>
+        <version>1.5.31</version>
         <configuration/>
         <executions>
           <execution>
@@ -90,7 +90,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2</version>
         <configuration>
           <archiveClasses>true</archiveClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -100,7 +100,7 @@ limitations under the License.
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <configuration>
           <!-- can be set w/ -DprojectId=myProjectId on command line -->
           <projectId>myProjectId</projectId>

diff --git a/appengine-standard-java8/kotlin-sb-appengine-standard/README.md b/appengine-standard-java8/kotlin-sb-appengine-standard/README.md
@@ -54,7 +54,7 @@ To use visit: http://localhost:8080/
 
 `mvn package appengine:deploy`
 
-To use vist:  https://YOUR-PROJECT-ID.appspot.com
+To use visit:  https://YOUR-PROJECT-ID.appspot.com
 
 ## Testing
 

diff --git a/appengine-standard-java8/kotlin-sb-appengine-standard/pom.xml b/appengine-standard-java8/kotlin-sb-appengine-standard/pom.xml
@@ -25,12 +25,12 @@ limitations under the License.
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.23</version>
   </parent>
 
   <properties>
     <java.version>1.8</java.version>
-    <kotlin.version>1.4.21-2</kotlin.version>
+    <kotlin.version>1.5.31</kotlin.version>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
@@ -39,7 +39,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.84</version>
+      <version>1.9.91</version>
     </dependency>
     <dependency>
       <groupId>jstl</groupId>
@@ -49,7 +49,7 @@ limitations under the License.
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.4.2</version>
+      <version>2.5.5</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -126,7 +126,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2</version>
         <configuration>
           <archiveClasses>true</archiveClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -137,7 +137,7 @@ limitations under the License.
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <configuration>
           <!-- can be set w/ -DprojectId=myProjectId on command line -->
           <projectId>myProjectId</projectId>

diff --git a/appengine-standard-java8/kotlin-spark-appengine-standard/README.md b/appengine-standard-java8/kotlin-spark-appengine-standard/README.md
@@ -50,13 +50,13 @@ version. Change this field to specify a specific version name.
 
 `mvn package appengine:run`
 
-To use vist: http://localhost:8080/
+To use visit: http://localhost:8080/
 
 ### Deploying
 
 `mvn package appengine:deploy`
 
-To use vist:  https://YOUR-PROJECT-ID.appspot.com
+To use visit:  https://YOUR-PROJECT-ID.appspot.com
 
 ## Testing
 

diff --git a/appengine-standard-java8/kotlin-spark-appengine-standard/pom.xml b/appengine-standard-java8/kotlin-spark-appengine-standard/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.23</version>
   </parent>
 
   <properties>
@@ -38,7 +38,7 @@ limitations under the License.
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.9.84</version>
+      <version>1.9.91</version>
     </dependency>
     <dependency>
       <groupId>jstl</groupId>
@@ -114,7 +114,7 @@ limitations under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version> <!-- TEST if not 1.7.25 -->
+      <version>1.7.32</version> <!-- TEST if not 1.7.25 -->
     </dependency>
   </dependencies>
 
@@ -126,7 +126,7 @@ limitations under the License.
       <plugin>
         <artifactId>kotlin-maven-plugin</artifactId>
         <groupId>org.jetbrains.kotlin</groupId>
-        <version>1.4.21-2</version>
+        <version>1.5.31</version>
         <configuration/>
         <executions>
           <execution>
@@ -148,7 +148,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2</version>
         <configuration>
           <archiveClasses>true</archiveClasses>
         </configuration>
@@ -157,7 +157,7 @@ limitations under the License.
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
         <configuration>
           <!-- can be set w/ -DprojectId=myProjectId on command line -->
           <projectId>myProjectId</projectId>