diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml new file mode 100644 index 00000000..1a23ea42 --- /dev/null +++ b/.github/blunderbuss.yml @@ -0,0 +1,7 @@ +# Configuration for the Blunderbuss GitHub app. For more info see +# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +assign_prs_by: +- labels: + - samples + to: + - googleapis/java-samples-reviewers \ No newline at end of file diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index f3d6114f..d8ffe635 100644 --- 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-redis.git", - "sha": "4b5d0d779908931a8a82ac1ce53c5dc2adaa7109" + "sha": "5079aea494ee7aefeba9f841f65d9b994b0980c3" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ba9918cd22874245b55734f57470c719b577e591" + "sha": "39b7149da4026765385403632db3c6f63db96b2c" } } ] diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index e2d841d6..7513acae 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index bc1554ae..2b6cdbc9 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-v') steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.kokoro/common.sh b/.kokoro/common.sh index a8d0ea04..ace89f45 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -25,7 +25,6 @@ function retry_with_backoff { # allow a failures to continue set +e - echo "${command}" ${command} exit_code=$? diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 3c482cbc..16126d2e 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -20,19 +20,22 @@ python3 -m pip install gcp-releasetool python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script source $(dirname "$0")/common.sh +source $(dirname "$0")/../common.sh MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ - --settings ${MAVEN_SETTINGS_FILE} \ - -DskipTests=true \ - -DperformRelease=true \ - -Dgpg.executable=gpg \ - -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} +# attempt to stage 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DskipTests=true \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} if [[ -n "${AUTORELEASE_PR}" ]] then diff --git a/CHANGELOG.md b/CHANGELOG.md index d7dae5be..938b63eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.1.6](https://www.github.com/googleapis/java-redis/compare/v1.1.5...v1.1.6) (2020-12-03) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.16.0 ([#277](https://www.github.com/googleapis/java-redis/issues/277)) ([c710a48](https://www.github.com/googleapis/java-redis/commit/c710a48d4e2dd9588e23bf68db54c4f23a5a9179)) + ### [1.1.5](https://www.github.com/googleapis/java-redis/compare/v1.1.4...v1.1.5) (2020-11-17) diff --git a/README.md b/README.md index b5941836..4704a314 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 13.4.0 + 16.1.0 pom import @@ -45,11 +45,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-redis:1.1.4' +compile 'com.google.cloud:google-cloud-redis:1.1.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "1.1.4" +libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "1.1.5" ``` ## Authentication diff --git a/google-cloud-redis-bom/pom.xml b/google-cloud-redis-bom/pom.xml index 1a0cdec4..a7f972b4 100644 --- a/google-cloud-redis-bom/pom.xml +++ b/google-cloud-redis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-redis-bom - 1.1.5 + 1.1.6 pom com.google.cloud @@ -64,27 +64,27 @@ com.google.api.grpc grpc-google-cloud-redis-v1beta1 - 0.86.5 + 0.86.6 com.google.api.grpc grpc-google-cloud-redis-v1 - 1.1.5 + 1.1.6 com.google.api.grpc proto-google-cloud-redis-v1 - 1.1.5 + 1.1.6 com.google.api.grpc proto-google-cloud-redis-v1beta1 - 0.86.5 + 0.86.6 com.google.cloud google-cloud-redis - 1.1.5 + 1.1.6 diff --git a/google-cloud-redis/pom.xml b/google-cloud-redis/pom.xml index aab9faaf..0ccd2579 100644 --- a/google-cloud-redis/pom.xml +++ b/google-cloud-redis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-redis - 1.1.5 + 1.1.6 jar Google Cloud Redis https://github.com/googleapis/java-redis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-redis-parent - 1.1.5 + 1.1.6 google-cloud-redis diff --git a/grpc-google-cloud-redis-v1/pom.xml b/grpc-google-cloud-redis-v1/pom.xml index 946726c6..4c9507d2 100644 --- a/grpc-google-cloud-redis-v1/pom.xml +++ b/grpc-google-cloud-redis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-redis-v1 - 1.1.5 + 1.1.6 grpc-google-cloud-redis-v1 GRPC library for grpc-google-cloud-redis-v1 com.google.cloud google-cloud-redis-parent - 1.1.5 + 1.1.6 diff --git a/grpc-google-cloud-redis-v1beta1/pom.xml b/grpc-google-cloud-redis-v1beta1/pom.xml index 0752da2d..8f82e36c 100644 --- a/grpc-google-cloud-redis-v1beta1/pom.xml +++ b/grpc-google-cloud-redis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-redis-v1beta1 - 0.86.5 + 0.86.6 grpc-google-cloud-redis-v1beta1 GRPC library for grpc-google-cloud-redis-v1beta1 com.google.cloud google-cloud-redis-parent - 1.1.5 + 1.1.6 diff --git a/pom.xml b/pom.xml index 58b4c0e9..a597e7d3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-redis-parent pom - 1.1.5 + 1.1.6 Google Cloud Redis Parent https://github.com/googleapis/java-redis @@ -70,33 +70,33 @@ com.google.api.grpc proto-google-cloud-redis-v1 - 1.1.5 + 1.1.6 com.google.api.grpc proto-google-cloud-redis-v1beta1 - 0.86.5 + 0.86.6 com.google.api.grpc grpc-google-cloud-redis-v1beta1 - 0.86.5 + 0.86.6 com.google.api.grpc grpc-google-cloud-redis-v1 - 1.1.5 + 1.1.6 com.google.cloud google-cloud-redis - 1.1.5 + 1.1.6 com.google.cloud google-cloud-shared-dependencies - 0.15.0 + 0.16.0 pom import diff --git a/proto-google-cloud-redis-v1/pom.xml b/proto-google-cloud-redis-v1/pom.xml index 98c9c11b..8dc21de0 100644 --- a/proto-google-cloud-redis-v1/pom.xml +++ b/proto-google-cloud-redis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-redis-v1 - 1.1.5 + 1.1.6 proto-google-cloud-redis-v1 PROTO library for proto-google-cloud-redis-v1 com.google.cloud google-cloud-redis-parent - 1.1.5 + 1.1.6 diff --git a/proto-google-cloud-redis-v1beta1/pom.xml b/proto-google-cloud-redis-v1beta1/pom.xml index f33aa974..77e5022a 100644 --- a/proto-google-cloud-redis-v1beta1/pom.xml +++ b/proto-google-cloud-redis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-redis-v1beta1 - 0.86.5 + 0.86.6 proto-google-cloud-redis-v1beta1 PROTO library for proto-google-cloud-redis-v1beta1 com.google.cloud google-cloud-redis-parent - 1.1.5 + 1.1.6 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index a7eabc37..59dcd446 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-redis - 1.1.4 + 1.1.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1edb606b..184555bc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-redis - 1.1.4 + 1.1.5 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6773dd1d..48487b3f 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 15.1.0 + 16.1.0 pom import diff --git a/synth.metadata b/synth.metadata index a170033c..e8969c08 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-redis.git", - "sha": "394af4cf5c66c5a984e990ffd7505b961cc9425f" + "sha": "8d2e88736101e196c4cfd4df786cfed7fe4929ea" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7d652819519dfa24da9e14548232e4aaba71a11c" + "sha": "943bb78606d035001123030067dffcc34f4645f2" } } ], @@ -57,6 +57,7 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", + ".github/blunderbuss.yml", ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/release-please.yml", diff --git a/versions.txt b/versions.txt index 7907bd45..6f910f4a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-redis-v1:1.1.5:1.1.5 -proto-google-cloud-redis-v1beta1:0.86.5:0.86.5 -grpc-google-cloud-redis-v1beta1:0.86.5:0.86.5 -grpc-google-cloud-redis-v1:1.1.5:1.1.5 -google-cloud-redis:1.1.5:1.1.5 +proto-google-cloud-redis-v1:1.1.6:1.1.6 +proto-google-cloud-redis-v1beta1:0.86.6:0.86.6 +grpc-google-cloud-redis-v1beta1:0.86.6:0.86.6 +grpc-google-cloud-redis-v1:1.1.6:1.1.6 +google-cloud-redis:1.1.6:1.1.6