diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 7c8816a7..9b4fd4d8 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -16,8 +16,8 @@ jobs: return; } - // only approve PRs like "chore(master): release " - if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { + // only approve PRs like "chore: release " + if ( !context.payload.pull_request.title.startsWith("chore: release") ) { return; } diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index 5f3ba9a9..e6f651d1 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -7,12 +7,6 @@ env_vars: { value: "docs-staging" } -# cloud-rad staging -env_vars: { - key: "STAGING_BUCKET_V2" - value: "docs-staging-v2-staging" -} - env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-iam/.kokoro/release/publish_javadoc.sh" @@ -26,4 +20,4 @@ before_action { keyname: "docuploader_service_account" } } -} \ No newline at end of file +} diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 96726df0..2211ded2 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -56,22 +56,3 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET} - -popd - -# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. - -mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" - -pushd target/devsite/reference - -# create metadata -python3 -m docuploader create-metadata \ - --name ${NAME} \ - --version ${VERSION} \ - --language java - -# upload docs to staging bucket -python3 -m docuploader upload . \ - --credentials ${CREDENTIALS} \ - --staging-bucket ${STAGING_BUCKET_V2} diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index bd8e2cf7..0315e75a 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -40,6 +40,9 @@ export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # generate yml mvn clean site -B -q -P docFX +# copy README to docfx-yml dir and rename index.md +cp README.md target/docfx-yml/index.md + pushd target/docfx-yml # create metadata @@ -52,4 +55,4 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} \ - --destination-prefix docfx- + --destination-prefix docfx diff --git a/CHANGELOG.md b/CHANGELOG.md index 710f1e77..5a4070dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.0.11](https://www.github.com/googleapis/java-iam/compare/v1.0.10...v1.0.11) (2021-03-11) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.20.1 ([#118](https://www.github.com/googleapis/java-iam/issues/118)) ([0268594](https://www.github.com/googleapis/java-iam/commit/02685944cef7c500a2ae28674a2873e40e840504)) + ### [1.0.10](https://www.github.com/googleapis/java-iam/compare/v1.0.9...v1.0.10) (2021-02-25) diff --git a/grpc-google-iam-v1/pom.xml b/grpc-google-iam-v1/pom.xml index 1b8a4e13..053916a4 100644 --- a/grpc-google-iam-v1/pom.xml +++ b/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.0.10 + 1.0.11 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.0.10 + 1.0.11 diff --git a/grpc-google-iam-v1/src/main/java/com/google/iam/v1/IAMPolicyGrpc.java b/grpc-google-iam-v1/src/main/java/com/google/iam/v1/IAMPolicyGrpc.java index 55edd904..de12f933 100644 --- a/grpc-google-iam-v1/src/main/java/com/google/iam/v1/IAMPolicyGrpc.java +++ b/grpc-google-iam-v1/src/main/java/com/google/iam/v1/IAMPolicyGrpc.java @@ -16,11 +16,6 @@ package com.google.iam.v1; import static io.grpc.MethodDescriptor.generateFullMethodName; -import static io.grpc.stub.ClientCalls.asyncUnaryCall; -import static io.grpc.stub.ClientCalls.blockingUnaryCall; -import static io.grpc.stub.ClientCalls.futureUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** * @@ -252,7 +247,8 @@ public abstract static class IAMPolicyImplBase implements io.grpc.BindableServic public void setIamPolicy( com.google.iam.v1.SetIamPolicyRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getSetIamPolicyMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getSetIamPolicyMethod(), responseObserver); } /** @@ -267,7 +263,8 @@ public void setIamPolicy( public void getIamPolicy( com.google.iam.v1.GetIamPolicyRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getGetIamPolicyMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getGetIamPolicyMethod(), responseObserver); } /** @@ -286,7 +283,8 @@ public void testIamPermissions( com.google.iam.v1.TestIamPermissionsRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(getTestIamPermissionsMethod(), responseObserver); + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( + getTestIamPermissionsMethod(), responseObserver); } @java.lang.Override @@ -294,19 +292,19 @@ public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getSetIamPolicyMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.iam.v1.SetIamPolicyRequest, com.google.iam.v1.Policy>( this, METHODID_SET_IAM_POLICY))) .addMethod( getGetIamPolicyMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.iam.v1.GetIamPolicyRequest, com.google.iam.v1.Policy>( this, METHODID_GET_IAM_POLICY))) .addMethod( getTestIamPermissionsMethod(), - asyncUnaryCall( + io.grpc.stub.ServerCalls.asyncUnaryCall( new MethodHandlers< com.google.iam.v1.TestIamPermissionsRequest, com.google.iam.v1.TestIamPermissionsResponse>( @@ -360,7 +358,7 @@ protected IAMPolicyStub build(io.grpc.Channel channel, io.grpc.CallOptions callO public void setIamPolicy( com.google.iam.v1.SetIamPolicyRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getSetIamPolicyMethod(), getCallOptions()), request, responseObserver); @@ -378,7 +376,7 @@ public void setIamPolicy( public void getIamPolicy( com.google.iam.v1.GetIamPolicyRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getGetIamPolicyMethod(), getCallOptions()), request, responseObserver); @@ -400,7 +398,7 @@ public void testIamPermissions( com.google.iam.v1.TestIamPermissionsRequest request, io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( + io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getTestIamPermissionsMethod(), getCallOptions()), request, responseObserver); @@ -452,7 +450,8 @@ protected IAMPolicyBlockingStub build( * */ public com.google.iam.v1.Policy setIamPolicy(com.google.iam.v1.SetIamPolicyRequest request) { - return blockingUnaryCall(getChannel(), getSetIamPolicyMethod(), getCallOptions(), request); + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getSetIamPolicyMethod(), getCallOptions(), request); } /** @@ -465,7 +464,8 @@ public com.google.iam.v1.Policy setIamPolicy(com.google.iam.v1.SetIamPolicyReque * */ public com.google.iam.v1.Policy getIamPolicy(com.google.iam.v1.GetIamPolicyRequest request) { - return blockingUnaryCall(getChannel(), getGetIamPolicyMethod(), getCallOptions(), request); + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetIamPolicyMethod(), getCallOptions(), request); } /** @@ -482,7 +482,7 @@ public com.google.iam.v1.Policy getIamPolicy(com.google.iam.v1.GetIamPolicyReque */ public com.google.iam.v1.TestIamPermissionsResponse testIamPermissions( com.google.iam.v1.TestIamPermissionsRequest request) { - return blockingUnaryCall( + return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getTestIamPermissionsMethod(), getCallOptions(), request); } } @@ -532,7 +532,7 @@ protected IAMPolicyFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions */ public com.google.common.util.concurrent.ListenableFuture setIamPolicy(com.google.iam.v1.SetIamPolicyRequest request) { - return futureUnaryCall( + return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getSetIamPolicyMethod(), getCallOptions()), request); } @@ -547,7 +547,7 @@ protected IAMPolicyFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions */ public com.google.common.util.concurrent.ListenableFuture getIamPolicy(com.google.iam.v1.GetIamPolicyRequest request) { - return futureUnaryCall( + return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getGetIamPolicyMethod(), getCallOptions()), request); } @@ -566,7 +566,7 @@ protected IAMPolicyFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions public com.google.common.util.concurrent.ListenableFuture< com.google.iam.v1.TestIamPermissionsResponse> testIamPermissions(com.google.iam.v1.TestIamPermissionsRequest request) { - return futureUnaryCall( + return io.grpc.stub.ClientCalls.futureUnaryCall( getChannel().newCall(getTestIamPermissionsMethod(), getCallOptions()), request); } } diff --git a/pom.xml b/pom.xml index 42e265f9..c3292ce8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.0.10 + 1.0.11 Google IAM Parent https://github.com/googleapis/java-iam @@ -70,14 +70,14 @@ com.google.cloud google-cloud-shared-dependencies - 0.20.0 + 0.20.1 pom import com.google.api.grpc proto-google-iam-v1 - 1.0.10 + 1.0.11 diff --git a/proto-google-iam-v1/pom.xml b/proto-google-iam-v1/pom.xml index e9854c82..2f9475ac 100644 --- a/proto-google-iam-v1/pom.xml +++ b/proto-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.0.10 + 1.0.11 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.0.10 + 1.0.11 diff --git a/synth.metadata b/synth.metadata index 12103a11..f28a18f9 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-iam.git", - "sha": "9b1ecf73d92e9068f34dded022f8f225e2ab28df" + "sha": "02685944cef7c500a2ae28674a2873e40e840504" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "8d73f9486fc193a150f6c907dfb9f49431aff3ff", - "internalRef": "332497859" + "sha": "0e915217fb5261c1e57bfaf0e16ee5c7feaaba89", + "internalRef": "361377784" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" + "sha": "0b064d767537e0675fc053e53fca473c5c701fb8" } } ], diff --git a/versions.txt b/versions.txt index ebd26a7b..2be63052 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -proto-google-iam-v1:1.0.10:1.0.10 +proto-google-iam-v1:1.0.11:1.0.11