Merge branch 'master' into autosynth-googleapis

Author: Neenu1995

.github/readme/synth.metadata/synth.metadata

@@ -4,14 +4,14 @@
  "git": {
  "name": ".",
  "remote": "https://github.com/googleapis/java-secretmanager.git",
- "sha": "5b0b3a3f8c952c9706f2da9e75bc077ff8d9f014"
+ "sha": "8aea8aa5c780d10a9eddb7d69cbbbd7ba6849f43"
  }
  },
  {
  "git": {
  "name": "synthtool",
  "remote": "https://github.com/googleapis/synthtool.git",
- "sha": "67f09bf301083798e7220137723222eb00b8f88a"
+ "sha": "b259489b06b25f399768b74b8baa943991f38ea7"
  }
  }
  ]

.github/workflows/ci.yaml

@@ -54,7 +54,18 @@ jobs:
  with:
  java-version: 8
  - run: java -version
- - run: .kokoro/linkage-monitor.sh
+ - name: Install artifacts to local Maven repository
+ run: |
+ source .kokoro/common.sh
+ retry_with_backoff 3 10 \
+ mvn install -B -V \
+ -Dmaven.test.skip -DskipTests=true \
+ -Dclirr.skip=true \
+ -Denforcer.skip=true \
+ -Dmaven.javadoc.skip=true \
+ -Dgcloud.download.skip=true
+ shell: bash
+ - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
  lint:
  runs-on: ubuntu-latest
  steps:

.kokoro/build.sh

@@ -110,8 +110,8 @@ bash .kokoro/coerce_logs.sh
 
 if [[ "${ENABLE_BUILD_COP}" == "true" ]]
 then
- chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop
- ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-secretmanager
+ chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
+ ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-secretmanager
 fi
 
 echo "exiting with ${RETURN_CODE}"

.kokoro/linkage-monitor.sh

@@ -26,4 +26,4 @@ before_action {
  keyname: "docuploader_service_account"
  }
  }
-}
+}

.kokoro/release/publish_javadoc.cfg

@@ -0,0 +1,30 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "STAGING_BUCKET_V2"
+ value: "docs-staging-v2"
+ # Production will be at: 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/java-memcache/.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-cloud-secretmanager
+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
+python3 -m docuploader upload . \
+ --credentials ${CREDENTIALS} \
+ --staging-bucket ${STAGING_BUCKET_V2} \
+ --destination-prefix docfx-

.kokoro/release/publish_javadoc11.sh

@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>libraries-bom</artifactId>
- <version>16.2.1</version>
+ <version>16.3.0</version>
  <type>pom</type>
  <scope>import</scope>
  </dependency>
@@ -46,7 +46,7 @@ If you are using Maven without BOM, add this to your dependencies:
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:16.2.1')
+implementation platform('com.google.cloud:libraries-bom:16.3.0')
 
 compile 'com.google.cloud:google-cloud-secretmanager'
 ```

README.md

@@ -8,7 +8,7 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-shared-config</artifactId>
- <version>0.9.4</version>
+ <version>0.10.0</version>
  </parent>
 
  <name>Google Cloud Secret Manager BOM</name>

google-cloud-secretmanager-bom/pom.xml

@@ -14,7 +14,7 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-shared-config</artifactId>
- <version>0.9.4</version>
+ <version>0.10.0</version>
  </parent>
 
  <developers>