diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 7649651c..cb4ea018 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8 + digest: sha256:bd316b9a591c45264775ecaba72e37d65905925c323b68e51a08c4126e4b6d0a diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index d7476cfe..bd896024 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -57,54 +57,3 @@ retry_with_backoff 3 10 \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true - -echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" -## Run dependency list completeness check -function completenessCheck() { - # Output dep list with compile scope generated using the original pom - # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency. - # This is stripped from the output as it is not present in the flattened pom. - # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. - msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt - - # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) - msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt - - # Compare two dependency lists - msg "Comparing dependency lists..." - diff .org-list.txt .new-list.txt >.diff.txt - if [[ $? == 0 ]] - then - msg "Success. No diff!" - else - msg "Diff found. See below: " - msg "You can also check .diff.txt file located in $1." - cat .diff.txt - return 1 - fi -} - -# Allow failures to continue running the script -set +e - -error_count=0 -for path in **/.flattened-pom.xml -do - # Check flattened pom in each dir that contains it for completeness - dir=$(dirname "$path") - pushd "$dir" - completenessCheck "$dir" - error_count=$(($error_count + $?)) - popd -done - -if [[ $error_count == 0 ]] -then - msg "All checks passed." - exit 0 -else - msg "Errors found. See log statements above." - exit 1 -fi diff --git a/CHANGELOG.md b/CHANGELOG.md index edacb825..4c52660b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [1.6.7](https://github.com/googleapis/java-iam/compare/v1.6.6...v1.6.7) (2022-10-31) + + +### Dependencies + +* Update dependency com.google.api:api-common to v2.2.2 ([#497](https://github.com/googleapis/java-iam/issues/497)) ([bfcb37f](https://github.com/googleapis/java-iam/commit/bfcb37f9d46553a13a51bc8c437b6af046cb3c6c)) +* Update dependency com.google.cloud:google-iam-policy to v1.6.6 ([#492](https://github.com/googleapis/java-iam/issues/492)) ([cb7b782](https://github.com/googleapis/java-iam/commit/cb7b782017eb0ecf4914e4a1de252706bec70d6f)) +* Update dependency com.google.http-client:google-http-client-jackson2 to v1.42.3 ([#498](https://github.com/googleapis/java-iam/issues/498)) ([002b226](https://github.com/googleapis/java-iam/commit/002b2266fd9db19bade62e219970e7050d2bbbc0)) +* Update dependency com.google.protobuf:protobuf-bom to v3.21.9 ([#495](https://github.com/googleapis/java-iam/issues/495)) ([ef4f95b](https://github.com/googleapis/java-iam/commit/ef4f95b393a02b96f41743b3bcd8349dda0f9822)) +* Update dependency com.google.protobuf:protobuf-java to v3.21.9 ([#493](https://github.com/googleapis/java-iam/issues/493)) ([fb776ce](https://github.com/googleapis/java-iam/commit/fb776ce04129a55ea9ff0b964df624b64b5865a4)) + ## [1.6.6](https://github.com/googleapis/java-iam/compare/v1.6.5...v1.6.6) (2022-10-25) diff --git a/google-iam-policy/pom.xml b/google-iam-policy/pom.xml index 575b1a7e..ef2b415f 100644 --- a/google-iam-policy/pom.xml +++ b/google-iam-policy/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-iam-policy - 1.6.6 + 1.6.7 jar Google IAM Policy https://github.com/googleapis/java-eventarc @@ -11,7 +11,7 @@ com.google.cloud google-iam-parent - 1.6.6 + 1.6.7 google-iam-policy diff --git a/grpc-google-iam-v1/pom.xml b/grpc-google-iam-v1/pom.xml index e346f111..9addab4d 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.6.6 + 1.6.7 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.6.6 + 1.6.7 diff --git a/grpc-google-iam-v2/pom.xml b/grpc-google-iam-v2/pom.xml index c6fdd88b..a11b2325 100644 --- a/grpc-google-iam-v2/pom.xml +++ b/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.6.6 + 1.6.7 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.6.6 + 1.6.7 diff --git a/grpc-google-iam-v2beta/pom.xml b/grpc-google-iam-v2beta/pom.xml index bbb288e2..b1eb5dc4 100644 --- a/grpc-google-iam-v2beta/pom.xml +++ b/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.6.6 + 1.6.7 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.6.6 + 1.6.7 diff --git a/pom.xml b/pom.xml index f8c3117c..b9c3dff8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.6.6 + 1.6.7 Google IAM Parent https://github.com/googleapis/java-iam @@ -70,7 +70,7 @@ com.google.protobuf protobuf-bom - 3.21.8 + 3.21.9 pom import @@ -87,37 +87,37 @@ com.google.api.grpc proto-google-iam-v2 - 1.6.6 + 1.6.7 com.google.api.grpc grpc-google-iam-v2 - 1.6.6 + 1.6.7 com.google.cloud google-iam-policy - 1.6.6 + 1.6.7 com.google.api.grpc proto-google-iam-v2beta - 1.6.6 + 1.6.7 com.google.api.grpc grpc-google-iam-v1 - 1.6.6 + 1.6.7 com.google.api.grpc grpc-google-iam-v2beta - 1.6.6 + 1.6.7 com.google.api.grpc proto-google-iam-v1 - 1.6.6 + 1.6.7 diff --git a/proto-google-iam-v1/build.gradle b/proto-google-iam-v1/build.gradle index 3cf1d068..ef52ed87 100644 --- a/proto-google-iam-v1/build.gradle +++ b/proto-google-iam-v1/build.gradle @@ -18,8 +18,8 @@ repositories { } dependencies { - compile 'com.google.protobuf:protobuf-java:3.21.8' - compile 'com.google.api:api-common:2.2.1' + compile 'com.google.protobuf:protobuf-java:3.21.9' + compile 'com.google.api:api-common:2.2.2' compile project(':proto-google-common-protos') } diff --git a/proto-google-iam-v1/pom.xml b/proto-google-iam-v1/pom.xml index 0d47b58f..71c93fba 100644 --- a/proto-google-iam-v1/pom.xml +++ b/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.6.6 + 1.6.7 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.6.6 + 1.6.7 diff --git a/proto-google-iam-v2/pom.xml b/proto-google-iam-v2/pom.xml index d954eac9..750979c4 100644 --- a/proto-google-iam-v2/pom.xml +++ b/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.6.6 + 1.6.7 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.6.6 + 1.6.7 diff --git a/proto-google-iam-v2beta/pom.xml b/proto-google-iam-v2beta/pom.xml index 3e23af03..89e12884 100644 --- a/proto-google-iam-v2beta/pom.xml +++ b/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.6.6 + 1.6.7 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.6.6 + 1.6.7 diff --git a/samples/cloud-client/snippets/pom.xml b/samples/cloud-client/snippets/pom.xml index 646b9131..637cc413 100644 --- a/samples/cloud-client/snippets/pom.xml +++ b/samples/cloud-client/snippets/pom.xml @@ -36,12 +36,12 @@ com.google.http-client google-http-client-jackson2 - 1.42.2 + 1.42.3 com.google.cloud google-iam-policy - 1.6.5 + 1.6.6 compile diff --git a/versions.txt b/versions.txt index c21b3114..f27aef7d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-iam-v1:1.6.6:1.6.6 -grpc-google-iam-v1:1.6.6:1.6.6 -proto-google-iam-v2beta:1.6.6:1.6.6 -grpc-google-iam-v2beta:1.6.6:1.6.6 -google-iam-policy:1.6.6:1.6.6 -proto-google-iam-v2:1.6.6:1.6.6 -grpc-google-iam-v2:1.6.6:1.6.6 +proto-google-iam-v1:1.6.7:1.6.7 +grpc-google-iam-v1:1.6.7:1.6.7 +proto-google-iam-v2beta:1.6.7:1.6.7 +grpc-google-iam-v2beta:1.6.7:1.6.7 +google-iam-policy:1.6.7:1.6.7 +proto-google-iam-v2:1.6.7:1.6.7 +grpc-google-iam-v2:1.6.7:1.6.7