chore: update common templates (#216)

* Change triggered by none of the following: This git repo (https://github.com/googleapis/java-storage.git) * docs: clarify documentation on date formats (#196) 9b4af58 commit 9b4af58 Author: johnalowry <jlowry@google.com> Date: Wed Mar 18 17:01:52 2020 -0700 docs: clarify documentation on date formats (#196) System.out.printf("Blob updatetime: %s", blob.getUpdateTime()); The output was Blob updatetime: 1582157090238 I verified that this was ms after epoch: $ date -d @1582157090 Wed 19 Feb 2020 04:04:50 PM PST I also traced the code to this function: https://github.com/googleapis/google-http-java-client/blob/master/google-http-client/src/main/java/com/google/api/client/util/DateTime.java#L53 I assumed that create and delete times used the same format. * chore: use java helper for templates (#195) b0ffd0b commit b0ffd0b Author: Jeff Ching <chingor@google.com> Date: Wed Mar 18 17:04:08 2020 -0700 chore: use java helper for templates (#195) We are cleaning up usage of common templates in synthtool. This allows us the cleanup usage in a centralized place rather than in 60+ repos * deps: update dependency org.threeten:threetenbp to v1.4.2 (#200) 84faad1 commit 84faad1 Author: WhiteSource Renovate <bot@renovateapp.com> Date: Sat Mar 21 03:39:53 2020 +0100 deps: update dependency org.threeten:threetenbp to v1.4.2 (#200) * deps: update dependency com.google.api:api-common to v1.9.0 (#209) 789ceaa commit 789ceaa Author: WhiteSource Renovate <bot@renovateapp.com> Date: Thu Mar 26 00:22:02 2020 +0100 deps: update dependency com.google.api:api-common to v1.9.0 (#209) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.api:api-common](https://togithub.com/googleapis/api-common-java) | minor | `1.8.1` -> `1.9.0` | --- ### Release Notes <details> <summary>googleapis/api-common-java</summary> ### [`v1.9.0`](https://togithub.com/googleapis/api-common-java/releases/v1.9.0) [Compare Source](https://togithub.com/googleapis/api-common-java/compare/v1.8.1...v1.9.0) 03-25-2020 14:09 PST #### New Features - Add `@BetaApi` `ApiFutres.catchingAsync()` ([#117](https://togithub.com/googleapis/api-common-java/pull/117)) ##### Dependencies - Update guava to v28.2-android ([#110](https://togithub.com/googleapis/api-common-java/pull/110)) - Update error_prone_annotations to v2.2.3 ([#111](https://togithub.com/googleapis/api-common-java/pull/111)) </details> --- ### Renovate configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-storage). * samples: fix install-without-bom version (#211) 08750db commit 08750db Author: Jeff Ching <chingor@google.com> Date: Fri Mar 27 15:09:06 2020 -0700 samples: fix install-without-bom version (#211) * samples: fix install-without-bom version * samples: fix snapshot version * samples: fix libraries-bom version * fix: storage-client-lib-docs to right location (#213) 133d137 commit 133d137 Author: Frank Natividad <frankyn@users.noreply.github.com> Date: Fri Mar 27 15:44:02 2020 -0700 fix: storage-client-lib-docs to right location (#213) * deps: update conformance test dep (#210) 010c112 commit 010c112 Author: JesseLovelace <43148100+JesseLovelace@users.noreply.github.com> Date: Fri Mar 27 15:59:00 2020 -0700 deps: update conformance test dep (#210) * Update conformance test dep * Update conformance test dep * chore: fix synth.py error and enable multiple autosynth commits (#215) 2faeb54 commit 2faeb54 Author: Jeff Ching <chingor@google.com> Date: Mon Mar 30 09:56:42 2020 -0700 chore: fix synth.py error and enable multiple autosynth commits (#215) * deps: update dependency com.google.cloud.samples:shared-configuration to v1.0.14 (#207) be74072 commit be74072 Author: WhiteSource Renovate <bot@renovateapp.com> Date: Mon Mar 30 22:25:27 2020 +0200 deps: update dependency com.google.cloud.samples:shared-configuration to v1.0.14 (#207)
googleapis · Apr 1, 2020 · b5dce9e · b5dce9e
1 parent 7beb99d
commit b5dce9e
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 25 deletions.
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -20,17 +20,22 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 ## cd to the parent directory, i.e. the root of the git repo
 cd ${scriptDir}/..
 
+# include common functions
+source ${scriptDir}/common.sh
+
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true \
-  -Denforcer.skip=true \
-  -Dmaven.javadoc.skip=true \
-  -Dgcloud.download.skip=true \
-  -T 1C
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true \
+    -T 1C
 
 # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
 if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then

diff --git a/.kokoro/common.sh b/.kokoro/common.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright 2020 Google LLC
+#
+# 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
+
+function retry_with_backoff {
+    attempts_left=$1
+    sleep_seconds=$2
+    shift 2
+    command=$@
+
+    echo "${command}"
+    ${command}
+    exit_code=$?
+
+    if [[ $exit_code == 0 ]]
+    then
+        return 0
+    fi
+
+    # failure
+    if [[ ${attempts_left} > 0 ]]
+    then
+        echo "failure (${exit_code}), sleeping ${sleep_seconds}..."
+        sleep ${sleep_seconds}
+        new_attempts=$((${attempts_left} - 1))
+        new_sleep=$((${sleep_seconds} * 2))
+        retry_with_backoff ${new_attempts} ${new_sleep} ${command}
+    fi
+
+    return $exit_code
+}
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
@@ -15,7 +15,13 @@
 
 set -eo pipefail
 
-cd github/java-storage/
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
 
 # Print out Java
 java -version
@@ -24,8 +30,9 @@ echo $JOB_TYPE
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
@@ -17,18 +17,26 @@ set -eo pipefail
 # Display commands being run.
 set -x
 
-cd github/java-storage/
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
 
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true \
-  -Denforcer.skip=true \
-  -Dmaven.javadoc.skip=true \
-  -Dgcloud.download.skip=true
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true
 
 # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
 JAR=linkage-monitor-latest-all-deps.jar

diff --git a/renovate.json b/renovate.json
@@ -56,7 +56,9 @@
     },
     {
       "packagePatterns": [
-        "^com.google.cloud:libraries-bom"
+        "^com.google.cloud:google-cloud-storage",
+        "^com.google.cloud:libraries-bom",
+        "^com.google.cloud.samples:shared-configuration"
       ],
       "semanticCommitType": "chore",
       "semanticCommitScope": "deps"
@@ -75,4 +77,4 @@
     }
   ],
   "semanticCommits": true
-}
+}
diff --git a/synth.metadata b/synth.metadata
@@ -1,11 +1,11 @@
 {
-  "updateTime": "2020-03-17T18:53:43.239577Z",
+  "updateTime": "2020-03-30T22:54:24.805818Z",
   "sources": [
     {
-      "template": {
-        "name": "java_library",
-        "origin": "synthtool.gcp",
-        "version": "2020.2.4"
+      "git": {
+        "name": "synthtool",
+        "remote": "https://github.com/googleapis/synthtool.git",
+        "sha": "a003d8655d3ebec2bbbd5fc3898e91e152265c67"
       }
     }
   ]