chore: Re-generated to pick up changes from synthtool (#1717)

* changes without context

        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.

* build: migrate to flakybot

Source-Author: Justin Beckwith <justin.beckwith@gmail.com>
Source-Date: Thu Jan 28 22:22:38 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: d1bb9173100f62c0cfc8f3138b62241e7f47ca6a
Source-Link: googleapis/synthtool@d1bb917

* build(java): generate docfx yml on release

* feat: generate docfx yml on release

* fix: updates name variable

* fix: remove non needed resource

* fix: update date

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Mon Feb 1 15:24:59 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 5de29e9434b63ea6d7e46dc348521c62969af1a1
Source-Link: googleapis/synthtool@5de29e9

* build(java): run linkage monitor as GitHub action

Source-Author: Tomo Suzuki <suztomo@google.com>
Source-Date: Tue Feb 2 16:20:26 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: e935c9ecb47da0f2e054f5f1845f7cf7c95fa625
Source-Link: googleapis/synthtool@e935c9e

* build(java): update autorelease branch name check

In response to the new multi release branch changes.

Source-Author: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Source-Date: Wed Feb 3 15:06:07 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 140ba24a136c63e7f10a998a63e7898aed63ea7d
Source-Link: googleapis/synthtool@140ba24

* chore: remove leading newline from LICENSE

Co-authored-by: Christopher Wilcox <crwilcox@google.com>

Source-Author: Justin Beckwith <justin.beckwith@gmail.com>
Source-Date: Wed Feb 3 15:37:31 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 27b2d4f4674840628d0b75c5941e89c12af4764f
Source-Link: googleapis/synthtool@27b2d4f

* fix: update repo name

java-memcache set for all accidentally

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Thu Feb 4 10:39:41 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5
Source-Link: googleapis/synthtool@692715c

* build(java): update autorelease script

Noticed the workflow was getting skipped on all the release PRs. Updating due to recent update in release-please branch name.

Source-Author: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Source-Date: Tue Feb 9 19:10:03 2021 -0500
Source-Repo: googleapis/synthtool
Source-Sha: 2414b817065726eae0bc525346c7e874f969369d
Source-Link: googleapis/synthtool@2414b81

* chore: update cloud-rad buckets

doclava v2 => staging
docFX v3 => prod

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Tue Feb 16 17:02:08 2021 -0800
Source-Repo: googleapis/synthtool
Source-Sha: b416a7befcdbc42de41cf387dcf428f894fb812b
Source-Link: googleapis/synthtool@b416a7b

* fix: don't log downloads

@chingor13 This change keeps Maven 3.6.1 and later from spamming our CI logs with page after page of lists of artifacts it's downloading that makes it much harder to find the actual test output.

Source-Author: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Source-Date: Thu Feb 18 19:58:59 2021 +0000
Source-Repo: googleapis/synthtool
Source-Sha: 1aeca92e4a38f47134cb955f52ea76f84f09ff88
Source-Link: googleapis/synthtool@1aeca92

* build: reduce download junk in log files

* fix: less download junk log files

* Update build.sh

Source-Author: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Source-Date: Fri Feb 19 01:42:29 2021 +0000
Source-Repo: googleapis/synthtool
Source-Sha: 6946fd71ae9215b0e7ae188f5057df765ee6d7d2
Source-Link: googleapis/synthtool@6946fd7

Author: yoshi-automation

.github/workflows/auto-release.yaml

@@ -4,7 +4,7 @@ name: auto-release
 jobs:
   approve:
     runs-on: ubuntu-latest
-    if: contains(github.head_ref, 'release-v')
+    if: contains(github.head_ref, 'release-please')
     steps:
     - uses: actions/github-script@v3
       with:
@@ -16,8 +16,8 @@ jobs:
             return;
           }
 
-          // only approve PRs like "chore: release <release version>"
-          if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+          // only approve PRs like "chore(master): release <release version>"
+          if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
             return;
           }
 

.kokoro/build.sh

@@ -29,7 +29,7 @@ echo ${JOB_TYPE}
 
 # attempt to install 3 times with exponential backoff (starting with 10 seconds)
 retry_with_backoff 3 10 \
-  mvn install -B -V \
+  mvn install -B -V -ntp \
     -DskipTests=true \
     -Dclirr.skip=true \
     -Denforcer.skip=true \
@@ -60,6 +60,7 @@ javadoc)
     ;;
 integration)
     mvn -B ${INTEGRATION_TEST_ARGS} \
+      -ntp \
       -Penable-integration-tests \
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
@@ -81,6 +82,7 @@ samples)
         pushd ${SAMPLES_DIR}
         mvn -B \
           -Penable-samples \
+          -ntp \
           -DtrimStackTrace=false \
           -Dclirr.skip=true \
           -Denforcer.skip=true \

.kokoro/dependencies.sh

@@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
 retry_with_backoff 3 10 \
-  mvn install -B -V \
+  mvn install -B -V -ntp \
     -DskipTests=true \
     -Dclirr.skip=true
 
@@ -86,4 +86,4 @@ then
 else
   msg "Errors found. See log statements above."
   exit 1
-fi
+fi

.kokoro/linkage-monitor.sh

@@ -7,10 +7,10 @@ env_vars: {
   value: "docs-staging"
 }
 
+# cloud-rad staging
 env_vars: {
   key: "STAGING_BUCKET_V2"
-  value: "docs-staging-v2"
-  # Production will be at: docs-staging-v2
+  value: "docs-staging-v2-staging"
 }
 
 env_vars: {
@@ -26,7 +26,4 @@ before_action {
       keyname: "docuploader_service_account"
     }
   }
-}
-
-# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
+}

.kokoro/release/publish_javadoc.cfg

@@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \
   --version ${VERSION} \
   --language java
 
-# upload docs
+# upload docs to staging bucket
 python3 -m docuploader upload . \
   --credentials ${CREDENTIALS} \
   --staging-bucket ${STAGING_BUCKET_V2}

.kokoro/release/publish_javadoc.sh

@@ -0,0 +1,30 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# cloud-rad production
+env_vars: {
+  key: "STAGING_BUCKET_V2"
+  value: "docs-staging-v2"
+}
+
+# Configure the docker image for kokoro-trampoline
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/publish_javadoc11.sh"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "docuploader_service_account"
+    }
+  }
+}
+
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"

.kokoro/release/publish_javadoc11.cfg

@@ -0,0 +1,55 @@
+#!/bin/bash
+# Copyright 2021 Google Inc.
+#
+# 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.
+
+set -eo pipefail
+
+if [[ -z "${CREDENTIALS}" ]]; then
+  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
+fi
+
+if [[ -z "${STAGING_BUCKET_V2}" ]]; then
+  echo "Need to set STAGING_BUCKET_V2 environment variable"
+  exit 1
+fi
+
+# work from the git root directory
+pushd $(dirname "$0")/../../
+
+# install docuploader package
+python3 -m pip install gcp-docuploader
+
+# compile all packages
+mvn clean install -B -q -DskipTests=true
+
+export NAME=google-api-client
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+
+# V3 generates docfx yml from javadoc
+# generate yml
+mvn clean site -B -q -P docFX
+
+pushd target/docfx-yml
+
+# create metadata
+python3 -m docuploader create-metadata \
+ --name ${NAME} \
+ --version ${VERSION} \
+ --language java
+
+# upload yml to production bucket
+python3 -m docuploader upload . \
+ --credentials ${CREDENTIALS} \
+ --staging-bucket ${STAGING_BUCKET_V2} \
+ --destination-prefix docfx-

.kokoro/release/publish_javadoc11.sh

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/

LICENSE

@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/google-api-java-client.git",
-        "sha": "f864c6c4a7a2b9c11b719486c86d9c7c5f86389a"
+        "sha": "9c1b449d369b4e09230ff459be42a9145901dcea"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "3816b080296d4d52975079fd26c110dd26ba25af"
+        "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2"
       }
     }
   ],
@@ -38,7 +38,6 @@
     ".kokoro/continuous/java8.cfg",
     ".kokoro/continuous/readme.cfg",
     ".kokoro/dependencies.sh",
-    ".kokoro/linkage-monitor.sh",
     ".kokoro/nightly/common.cfg",
     ".kokoro/nightly/integration.cfg",
     ".kokoro/nightly/java11.cfg",
@@ -70,6 +69,8 @@
     ".kokoro/release/promote.sh",
     ".kokoro/release/publish_javadoc.cfg",
     ".kokoro/release/publish_javadoc.sh",
+    ".kokoro/release/publish_javadoc11.cfg",
+    ".kokoro/release/publish_javadoc11.sh",
     ".kokoro/release/snapshot.cfg",
     ".kokoro/release/snapshot.sh",
     ".kokoro/release/stage.cfg",
@@ -84,4 +85,4 @@
     "samples/snapshot/pom.xml",
     "samples/snippets/pom.xml"
   ]
-}
+}