From 59fd2733ab79b7e55896cbbc01733c6c87c3cfdf Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 18:46:35 +0000 Subject: [PATCH 1/6] chore: release 2.1.6-SNAPSHOT (#1037) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- gapic-google-cloud-storage-v2/pom.xml | 4 ++-- google-cloud-storage/pom.xml | 4 ++-- grpc-google-cloud-storage-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-storage-v2/pom.xml | 4 ++-- versions.txt | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gapic-google-cloud-storage-v2/pom.xml b/gapic-google-cloud-storage-v2/pom.xml index ea2b93c9d..be840fb83 100644 --- a/gapic-google-cloud-storage-v2/pom.xml +++ b/gapic-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc gapic-google-cloud-storage-v2 - 2.1.5-alpha + 2.1.6-alpha-SNAPSHOT gapic-google-cloud-storage-v2 GRPC library for gapic-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.5 + 2.1.6-SNAPSHOT diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index ebd18ebc1..9d807d843 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-storage - 2.1.5 + 2.1.6-SNAPSHOT jar Google Cloud Storage https://github.com/googleapis/java-storage @@ -12,7 +12,7 @@ com.google.cloud google-cloud-storage-parent - 2.1.5 + 2.1.6-SNAPSHOT google-cloud-storage diff --git a/grpc-google-cloud-storage-v2/pom.xml b/grpc-google-cloud-storage-v2/pom.xml index 9dc9df311..9df0acf92 100644 --- a/grpc-google-cloud-storage-v2/pom.xml +++ b/grpc-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-storage-v2 - 2.1.5-alpha + 2.1.6-alpha-SNAPSHOT grpc-google-cloud-storage-v2 GRPC library for grpc-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.5 + 2.1.6-SNAPSHOT diff --git a/pom.xml b/pom.xml index 77e81cbb9..0bcf56053 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-storage-parent pom - 2.1.5 + 2.1.6-SNAPSHOT Storage Parent https://github.com/googleapis/java-storage @@ -93,17 +93,17 @@ com.google.api.grpc proto-google-cloud-storage-v2 - 2.1.5-alpha + 2.1.6-alpha-SNAPSHOT com.google.api.grpc grpc-google-cloud-storage-v2 - 2.1.5-alpha + 2.1.6-alpha-SNAPSHOT com.google.api.grpc gapic-google-cloud-storage-v2 - 2.1.5-alpha + 2.1.6-alpha-SNAPSHOT com.google.cloud diff --git a/proto-google-cloud-storage-v2/pom.xml b/proto-google-cloud-storage-v2/pom.xml index 9cb6a94c6..a3a311b73 100644 --- a/proto-google-cloud-storage-v2/pom.xml +++ b/proto-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-storage-v2 - 2.1.5-alpha + 2.1.6-alpha-SNAPSHOT proto-google-cloud-storage-v2 PROTO library for proto-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.5 + 2.1.6-SNAPSHOT diff --git a/versions.txt b/versions.txt index 7be257a6c..d9c52b05a 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-storage:2.1.5:2.1.5 -gapic-google-cloud-storage-v2:2.1.5-alpha:2.1.5-alpha -grpc-google-cloud-storage-v2:2.1.5-alpha:2.1.5-alpha -proto-google-cloud-storage-v2:2.1.5-alpha:2.1.5-alpha +google-cloud-storage:2.1.5:2.1.6-SNAPSHOT +gapic-google-cloud-storage-v2:2.1.5-alpha:2.1.6-alpha-SNAPSHOT +grpc-google-cloud-storage-v2:2.1.5-alpha:2.1.6-alpha-SNAPSHOT +proto-google-cloud-storage-v2:2.1.5-alpha:2.1.6-alpha-SNAPSHOT From b49d5798e527c9d3280caad852a3afb528bdd847 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 23 Sep 2021 02:30:56 +0200 Subject: [PATCH 2/6] chore(deps): update dependency com.google.cloud:google-cloud-storage to v2.1.5 (#1038) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index a259ce887..1690c2f4d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-storage - 2.1.4 + 2.1.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 9f3266527..cd1a26d92 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-storage - 2.1.4 + 2.1.5 From d6d95456f1e300ca4a9dc4b1c47940dea7b3a82a Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Thu, 23 Sep 2021 17:02:35 -0400 Subject: [PATCH 3/6] test: retry conformance tests fixes, round 2 (#1040) * test: fix setup for hmacKey create * test: fix setup for bucket patch * test: cleanup bucket.lockRetentionPolicy mapping * Add precondition predicate to mapping with IfMetagenerationMatch and remove mapping with no guard. Metageneration is a required argument. * test: fix mappings for ReadChannel ReadChannel wrap any exceptions in an IOException, and doesn't extract the cause from the RetryHelperException * test: fix mappings hmacKey.delete As part of setup for delete we need to set the key to inactive * test: individualMapping(int) -> specificMappings(int...) --- .../conformance/retry/CtxFunctions.java | 12 +- .../retry/ITRetryConformanceTest.java | 10 +- .../conformance/retry/RpcMethodMappings.java | 120 +++++++++++------- .../storage/conformance/retry/State.java | 2 +- 4 files changed, 92 insertions(+), 52 deletions(-) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/CtxFunctions.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/CtxFunctions.java index 57121451a..5bf0c22bd 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/CtxFunctions.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/CtxFunctions.java @@ -27,6 +27,7 @@ import com.google.cloud.storage.BlobInfo; import com.google.cloud.storage.Bucket; import com.google.cloud.storage.BucketInfo; +import com.google.cloud.storage.HmacKey; import com.google.cloud.storage.ServiceAccount; import com.google.cloud.storage.conformance.retry.Functions.CtxFunction; import com.google.common.base.Joiner; @@ -97,11 +98,16 @@ static final class ResourceSetup { Blob resolvedBlob = ctx.getStorage().create(blobInfo); return ctx.map(s -> s.with(resolvedBlob)); }; - private static final CtxFunction serviceAccount = + static final CtxFunction serviceAccount = (ctx, c) -> ctx.map(s -> s.with(ServiceAccount.of(c.getServiceAccountSigner().getAccount()))); - private static final CtxFunction hmacKey = - (ctx, c) -> ctx.map(s -> s.with(ctx.getStorage().createHmacKey(s.getServiceAccount()))); + static final CtxFunction hmacKey = + (ctx, c) -> + ctx.map( + s -> { + HmacKey hmacKey1 = ctx.getStorage().createHmacKey(s.getServiceAccount()); + return s.withHmacKey(hmacKey1).with(hmacKey1.getMetadata()); + }); private static final CtxFunction processResources = (ctx, c) -> { diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java index 73f15112b..59510de70 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java @@ -32,6 +32,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.protobuf.util.JsonFormat; import java.io.IOException; import java.io.InputStream; @@ -40,6 +41,7 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -332,10 +334,12 @@ static BiPredicate includeAll() { /** * Filtering predicate in which only those test cases which match up to the specified {@code - * mappingId} will be included and run. + * mappingIds} will be included and run. */ - static BiPredicate individualMapping(int mappingId) { - return (m, c) -> c.getMappingId() == mappingId; + static BiPredicate specificMappings(int... mappingIds) { + ImmutableSet set = + Arrays.stream(mappingIds).boxed().collect(ImmutableSet.toImmutableSet()); + return (m, c) -> set.contains(c.getMappingId()); } static final class Builder { diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java index 9be505400..af756b6ae 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/RpcMethodMappings.java @@ -20,17 +20,22 @@ import static com.google.cloud.storage.conformance.retry.CtxFunctions.Local.blobInfoWithGenerationZero; import static com.google.cloud.storage.conformance.retry.CtxFunctions.Local.blobInfoWithoutGeneration; import static com.google.cloud.storage.conformance.retry.CtxFunctions.Local.bucketInfo; +import static com.google.cloud.storage.conformance.retry.CtxFunctions.ResourceSetup.defaultSetup; +import static com.google.cloud.storage.conformance.retry.CtxFunctions.ResourceSetup.serviceAccount; import static com.google.common.base.Predicates.not; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertTrue; +import com.google.cloud.BaseServiceException; import com.google.cloud.Policy; import com.google.cloud.ReadChannel; +import com.google.cloud.RetryHelper.RetryHelperException; import com.google.cloud.WriteChannel; import com.google.cloud.storage.Acl.User; import com.google.cloud.storage.Blob; import com.google.cloud.storage.Bucket; +import com.google.cloud.storage.HmacKey.HmacKeyMetadata; import com.google.cloud.storage.HmacKey.HmacKeyState; import com.google.cloud.storage.HttpMethod; import com.google.cloud.storage.Storage; @@ -71,6 +76,7 @@ import com.google.errorprone.annotations.Immutable; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.OutputStream; import java.net.URL; import java.nio.ByteBuffer; @@ -535,15 +541,14 @@ private static void patch(ArrayList a) { RpcMethodMapping.newBuilder(122, buckets.patch) .withApplicable(TestRetryConformance::isPreconditionsProvided) .withTest( - bucketInfo.andThen( - (ctx, c) -> - ctx.map( - state -> - state.with( - ctx.getStorage() - .update( - state.getBucketInfo(), - BucketTargetOption.metagenerationMatch()))))) + (ctx, c) -> + ctx.map( + state -> + state.with( + ctx.getStorage() + .update( + state.getBucket(), + BucketTargetOption.metagenerationMatch())))) .build()); a.add( RpcMethodMapping.newBuilder(101, buckets.patch) @@ -589,30 +594,18 @@ private static void lockRetentionPolicy(ArrayList a) { state.getBucketInfo(), BucketTargetOption.metagenerationMatch()))))) .build()); - a.add( - RpcMethodMapping.newBuilder(99, buckets.lockRetentionPolicy) - .withTest( - bucketInfo - .andThen(Rpc.bucket) - .andThen( - (ctx, c) -> - ctx.map( - state -> state.with(state.getBucket().lockRetentionPolicy())))) - .build()); a.add( RpcMethodMapping.newBuilder(100, buckets.lockRetentionPolicy) + .withApplicable(TestRetryConformance::isPreconditionsProvided) .withTest( - bucketInfo - .andThen(Rpc.bucket) - .andThen( - (ctx, c) -> - ctx.map( - state -> - state.with( - state - .getBucket() - .lockRetentionPolicy( - BucketTargetOption.metagenerationMatch()))))) + (ctx, c) -> + ctx.map( + state -> + state.with( + state + .getBucket() + .lockRetentionPolicy( + BucketTargetOption.metagenerationMatch())))) .build()); } @@ -784,6 +777,22 @@ static final class HmacKey { private static void delete(ArrayList a) { a.add( RpcMethodMapping.newBuilder(26, hmacKey.delete) + .withSetup( + defaultSetup.andThen( + (ctx, c) -> + ctx.map( + state -> { + Storage storage = ctx.getStorage(); + HmacKeyMetadata metadata = state.getHmacKey().getMetadata(); + // for delete we're only using the metadata, clear the key that + // was populated + // in defaultSetup and specify the updated metadata + return state + .withHmacKey(null) + .with( + storage.updateHmacKeyState( + metadata, HmacKeyState.INACTIVE)); + }))) .withTest( (ctx, c) -> ctx.map( @@ -791,7 +800,7 @@ private static void delete(ArrayList a) { state.consume( () -> ctx.getStorage() - .deleteHmacKey(state.getHmacKey().getMetadata())))) + .deleteHmacKey(state.getHmacKeyMetadata())))) .build()); } @@ -835,11 +844,12 @@ private static void update(ArrayList a) { private static void create(ArrayList a) { a.add( RpcMethodMapping.newBuilder(25, hmacKey.create) + .withSetup(defaultSetup.andThen(serviceAccount)) .withTest( (ctx, c) -> ctx.map( state -> - state.with( + state.withHmacKey( ctx.getStorage().createHmacKey(state.getServiceAccount())))) .build()); } @@ -1130,11 +1140,21 @@ private static void get(ArrayList a) { (ctx, c) -> ctx.peek( state -> { - ReadChannel reader = - ctx.getStorage().reader(ctx.getState().getBlobId()); - WritableByteChannel write = - Channels.newChannel(NullOutputStream.INSTANCE); - ByteStreams.copy(reader, write); + try { + ReadChannel reader = + ctx.getStorage().reader(ctx.getState().getBlobId()); + WritableByteChannel write = + Channels.newChannel(NullOutputStream.INSTANCE); + ByteStreams.copy(reader, write); + } catch (IOException e) { + if (e.getCause() instanceof RetryHelperException) { + RetryHelperException cause = + (RetryHelperException) e.getCause(); + if (cause.getCause() instanceof BaseServiceException) { + throw cause.getCause(); + } + } + } }))) .build()); a.add( @@ -1144,14 +1164,24 @@ private static void get(ArrayList a) { (ctx, c) -> ctx.peek( state -> { - ReadChannel reader = - ctx.getStorage() - .reader( - ctx.getState().getBlobId().getBucket(), - ctx.getState().getBlobId().getName()); - WritableByteChannel write = - Channels.newChannel(NullOutputStream.INSTANCE); - ByteStreams.copy(reader, write); + try { + ReadChannel reader = + ctx.getStorage() + .reader( + ctx.getState().getBlobId().getBucket(), + ctx.getState().getBlobId().getName()); + WritableByteChannel write = + Channels.newChannel(NullOutputStream.INSTANCE); + ByteStreams.copy(reader, write); + } catch (IOException e) { + if (e.getCause() instanceof RetryHelperException) { + RetryHelperException cause = + (RetryHelperException) e.getCause(); + if (cause.getCause() instanceof BaseServiceException) { + throw cause.getCause(); + } + } + } }))) .build()); a.add( diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/State.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/State.java index dd0fcebc6..8dafa7c17 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/State.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/State.java @@ -211,7 +211,7 @@ public HmacKey getHmacKey() { return getValue(KEY_HMAC_KEY); } - public State with(HmacKey hmacKey) { + public State withHmacKey(HmacKey hmacKey) { return newStateWith(KEY_HMAC_KEY, hmacKey); } From 3f49ae6f9fb3b1eb7cc3e6b62103900edd348ddc Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 24 Sep 2021 11:44:31 -0700 Subject: [PATCH 4/6] chore(java): remove dependencyDashboardLabel config from renovate.json (#1042) Source-Author: Neenu Shaji Source-Date: Thu Sep 23 14:36:33 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 0752ff727a19a467dffed335d5e59303689cf0d1 Source-Link: https://github.com/googleapis/synthtool/commit/0752ff727a19a467dffed335d5e59303689cf0d1 --- renovate.json | 5 +---- synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/renovate.json b/renovate.json index 2c84ceb06..f249b081c 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } diff --git a/synth.metadata b/synth.metadata index 41ac5ab85..56fd80e98 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-storage.git", - "sha": "c339b721d88e533c441e15d18287adb83b418581" + "sha": "d6d95456f1e300ca4a9dc4b1c47940dea7b3a82a" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" + "sha": "0752ff727a19a467dffed335d5e59303689cf0d1" } } ], From d6a0542f5fd290a0bdc2755f81a49f55724662b2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 24 Sep 2021 22:40:43 +0200 Subject: [PATCH 5/6] deps: update kms.version to v0.92.2 (#1039) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.api.grpc:proto-google-cloud-kms-v1](https://togithub.com/googleapis/java-kms) | `0.92.1` -> `0.92.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-cloud-kms-v1/0.92.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-cloud-kms-v1/0.92.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-cloud-kms-v1/0.92.2/compatibility-slim/0.92.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-cloud-kms-v1/0.92.2/confidence-slim/0.92.1)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.api.grpc:grpc-google-cloud-kms-v1](https://togithub.com/googleapis/java-kms) | `0.92.1` -> `0.92.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-cloud-kms-v1/0.92.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-cloud-kms-v1/0.92.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-cloud-kms-v1/0.92.2/compatibility-slim/0.92.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-cloud-kms-v1/0.92.2/confidence-slim/0.92.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### 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 these updates 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#github/googleapis/java-storage). --- google-cloud-storage/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index 9d807d843..4640ed8ad 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -16,7 +16,7 @@ google-cloud-storage - 0.92.1 + 0.92.2 From b5086270bd9093c03c1a86043a66ad6834e849c7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 20:52:46 +0000 Subject: [PATCH 6/6] chore: release 2.1.6 (#1043) :robot: I have created a release \*beep\* \*boop\* --- ### [2.1.6](https://www.github.com/googleapis/java-storage/compare/v2.1.5...v2.1.6) (2021-09-24) ### Dependencies * update kms.version to v0.92.2 ([#1039](https://www.github.com/googleapis/java-storage/issues/1039)) ([d6a0542](https://www.github.com/googleapis/java-storage/commit/d6a0542f5fd290a0bdc2755f81a49f55724662b2)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ gapic-google-cloud-storage-v2/pom.xml | 4 ++-- google-cloud-storage/pom.xml | 4 ++-- grpc-google-cloud-storage-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-storage-v2/pom.xml | 4 ++-- versions.txt | 8 ++++---- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81c8180e3..4f6d405e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.1.6](https://www.github.com/googleapis/java-storage/compare/v2.1.5...v2.1.6) (2021-09-24) + + +### Dependencies + +* update kms.version to v0.92.2 ([#1039](https://www.github.com/googleapis/java-storage/issues/1039)) ([d6a0542](https://www.github.com/googleapis/java-storage/commit/d6a0542f5fd290a0bdc2755f81a49f55724662b2)) + ### [2.1.5](https://www.github.com/googleapis/java-storage/compare/v2.1.4...v2.1.5) (2021-09-22) diff --git a/gapic-google-cloud-storage-v2/pom.xml b/gapic-google-cloud-storage-v2/pom.xml index be840fb83..1547030bf 100644 --- a/gapic-google-cloud-storage-v2/pom.xml +++ b/gapic-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc gapic-google-cloud-storage-v2 - 2.1.6-alpha-SNAPSHOT + 2.1.6-alpha gapic-google-cloud-storage-v2 GRPC library for gapic-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.6-SNAPSHOT + 2.1.6 diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index 4640ed8ad..b5e705145 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-storage - 2.1.6-SNAPSHOT + 2.1.6 jar Google Cloud Storage https://github.com/googleapis/java-storage @@ -12,7 +12,7 @@ com.google.cloud google-cloud-storage-parent - 2.1.6-SNAPSHOT + 2.1.6 google-cloud-storage diff --git a/grpc-google-cloud-storage-v2/pom.xml b/grpc-google-cloud-storage-v2/pom.xml index 9df0acf92..4e14cd780 100644 --- a/grpc-google-cloud-storage-v2/pom.xml +++ b/grpc-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-storage-v2 - 2.1.6-alpha-SNAPSHOT + 2.1.6-alpha grpc-google-cloud-storage-v2 GRPC library for grpc-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.6-SNAPSHOT + 2.1.6 diff --git a/pom.xml b/pom.xml index 0bcf56053..c461cc25e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-storage-parent pom - 2.1.6-SNAPSHOT + 2.1.6 Storage Parent https://github.com/googleapis/java-storage @@ -93,17 +93,17 @@ com.google.api.grpc proto-google-cloud-storage-v2 - 2.1.6-alpha-SNAPSHOT + 2.1.6-alpha com.google.api.grpc grpc-google-cloud-storage-v2 - 2.1.6-alpha-SNAPSHOT + 2.1.6-alpha com.google.api.grpc gapic-google-cloud-storage-v2 - 2.1.6-alpha-SNAPSHOT + 2.1.6-alpha com.google.cloud diff --git a/proto-google-cloud-storage-v2/pom.xml b/proto-google-cloud-storage-v2/pom.xml index a3a311b73..abcc1d3f3 100644 --- a/proto-google-cloud-storage-v2/pom.xml +++ b/proto-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-storage-v2 - 2.1.6-alpha-SNAPSHOT + 2.1.6-alpha proto-google-cloud-storage-v2 PROTO library for proto-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.6-SNAPSHOT + 2.1.6 diff --git a/versions.txt b/versions.txt index d9c52b05a..f7427a34f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-storage:2.1.5:2.1.6-SNAPSHOT -gapic-google-cloud-storage-v2:2.1.5-alpha:2.1.6-alpha-SNAPSHOT -grpc-google-cloud-storage-v2:2.1.5-alpha:2.1.6-alpha-SNAPSHOT -proto-google-cloud-storage-v2:2.1.5-alpha:2.1.6-alpha-SNAPSHOT +google-cloud-storage:2.1.6:2.1.6 +gapic-google-cloud-storage-v2:2.1.6-alpha:2.1.6-alpha +grpc-google-cloud-storage-v2:2.1.6-alpha:2.1.6-alpha +proto-google-cloud-storage-v2:2.1.6-alpha:2.1.6-alpha