From 075fe70805be0094121b428aba1bc190fa80108e Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot <yoshi-automation@google.com>
Date: Tue, 6 Apr 2021 20:05:15 -0700
Subject: [PATCH] chore: Re-generated to pick up changes from synthtool (#417)

* 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.

* chore(java): detect sample-secrets in build.sh

Fixes #904

Source-Author: Neenu Shaji <Neenu1995@users.noreply.github.com>
Source-Date: Wed Mar 24 15:50:02 2021 -0400
Source-Repo: googleapis/synthtool
Source-Sha: bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef
Source-Link: https://github.com/googleapis/synthtool/commit/bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef

* chore: remove staging bucket v2

not needed since we removed v2 solution - https://github.com/googleapis/synthtool/pull/964

Source-Author: Emily Ball <emilyball@google.com>
Source-Date: Mon Mar 29 14:47:37 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 572ef8f70edd9041f5bcfa71511aed6aecfc2098
Source-Link: https://github.com/googleapis/synthtool/commit/572ef8f70edd9041f5bcfa71511aed6aecfc2098
---
 .github/release-please.yml         | 7 +------
 .kokoro/build.sh                   | 5 +++++
 .kokoro/nightly/java7.cfg          | 7 +++++++
 .kokoro/presubmit/java7.cfg        | 7 +++++++
 .kokoro/release/publish_javadoc.sh | 5 -----
 synth.metadata                     | 4 ++--
 6 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 .kokoro/nightly/java7.cfg
 create mode 100644 .kokoro/presubmit/java7.cfg

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 127277a0..dce2c845 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -1,7 +1,2 @@
 releaseType: java-yoshi
-bumpMinorPreMajor: true
-branches:
-- branch: 1.21.x
-  releaseType: java-yoshi
-  bumpMinorPreMajor: true
-
+bumpMinorPreMajor: true
\ No newline at end of file
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 5566bac3..e4ddb5b7 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -79,6 +79,11 @@ samples)
 
     if [[ -f ${SAMPLES_DIR}/pom.xml ]]
     then
+        for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
+          [[ -f "$FILE" ]] || continue
+          source "$FILE"
+        done
+
         pushd ${SAMPLES_DIR}
         mvn -B \
           -Penable-samples \
diff --git a/.kokoro/nightly/java7.cfg b/.kokoro/nightly/java7.cfg
new file mode 100644
index 00000000..cb24f44e
--- /dev/null
+++ b/.kokoro/nightly/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg
new file mode 100644
index 00000000..cb24f44e
--- /dev/null
+++ b/.kokoro/presubmit/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index 0773cfe8..caa7dddf 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
   exit 1
 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")/../../
 
diff --git a/synth.metadata b/synth.metadata
index ac98e78e..d862197c 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-spanner-jdbc.git",
-        "sha": "b32e7aebd4c8d24d052e4616b5dd7735878e01c3"
+        "sha": "46fd8aad1018962d73c5752d37b89f26290a449c"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "0b064d767537e0675fc053e53fca473c5c701fb8"
+        "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"
       }
     }
   ],