Merge branch 'master' into autosynth-googleapis

googleapis · Feb 4, 2021 · a1923b4 · a1923b4
2 parents 24387fa + 9bd11d7
commit a1923b4
Show file tree

Hide file tree

Showing 24 changed files with 161 additions and 105 deletions.
diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-speech.git",
-        "sha": "eee21d9fc6273c46779bf5ce822c247bbbc58db2"
+        "sha": "f84ddc2c78f039cb459f72d7efd8b7c64488da25"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "b259489b06b25f399768b74b8baa943991f38ea7"
+        "sha": "5de29e9434b63ea6d7e46dc348521c62969af1a1"
       }
     }
   ]

diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
@@ -17,7 +17,7 @@ jobs:
           }
 
           // only approve PRs like "chore: release <release version>"
-          if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+          if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
             return;
           }
 

diff --git a/.github/workflows/ci.yaml b/.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:

diff --git a/.kokoro/build.sh b/.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-speech
+    chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
+    ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-speech
 fi
 
 echo "exiting with ${RETURN_CODE}"

diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
@@ -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"
+}
diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.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"
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
@@ -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-speech
+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-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### [1.24.11](https://www.github.com/googleapis/java-speech/compare/v1.24.10...v1.24.11) (2021-02-01)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.18.0 ([#401](https://www.github.com/googleapis/java-speech/issues/401)) ([79d5432](https://www.github.com/googleapis/java-speech/commit/79d543248fa811c947cee85f471b0d6b74ed1d3c))
+* update dependency com.google.errorprone:error_prone_annotations to v2.5.1 ([#402](https://www.github.com/googleapis/java-speech/issues/402)) ([bcf9362](https://www.github.com/googleapis/java-speech/commit/bcf93626e34e8727b64216858daa70904e60b757))
+
 ### [1.24.10](https://www.github.com/googleapis/java-speech/compare/v1.24.9...v1.24.10) (2020-12-15)
 
 

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-speech</artifactId>
-  <version>1.24.10</version>
+  <version>1.24.11</version>
 </dependency>
 
 ```
@@ -52,12 +52,12 @@ compile 'com.google.cloud:google-cloud-speech'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-speech:1.24.10'
+compile 'com.google.cloud:google-cloud-speech:1.24.11'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "1.24.10"
+libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "1.24.11"
 ```
 
 ## Authentication

diff --git a/google-cloud-speech-bom/pom.xml b/google-cloud-speech-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-speech-bom</artifactId>
-  <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
+  <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -63,37 +63,37 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-speech</artifactId>
-        <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
+        <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-speech-v1</artifactId>
-        <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-speech-v1:current} -->
+        <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-speech-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-speech-v1beta1</artifactId>
-        <version>0.77.11-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-speech-v1beta1:current} -->
+        <version>0.77.12-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-speech-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-speech-v1p1beta1</artifactId>
-        <version>0.77.11-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-speech-v1p1beta1:current} -->
+        <version>0.77.12-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-speech-v1p1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-speech-v1</artifactId>
-        <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1:current} -->
+        <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-speech-v1beta1</artifactId>
-        <version>0.77.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1beta1:current} -->
+        <version>0.77.12-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-speech-v1p1beta1</artifactId>
-        <version>0.77.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1p1beta1:current} -->
+        <version>0.77.12-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1p1beta1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-speech</artifactId>
-  <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
+  <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Speech</name>
   <url>https://github.com/googleapis/java-speech</url>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-speech-parent</artifactId>
-    <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
+    <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-speech</site.installationModule>

diff --git a/grpc-google-cloud-speech-v1/pom.xml b/grpc-google-cloud-speech-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-speech-v1</artifactId>
-  <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1:current} -->
+  <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1:current} -->
   <name>grpc-google-cloud-speech-v1</name>
   <description>GRPC library for grpc-google-cloud-speech-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-speech-parent</artifactId>
-    <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
+    <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/grpc-google-cloud-speech-v1beta1/pom.xml b/grpc-google-cloud-speech-v1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-speech-v1beta1</artifactId>
-  <version>0.77.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1beta1:current} -->
+  <version>0.77.12-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1beta1:current} -->
   <name>grpc-google-cloud-speech-v1beta1</name>
   <description>GRPC library for grpc-google-cloud-speech-v1beta1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-speech-parent</artifactId>
-    <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
+    <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/grpc-google-cloud-speech-v1p1beta1/pom.xml b/grpc-google-cloud-speech-v1p1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-speech-v1p1beta1</artifactId>
-  <version>0.77.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1p1beta1:current} -->
+  <version>0.77.12-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-speech-v1p1beta1:current} -->
   <name>grpc-google-cloud-speech-v1p1beta1</name>
   <description>GRPC library for grpc-google-cloud-speech-v1p1beta1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-speech-parent</artifactId>
-    <version>1.24.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
+    <version>1.24.12-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
   </parent>
   <dependencies>
     <dependency>