Remove PowerMock from the Slack GCF sample.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,12 @@ Fixes #issue
 
 > It's a good idea to open an issue first for discussion.
 
+- [ ] I have followed [Sample Format Guide](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/SAMPLE_FORMAT.md)
 - [ ] `pom.xml` parent set to latest `shared-configuration`
 - [ ] Appropriate changes to README are included in PR
 - [ ] API's need to be enabled to test (tell us)
 - [ ] Environment Variables need to be set (ask us to set them)
-- [ ] Tests pass (`mvn -P lint clean verify`)
-  * (Note- `Checkstyle` passing is required; `Spotbugs`, `ErrorProne`, `PMD`, etc. `ERROR`'s are advisory only)
+- [ ] **Tests** pass:   `mvn clean verify` **required**
+- [ ] **Lint**  passes: `mvn -P lint checkstyle:check` **required**
+- [ ] **Static Analysis**:  `mvn -P lint clean compile pmd:cpd-check spotbugs:check` **advisory only**
 - [ ] Please **merge** this PR for me once it is approved.

.kokoro/java11/common.cfg

@@ -14,6 +14,9 @@
 
 # Format: //devtools/kokoro/config/proto/build.proto
 
+# Build timeout of 5 hours
+timeout_mins: 300
+
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java-docs-samples"
 

.kokoro/java8/common.cfg

@@ -14,6 +14,9 @@
 
 # Format: //devtools/kokoro/config/proto/build.proto
 
+# Build timeout of 5 hours
+timeout_mins: 300
+
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java-docs-samples"
 

.kokoro/lint/common.cfg

@@ -0,0 +1,38 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Use the trampoline to bounce the script into docker.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+build_file: "java-docs-samples/.kokoro/trampoline.sh"
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/java-docs-samples/.kokoro/tests/run_lint.sh"
+}
+
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
+
+# Upload logs to result-store
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}

.kokoro/lint/presubmit.cfg

@@ -0,0 +1,21 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "GIT_DIFF"
+    value: "origin/master... ."
+}

.kokoro/static_analysis/common.cfg

@@ -0,0 +1,37 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Use the trampoline to bounce the script into docker.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+build_file: "java-docs-samples/.kokoro/trampoline.sh"
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/java-docs-samples/.kokoro/tests/run_static_analysis.sh"
+}
+
+# Access btlr binaries used in the tests
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr"
+
+# Upload logs to result-store
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}

.kokoro/static_analysis/presubmit.cfg

@@ -0,0 +1,19 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+env_vars: {
+    key: "GIT_DIFF"
+    value: "origin/master... ."
+}

.kokoro/tests/build_cloud_run.sh

@@ -27,7 +27,7 @@ if [ -n "$JIB" ]; then
       --platform=managed \
       --region="${REGION:-us-central1}" \
       --quiet --no-user-output-enabled
-    mvn clean
+    mvn -q -B clean
   }
   trap cleanup EXIT
 
@@ -52,7 +52,7 @@ BASE_IMAGE_SAMPLES=("image-processing" "system-packages")
   # Build the service
   set -x
 
-  mvn jib:build -Dimage="${CONTAINER_IMAGE}" \
+  mvn -q -B jib:build -Dimage="${CONTAINER_IMAGE}" \
     `if [[ "${BASE_IMAGE_SAMPLES[@]}" =~ "${SAMPLE_NAME}" ]]; then echo "-Djib.from.image=${SPECIAL_BASE_IMAGE}"; fi`
 
   gcloud run deploy "${SERVICE_NAME}" \

.kokoro/tests/run_lint.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# `-e` enables the script to automatically fail when a command fails
+# `-o pipefail` sets the exit code to the rightmost comment to exit with a non-zero
+set -eo pipefail
+
+# If on kokoro, add btlr to the path and cd into repo root
+if [ -n "$KOKORO_GFILE_DIR" ]; then
+  bltr_dir="$KOKORO_GFILE_DIR/v0.0.1/"
+  chmod +x "${bltr_dir}"btlr
+  export PATH="$PATH:$bltr_dir"
+  cd github/java-docs-samples || exit
+fi
+
+opts=()
+if [ -n "$GIT_DIFF" ]; then
+  opts+=(
+    "--git-diff"
+    "$GIT_DIFF"
+  )
+fi
+
+btlr "${opts[@]}" run "**/pom.xml" -- mvn -P lint --quiet --batch-mode checkstyle:check

.kokoro/tests/run_static_analysis.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# `-e` enables the script to automatically fail when a command fails
+# `-o pipefail` sets the exit code to the rightmost comment to exit with a non-zero
+set -eo pipefail
+
+# If on kokoro, add btlr to the path and cd into repo root
+if [ -n "$KOKORO_GFILE_DIR" ]; then
+  bltr_dir="$KOKORO_GFILE_DIR/v0.0.1/"
+  chmod +x "${bltr_dir}"btlr
+  export PATH="$PATH:$bltr_dir"
+  cd github/java-docs-samples || exit
+fi
+
+opts=()
+if [ -n "$GIT_DIFF" ]; then
+  opts+=(
+    "--git-diff"
+    "$GIT_DIFF"
+  )
+fi
+
+btlr "${opts[@]}" run "**/pom.xml" -- mvn -P lint --quiet --batch-mode compile pmd:cpd-check spotbugs:check

.kokoro/tests/run_tests.sh

@@ -73,8 +73,11 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then
     source "${KOKORO_GFILE_DIR}/automl_secrets.txt"
     # shellcheck source=src/functions_secrets.txt
     source "${KOKORO_GFILE_DIR}/functions_secrets.txt"
+    # spellcheck source=src/firestore_secrets.txt
+    source "${KOKORO_GFILE_DIR}/firestore_secrets.txt"
     # spellcheck source=src/cts_v4_secrets.txt
     source "${KOKORO_GFILE_DIR}/cts_v4_secrets.txt"
+
     # Activate service account
     gcloud auth activate-service-account \
         --key-file="$GOOGLE_APPLICATION_CREDENTIALS" \
@@ -161,7 +164,7 @@ for file in **/pom.xml; do
     fi
 
     # Use maven to execute the tests for the project.
-    mvn -P lint -q --batch-mode --fail-at-end clean verify \
+    mvn --quiet --batch-mode --fail-at-end clean verify \
        -Dfile.encoding="UTF-8" \
        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
        -Dmaven.test.redirectTestOutputToFile=true \

CONTRIBUTING.md

@@ -3,6 +3,13 @@
 We'd love to accept your patches and contributions to this project. There are
 just a few small guidelines you need to follow.
 
+In this repository, we are looking for patches that:
+* Improve readibility
+* Fix bugs
+* Improve clarity and understandability
+
+If you want to contribute a full sample / tutorial, please consider contributing to our [community pages](https://cloud.google.com/community) [[How To](https://cloud.google.com/community/tutorials/write)] ([code](https://github.com/GoogleCloudPlatform/community)).
+
 ## Contributor License Agreement
 
 Contributions to this project must be accompanied by a Contributor License

SAMPLE_FORMAT.md

@@ -329,7 +329,7 @@ most 4 parameters). In most cases, this is project specific information or the p
 file. For example, project specific information (such as `projectId`) or a `filePath` for an
 external file is acceptable, while a parameter for the type of a file or a specific action is not.
 
-Any declared function parameters should include a no-arg, overloaded function with examples for how
+Any declared function parameters should include a no-arg, main function with examples for how
 the user can initialize the function parameters and call the entrypoint for the snippet. If the
 values for these variables need to be replaced by the user, attempt to make it explicitly clear that
 they are example values only.
@@ -338,7 +338,7 @@ Snippet functions should specify a return type of `void` and avoid returning any
 possible. Instead, show the user how to interact with a returned object programmatically by printing
 some example attributes to the console. 
 ```java
-public static void exampleSnippet() {
+public static void main(main(String[] args) {
     // TODO(developer): Replace these variables before running the sample.
     String projectId = "my-project-id";
     String filePath = "path/to/image.png";

appengine-java11/README.md

@@ -47,11 +47,14 @@ To switch to an Open JDK 11 in a Cloud shell session, you can use:
 ```
 
 ## Java 11 runtime
+One way to deploy to App Engine Java 11 is directly from source.
 
-The simplest way to deploy to App Engine Java 11 is using an executable [Uber JAR][uber-jar]. App Engine will automatically configure the `entrypoint` to run the JAR file.
+* [`springboot-helloworld`](springboot-helloworld): Deploy a spring-boot application from source
+* [`http-server`](http-server): Deploy an http application from source
 
-* [`springboot-helloworld`](springboot-helloworld): Build a fat JAR with Spring Boot
-* [`http-server`](http-server): Build a JAR using the Maven JAR Plugin
+Another way is using the Maven App Engine Plugin to deploy an executable [Uber JAR][uber-jar]. App Engine will automatically configure the `entrypoint` to run the JAR file. Use this method when your application requires dependencies that are located locally, such as the [`appengine-simple-jetty-main`](appengine-simple-jetty-main) artifact.
+
+* [`gaeinfo`](gaeinfo): Build a JAR using the Maven JAR Plugin
 
 In addition, App Engine allows you to execute the `java` command directly in the `app.yaml` `entrypoint` field, so you can further customize your app's startup.
 

appengine-java11/appengine-simple-jetty-main/README.md

@@ -58,7 +58,6 @@ To use the dependency add the entrypoint to your `app.yaml` file. The
 entrypoint field will start the Jetty server and load your `WAR` file.
 ```
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main helloworld.war'
 ```
 

appengine-java11/appengine-simple-jetty-main/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.17</version>
+    <version>1.0.18</version>
   </parent>
 
   <properties>
@@ -29,30 +29,30 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.28.v20200408</version>
+      <version>9.4.30.v20200611</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>9.4.28.v20200408</version>
+      <version>9.4.30.v20200611</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>9.4.28.v20200408</version>
+      <version>9.4.30.v20200611</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-annotations</artifactId>
-      <version>9.4.28.v20200408</version>
+      <version>9.4.30.v20200611</version>
       <type>jar</type>
     </dependency>
     <!-- extra explicit dependency needed because there is a JSP in the sample-->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jsp</artifactId>
-      <version>9.4.28.v20200408</version>
+      <version>9.4.30.v20200611</version>
     </dependency>
   </dependencies>
   <!-- [END gae_java11_server_dependencies] -->
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <goals>

appengine-java11/cloudsql/app.yaml

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 runtime: java11
-instance_class: F1
 entrypoint: 'java -cp "*" com.example.appengine.demo.jettymain.Main cloudsql.war'
 
 env_variables: