Merge branch 'master' into renovate/google.common-protos.version

googleapis · Nov 10, 2020 · 0b393cd · 0b393cd
2 parents 78056ba + a40c71a
commit 0b393cd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.kokoro/readme.sh b/.kokoro/readme.sh
@@ -28,9 +28,18 @@ echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials
 git config --global credential.helper 'store --file ~/.git-credentials'
 
 python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool
+
+set +e
 python3.6 -m autosynth.synth \
     --repository=googleapis/java-core \
     --synth-file-name=.github/readme/synth.py \
     --metadata-path=.github/readme/synth.metadata \
     --pr-title="chore: regenerate README" \
-    --branch-suffix="readme"
+    --branch-suffix="readme"
+
+# autosynth returns 28 to signal there are no changes
+RETURN_CODE=$?
+if [[ ${RETURN_CODE} -ne 0 && ${RETURN_CODE} -ne 28 ]]
+then
+    exit ${RETURN_CODE}
+fi
diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
@@ -9,7 +9,7 @@ env_vars: {
 
 env_vars: {
   key: "STAGING_BUCKET_V2"
-  value: "docs-staging-v2-staging"
+  value: "docs-staging-v2"
   # Production will be at: docs-staging-v2
 }
 

diff --git a/pom.xml b/pom.xml
@@ -154,10 +154,10 @@
     <gax.version>1.60.0</gax.version>
     <google.api-common.version>1.10.1</google.api-common.version>
     <google.common-protos.version>2.0.1</google.common-protos.version>
-    <google.iam.version>1.0.2</google.iam.version>
+    <google.iam.version>1.0.3</google.iam.version>
     <google.auth.version>0.22.0</google.auth.version>
     <google.api.version>1.30.11</google.api.version>
-    <google.http.version>1.37.0</google.http.version>
+    <google.http.version>1.38.0</google.http.version>
     <grpc.version>1.33.0</grpc.version>
     <protobuf.version>3.13.0</protobuf.version>
     <opencensus.version>0.24.0</opencensus.version>

diff --git a/synth.metadata b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-core.git",
-        "sha": "54924f51efee095dee7f94267a1a436facc4761e"
+        "sha": "4ff835d66de0f7d6d6cc4ab912ea707911731c60"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "b19b401571e77192f8dd38eab5fb2300a0de9324"
+        "sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279"
       }
     }
   ],