diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh index 341a5567d..9baf701d8 100755 --- 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 index ff9c728d4..d6c229c73 100644 --- 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` `` 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` `` 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 index 979829cd3..818569819 100644 --- 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/appengine-standard-java8/helloworld-gae-javasdk-tools/gradle/wrapper/gradle-wrapper.properties b/appengine-standard-java8/helloworld-gae-javasdk-tools/gradle/wrapper/gradle-wrapper.properties index e8434707b..1505546f0 100644 --- a/appengine-standard-java8/helloworld-gae-javasdk-tools/gradle/wrapper/gradle-wrapper.properties +++ b/appengine-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 index 4b2ee0182..15ee896ed 100644 --- 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. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -53,7 +53,7 @@ limitations under the License. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 @@ -77,40 +77,40 @@ limitations under the License. com.google.appengine appengine-testing - 1.9.84 + 1.9.91 test com.google.appengine appengine-api-stubs - 1.9.84 + 1.9.91 test com.google.appengine appengine-tools-sdk - 1.9.84 + 1.9.91 test com.google.truth truth - 1.1.1 + 1.1.3 test junit junit - 4.13.1 + 4.13.2 test org.mockito mockito-core - 3.7.7 + 4.0.0 test @@ -122,9 +122,9 @@ limitations under the License. - com.google.appengine + com.google.cloud.tools appengine-maven-plugin - 2.3.0 + 2.4.1 myProjectId @@ -161,7 +161,7 @@ limitations under the License. maven-war-plugin - 3.3.1 + 3.3.2 @@ -196,7 +196,7 @@ limitations under the License. maven-enforcer-plugin - 1.4.1 + 3.0.0 enforce-maven diff --git a/appengine-standard-java8/kotlin-appengine-standard/README.md b/appengine-standard-java8/kotlin-appengine-standard/README.md index 2920046b2..530fa6288 100644 --- 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 index 9095ec513..b48693936 100644 --- 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. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -40,7 +40,7 @@ limitations under the License. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 jstl @@ -56,7 +56,7 @@ limitations under the License. org.jetbrains.kotlin kotlin-stdlib - 1.4.21-2 + 1.5.31 @@ -68,7 +68,7 @@ limitations under the License. kotlin-maven-plugin org.jetbrains.kotlin - 1.4.21-2 + 1.5.31 @@ -90,7 +90,7 @@ limitations under the License. org.apache.maven.plugins maven-war-plugin - 3.3.1 + 3.3.2 true false @@ -100,7 +100,7 @@ limitations under the License. com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/appengine-standard-java8/kotlin-sb-appengine-standard/README.md b/appengine-standard-java8/kotlin-sb-appengine-standard/README.md index caab2553a..963a7c585 100644 --- 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 index cd14ee05a..bcb6266b2 100644 --- 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. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 1.8 - 1.4.21-2 + 1.5.31 1.8 1.8 @@ -39,7 +39,7 @@ limitations under the License. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 jstl @@ -49,7 +49,7 @@ limitations under the License. org.springframework.boot spring-boot-starter-web - 2.4.2 + 2.5.5 org.slf4j @@ -126,7 +126,7 @@ limitations under the License. org.apache.maven.plugins maven-war-plugin - 3.3.1 + 3.3.2 true false @@ -137,7 +137,7 @@ limitations under the License. com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/appengine-standard-java8/kotlin-spark-appengine-standard/README.md b/appengine-standard-java8/kotlin-spark-appengine-standard/README.md index adad7e316..4fce96e06 100644 --- 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 index ac8d93ab8..8b600dd12 100644 --- 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. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -38,7 +38,7 @@ limitations under the License. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 jstl @@ -114,7 +114,7 @@ limitations under the License. org.slf4j slf4j-api - 1.7.30 + 1.7.32 @@ -126,7 +126,7 @@ limitations under the License. kotlin-maven-plugin org.jetbrains.kotlin - 1.4.21-2 + 1.5.31 @@ -148,7 +148,7 @@ limitations under the License. org.apache.maven.plugins maven-war-plugin - 3.3.1 + 3.3.2 true @@ -157,7 +157,7 @@ limitations under the License. com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/background/pom.xml b/background/pom.xml index b05fa9312..56daac73e 100644 --- a/background/pom.xml +++ b/background/pom.xml @@ -25,7 +25,7 @@ Copyright 2019 Google LLC com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -39,7 +39,7 @@ Copyright 2019 Google LLC true false false - 9.4.36.v20210114 + 9.4.44.v20210927 @@ -47,18 +47,18 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-firestore - 2.2.0 + 3.0.5 com.google.cloud google-cloud-translate - 1.95.6 + 2.1.1 com.google.cloud google-cloud-pubsub - 1.110.3 + 1.113.7 @@ -71,7 +71,7 @@ Copyright 2019 Google LLC com.google.guava guava - 30.1-jre + 31.0.1-jre compile @@ -91,7 +91,7 @@ Copyright 2019 Google LLC junit junit - 4.13.1 + 4.13.2 test @@ -121,7 +121,7 @@ Copyright 2019 Google LLC com.google.cloud.tools jib-maven-plugin - 2.7.1 + 3.1.4 gcr.io/${gcloud.appId}/background diff --git a/bookshelf-standard/2-structured-data/pom.xml b/bookshelf-standard/2-structured-data/pom.xml index 1ffee1bcf..7f3f8d7ce 100644 --- a/bookshelf-standard/2-structured-data/pom.xml +++ b/bookshelf-standard/2-structured-data/pom.xml @@ -26,7 +26,7 @@ Copyright 2016 Google Inc. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -58,17 +58,17 @@ Copyright 2016 Google Inc. com.google.cloud.sql mysql-socket-factory - 1.2.0 + 1.3.4 mysql mysql-connector-java - 8.0.23 + 8.0.26 com.google.api-client google-api-client-appengine - 1.31.2 + 1.32.1 @@ -78,7 +78,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 @@ -109,14 +109,14 @@ Copyright 2016 Google Inc. com.google.guava guava - 30.1-jre + 31.0.1-jre compile joda-time joda-time - 2.10.9 + 2.10.11 @@ -128,7 +128,7 @@ Copyright 2016 Google Inc. com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/bookshelf-standard/3-binary-data/pom.xml b/bookshelf-standard/3-binary-data/pom.xml index 9c59ee556..5cd18a744 100644 --- a/bookshelf-standard/3-binary-data/pom.xml +++ b/bookshelf-standard/3-binary-data/pom.xml @@ -26,7 +26,7 @@ Copyright 2016 Google Inc. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -60,17 +60,17 @@ Copyright 2016 Google Inc. com.google.cloud.sql mysql-socket-factory - 1.2.0 + 1.3.4 mysql mysql-connector-java - 8.0.23 + 8.0.26 com.google.api-client google-api-client-appengine - 1.31.2 + 1.32.1 @@ -80,7 +80,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 @@ -111,20 +111,20 @@ Copyright 2016 Google Inc. com.google.cloud google-cloud-storage - 1.113.9 + 2.1.7 com.google.guava guava - 30.1-jre + 31.0.1-jre compile joda-time joda-time - 2.10.9 + 2.10.11 @@ -142,7 +142,7 @@ Copyright 2016 Google Inc. com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/bookshelf-standard/4-auth/pom.xml b/bookshelf-standard/4-auth/pom.xml index 160e09a04..f440df5f8 100644 --- a/bookshelf-standard/4-auth/pom.xml +++ b/bookshelf-standard/4-auth/pom.xml @@ -26,7 +26,7 @@ Copyright 2016 Google Inc. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 ../ @@ -61,17 +61,17 @@ Copyright 2016 Google Inc. com.google.cloud.sql mysql-socket-factory - 1.2.0 + 1.3.4 mysql mysql-connector-java - 8.0.23 + 8.0.26 com.google.api-client google-api-client-appengine - 1.31.2 + 1.32.1 @@ -81,7 +81,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 @@ -112,20 +112,20 @@ Copyright 2016 Google Inc. com.google.cloud google-cloud-storage - 1.113.9 + 2.1.7 com.google.guava guava - 30.1-jre + 31.0.1-jre compile joda-time joda-time - 2.10.9 + 2.10.11 @@ -143,7 +143,7 @@ Copyright 2016 Google Inc. com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/bookshelf-standard/5-logging/pom.xml b/bookshelf-standard/5-logging/pom.xml index 1cc1ca73f..1b00a47a5 100644 --- a/bookshelf-standard/5-logging/pom.xml +++ b/bookshelf-standard/5-logging/pom.xml @@ -26,7 +26,7 @@ Copyright 2016 Google Inc. com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 ../ @@ -61,17 +61,17 @@ Copyright 2016 Google Inc. com.google.cloud.sql mysql-socket-factory - 1.2.0 + 1.3.4 mysql mysql-connector-java - 8.0.23 + 8.0.26 com.google.api-client google-api-client-appengine - 1.31.2 + 1.32.1 @@ -81,7 +81,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - 1.9.84 + 1.9.91 @@ -112,20 +112,20 @@ Copyright 2016 Google Inc. com.google.cloud google-cloud-storage - 1.113.9 + 2.1.7 com.google.guava guava - 30.1-jre + 31.0.1-jre compile joda-time joda-time - 2.10.9 + 2.10.11 @@ -143,7 +143,7 @@ Copyright 2016 Google Inc. com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/bookshelf/1-cloud-run/pom.xml b/bookshelf/1-cloud-run/pom.xml index 893c5dc78..9d6a4f5c0 100644 --- a/bookshelf/1-cloud-run/pom.xml +++ b/bookshelf/1-cloud-run/pom.xml @@ -26,7 +26,7 @@ Copyright 2019 Google LLC com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -42,7 +42,7 @@ Copyright 2019 Google LLC true false false - 9.4.36.v20210114 + 9.4.44.v20210927 @@ -57,19 +57,19 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-firestore - 2.2.0 + 3.0.5 joda-time joda-time - 2.10.9 + 2.10.11 com.google.guava guava - 30.1-jre + 31.0.1-jre compile @@ -88,7 +88,7 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-storage - 1.113.9 + 2.1.7 @@ -100,7 +100,7 @@ Copyright 2019 Google LLC commons-io commons-io - 2.8.0 + 2.11.0 @@ -118,7 +118,7 @@ Copyright 2019 Google LLC com.google.cloud.tools jib-maven-plugin - 2.7.1 + 3.1.4 gcr.io/${gcloud.appId}/bookshelf diff --git a/gce/pom.xml b/gce/pom.xml index 6465079f2..3280f12b8 100644 --- a/gce/pom.xml +++ b/gce/pom.xml @@ -26,7 +26,7 @@ Copyright 2019 Google LLC com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -69,13 +69,13 @@ Copyright 2019 Google LLC junit junit - 4.13.1 + 4.13.2 test com.google.guava guava - 30.1-jre + 31.0.1-jre test @@ -97,7 +97,7 @@ Copyright 2019 Google LLC org.eclipse.jetty jetty-maven-plugin - 9.4.36.v20210114 + 9.4.44.v20210927 start-selenium @@ -129,7 +129,7 @@ Copyright 2019 Google LLC com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/helloworld-jsp/build.gradle b/helloworld-jsp/build.gradle index c5b58c3ac..dcbd022ce 100644 --- a/helloworld-jsp/build.gradle +++ b/helloworld-jsp/build.gradle @@ -18,7 +18,7 @@ buildscript { // Configuration for building mavenCentral() } dependencies { - classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.3.0' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.4.2' classpath 'org.akhikhl.gretty:gretty:+' } } diff --git a/helloworld-jsp/gradle/wrapper/gradle-wrapper.properties b/helloworld-jsp/gradle/wrapper/gradle-wrapper.properties index 91a254caf..9e31fe246 100644 --- a/helloworld-jsp/gradle/wrapper/gradle-wrapper.properties +++ b/helloworld-jsp/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/helloworld-jsp/pom.xml b/helloworld-jsp/pom.xml index cb2e635c2..59acfa8c0 100644 --- a/helloworld-jsp/pom.xml +++ b/helloworld-jsp/pom.xml @@ -33,14 +33,14 @@ false 2.3.0 - 9.4.36.v20210114 + 9.4.44.v20210927 com.google.cloud.samples shared-configuration - 1.0.21 + 1.0.23 @@ -61,7 +61,7 @@ com.google.cloud.tools appengine-maven-plugin - 2.4.0 + 2.4.1 myProjectId diff --git a/renovate.json b/renovate.json index 23332644b..51f162575 100644 --- a/renovate.json +++ b/renovate.json @@ -33,5 +33,8 @@ ], "prConcurrentLimit": 0, "rebaseWhen": "never", - "masterIssue": true + "dependencyDashboard": true, + "dependencyDashboardLabels": [ + "type: process" + ] }