From decd7f60017d45288e6c12493fa21e06f9c5f77c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:30:35 -0400 Subject: [PATCH 01/64] chore(main): release 2.27.1-SNAPSHOT (#2076) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- WORKSPACE | 2 +- api-common-java/pom.xml | 4 +-- coverage-report/pom.xml | 8 ++--- gapic-generator-java-bom/pom.xml | 26 +++++++-------- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 6 ++-- gax-java/dependencies.properties | 8 ++--- gax-java/gax-bom/pom.xml | 20 ++++++------ gax-java/gax-grpc/pom.xml | 4 +-- gax-java/gax-httpjson/pom.xml | 4 +-- gax-java/gax/pom.xml | 4 +-- gax-java/pom.xml | 14 ++++---- .../grpc-google-common-protos/pom.xml | 4 +-- java-common-protos/pom.xml | 8 ++--- .../proto-google-common-protos/pom.xml | 4 +-- java-core/google-cloud-core-bom/pom.xml | 10 +++--- java-core/google-cloud-core-grpc/pom.xml | 4 +-- java-core/google-cloud-core-http/pom.xml | 4 +-- java-core/google-cloud-core/pom.xml | 4 +-- java-core/pom.xml | 6 ++-- java-iam/grpc-google-iam-v1/pom.xml | 4 +-- java-iam/grpc-google-iam-v2/pom.xml | 4 +-- java-iam/grpc-google-iam-v2beta/pom.xml | 4 +-- java-iam/pom.xml | 20 ++++++------ java-iam/proto-google-iam-v1/pom.xml | 4 +-- java-iam/proto-google-iam-v2/pom.xml | 4 +-- java-iam/proto-google-iam-v2beta/pom.xml | 4 +-- .../dependency-convergence-check/pom.xml | 2 +- .../first-party-dependencies/pom.xml | 10 +++--- java-shared-dependencies/pom.xml | 8 ++--- .../third-party-dependencies/pom.xml | 2 +- .../upper-bound-check/pom.xml | 4 +-- showcase/pom.xml | 2 +- versions.txt | 32 +++++++++---------- 34 files changed, 125 insertions(+), 125 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 1fc5846c01..99e880b4dc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.27.0" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.27.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 8b72646d5a..c9e9ee6d02 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.18.0 + 2.18.1-SNAPSHOT API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index bb8cc49d81..17857b753f 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.35.0 + 2.35.1-SNAPSHOT com.google.api gax-grpc - 2.35.0 + 2.35.1-SNAPSHOT com.google.api gax-httpjson - 2.35.0 + 2.35.1-SNAPSHOT com.google.api api-common - 2.18.0 + 2.18.1-SNAPSHOT diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 24f2f3ee1f..a54d5bdc36 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -4,7 +4,7 @@ com.google.api gapic-generator-java-bom pom - 2.27.0 + 2.27.1-SNAPSHOT GAPIC Generator Java BOM BOM for the libraries in gapic-generator-java repository. Users should not @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -75,61 +75,61 @@ com.google.api api-common - 2.18.0 + 2.18.1-SNAPSHOT com.google.api gax-bom - 2.35.0 + 2.35.1-SNAPSHOT pom import com.google.api gapic-generator-java - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc grpc-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc proto-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2 - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2beta - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v1 - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2 - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2beta - 1.21.0 + 1.21.1-SNAPSHOT diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 0c87973cdb..e59069b36f 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT pom GAPIC Generator Java POM Parent https://github.com/googleapis/sdk-platform-java diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 5ffc9a7e4e..a3fda696c6 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api gapic-generator-java - 2.27.0 + 2.27.1-SNAPSHOT GAPIC Generator Java GAPIC generator Java @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.27.0 + 2.27.1-SNAPSHOT pom import diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 8d7904dd7e..49544448f1 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.35.0 +version.gax=2.35.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.35.0 +version.gax_grpc=2.35.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.35.0 +version.gax_bom=2.35.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.35.0 +version.gax_httpjson=2.35.1-SNAPSHOT # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 8cd7d1dfc9..49a4b045d3 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.35.0 + 2.35.1-SNAPSHOT pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.35.0 + 2.35.1-SNAPSHOT com.google.api gax - 2.35.0 + 2.35.1-SNAPSHOT test-jar testlib com.google.api gax - 2.35.0 + 2.35.1-SNAPSHOT testlib com.google.api gax-grpc - 2.35.0 + 2.35.1-SNAPSHOT com.google.api gax-grpc - 2.35.0 + 2.35.1-SNAPSHOT test-jar testlib com.google.api gax-grpc - 2.35.0 + 2.35.1-SNAPSHOT testlib com.google.api gax-httpjson - 2.35.0 + 2.35.1-SNAPSHOT com.google.api gax-httpjson - 2.35.0 + 2.35.1-SNAPSHOT test-jar testlib com.google.api gax-httpjson - 2.35.0 + 2.35.1-SNAPSHOT testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index 2ba79b9b52..1e474bd2fa 100644 --- a/gax-java/gax-grpc/pom.xml +++ b/gax-java/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.35.0 + 2.35.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.35.0 + 2.35.1-SNAPSHOT diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 1e49b17718..22ea674303 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 2.35.0 + 2.35.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.35.0 + 2.35.1-SNAPSHOT diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 79f095f9f1..9c36d94568 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.35.0 + 2.35.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.35.0 + 2.35.1-SNAPSHOT diff --git a/gax-java/pom.xml b/gax-java/pom.xml index d2a0fb779d..778bd2978c 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.35.0 + 2.35.1-SNAPSHOT GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.18.0 + 2.18.1-SNAPSHOT com.google.auth @@ -108,24 +108,24 @@ com.google.api gax - 2.35.0 + 2.35.1-SNAPSHOT com.google.api gax - 2.35.0 + 2.35.1-SNAPSHOT test-jar testlib com.google.api.grpc proto-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc grpc-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT io.grpc diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index 07772806e8..70c9dc2032 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 6afe0ac039..e6bceccf05 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.26.0 + 2.26.1-SNAPSHOT Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -68,7 +68,7 @@ com.google.api.grpc grpc-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT io.grpc @@ -80,7 +80,7 @@ com.google.api.grpc proto-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index 1b5017a0cc..a3b78fe2b5 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index a0effb59e6..d219901166 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.25.0 + 2.25.1-SNAPSHOT pom com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.25.0 + 2.25.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - 2.25.0 + 2.25.1-SNAPSHOT com.google.cloud google-cloud-core-http - 2.25.0 + 2.25.1-SNAPSHOT diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index 1c9fbadcdc..228bb49b98 100644 --- a/java-core/google-cloud-core-grpc/pom.xml +++ b/java-core/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.25.0 + 2.25.1-SNAPSHOT jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.25.0 + 2.25.1-SNAPSHOT google-cloud-core-grpc diff --git a/java-core/google-cloud-core-http/pom.xml b/java-core/google-cloud-core-http/pom.xml index 5e981c6d00..d7edfa3df7 100644 --- a/java-core/google-cloud-core-http/pom.xml +++ b/java-core/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.25.0 + 2.25.1-SNAPSHOT jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.25.0 + 2.25.1-SNAPSHOT google-cloud-core-http diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index bcac4a227f..d955cfa925 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.25.0 + 2.25.1-SNAPSHOT jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.25.0 + 2.25.1-SNAPSHOT google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index 411fb57028..66c94e095a 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.25.0 + 2.25.1-SNAPSHOT Google Cloud Core Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.17.0 + 3.17.1-SNAPSHOT pom import diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index b436c67acc..7157914fbf 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.21.0 + 1.21.1-SNAPSHOT grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.21.0 + 1.21.1-SNAPSHOT diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index c3a9b02fd3..e49c3ddac8 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.21.0 + 1.21.1-SNAPSHOT grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.21.0 + 1.21.1-SNAPSHOT diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 03b2a1e514..6c7cee6022 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.21.0 + 1.21.1-SNAPSHOT grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.0 + 1.21.1-SNAPSHOT diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 95cd78475d..38115a9107 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.21.0 + 1.21.1-SNAPSHOT Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -81,44 +81,44 @@ com.google.api gax-bom - 2.35.0 + 2.35.1-SNAPSHOT pom import com.google.api.grpc proto-google-iam-v2 - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2 - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc proto-google-common-protos - 2.26.0 + 2.26.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2beta - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v1 - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2beta - 1.21.0 + 1.21.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.21.0 + 1.21.1-SNAPSHOT javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index 5d38693800..ea694e460c 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.21.0 + 1.21.1-SNAPSHOT proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.0 + 1.21.1-SNAPSHOT diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 9db874d29e..c9d588a51b 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.21.0 + 1.21.1-SNAPSHOT proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.0 + 1.21.1-SNAPSHOT diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index 54efb12a08..ee0c71800c 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.21.0 + 1.21.1-SNAPSHOT proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.0 + 1.21.1-SNAPSHOT diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index f578b71b06..b313c5ec92 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.17.0 + 3.17.1-SNAPSHOT Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies An dependency convergence test case for the shared dependencies BOM. A failure of this test case means diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 8dd9bb36cf..1ae8017b76 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.17.0 + 3.17.1-SNAPSHOT Google Cloud First-party Shared Dependencies Shared first-party dependencies for Google Cloud Java libraries. @@ -33,7 +33,7 @@ com.google.api gapic-generator-java-bom - 2.27.0 + 2.27.1-SNAPSHOT pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.25.0 + 2.25.1-SNAPSHOT pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.25.0 + 2.25.1-SNAPSHOT test-jar com.google.cloud google-cloud-core - 2.25.0 + 2.25.1-SNAPSHOT tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index 2094c9cbb0..f1f652e5a2 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.17.0 + 3.17.1-SNAPSHOT first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.0 + 2.27.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.17.0 + 3.17.1-SNAPSHOT pom import com.google.cloud third-party-dependencies - 3.17.0 + 3.17.1-SNAPSHOT pom import diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 57a5a8db43..2be21582fe 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.17.0 + 3.17.1-SNAPSHOT Google Cloud Third-party Shared Dependencies Shared third-party dependencies for Google Cloud Java libraries. diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index 878e1dd2e5..aecce7e867 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 3.17.0 + 3.17.1-SNAPSHOT Upper bound test for Google Cloud Shared Dependencies An upper bound test case for the shared dependencies BOM. A failure of this test case means @@ -30,7 +30,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.17.0 + 3.17.1-SNAPSHOT pom import diff --git a/showcase/pom.xml b/showcase/pom.xml index f0263f388f..d90caf3d1d 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -34,7 +34,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.17.0 + 3.17.1-SNAPSHOT pom import diff --git a/versions.txt b/versions.txt index 84ab8791c7..cab92ad35d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,19 +1,19 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.27.0:2.27.0 -api-common:2.18.0:2.18.0 -gax:2.35.0:2.35.0 -gax-grpc:2.35.0:2.35.0 -gax-httpjson:0.120.0:0.120.0 -proto-google-common-protos:2.26.0:2.26.0 -grpc-google-common-protos:2.26.0:2.26.0 -proto-google-iam-v1:1.21.0:1.21.0 -grpc-google-iam-v1:1.21.0:1.21.0 -proto-google-iam-v2beta:1.21.0:1.21.0 -grpc-google-iam-v2beta:1.21.0:1.21.0 -google-iam-policy:1.21.0:1.21.0 -proto-google-iam-v2:1.21.0:1.21.0 -grpc-google-iam-v2:1.21.0:1.21.0 -google-cloud-core:2.25.0:2.25.0 -google-cloud-shared-dependencies:3.17.0:3.17.0 +gapic-generator-java:2.27.0:2.27.1-SNAPSHOT +api-common:2.18.0:2.18.1-SNAPSHOT +gax:2.35.0:2.35.1-SNAPSHOT +gax-grpc:2.35.0:2.35.1-SNAPSHOT +gax-httpjson:0.120.0:0.120.1-SNAPSHOT +proto-google-common-protos:2.26.0:2.26.1-SNAPSHOT +grpc-google-common-protos:2.26.0:2.26.1-SNAPSHOT +proto-google-iam-v1:1.21.0:1.21.1-SNAPSHOT +grpc-google-iam-v1:1.21.0:1.21.1-SNAPSHOT +proto-google-iam-v2beta:1.21.0:1.21.1-SNAPSHOT +grpc-google-iam-v2beta:1.21.0:1.21.1-SNAPSHOT +google-iam-policy:1.21.0:1.21.1-SNAPSHOT +proto-google-iam-v2:1.21.0:1.21.1-SNAPSHOT +grpc-google-iam-v2:1.21.0:1.21.1-SNAPSHOT +google-cloud-core:2.25.0:2.25.1-SNAPSHOT +google-cloud-shared-dependencies:3.17.0:3.17.1-SNAPSHOT From 1a10501d2da60114ea7694230e7b31f301c758a2 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:45:55 +0000 Subject: [PATCH 02/64] chore: Enabling Dependency Dashboard for renovate-bot (#2088) --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index b2e66d39f6..c42ea6051b 100644 --- a/renovate.json +++ b/renovate.json @@ -2,6 +2,7 @@ "extends": [ "config:base" ], + "dependencyDashboard": true, "ignoreDeps": ["rules_pkg"], "regexManagers": [ { From 528b79bb75b5587b0df33fe354a0d6bf9654906e Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:24:58 +0000 Subject: [PATCH 03/64] chore: include/exclude certain protos when generating libraries (#2084) * chore: add exception when generating filestore * do not copy `google/cloud/common/operation_metadata.proto` * replace `if` with `case` * remove unused proto * remove protos in java_protos * add comments * add comments --- library_generation/generate_library.sh | 50 ++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index 47931231ae..57ee22d67a 100755 --- a/library_generation/generate_library.sh +++ b/library_generation/generate_library.sh @@ -108,6 +108,24 @@ mkdir -p "${output_folder}/${destination_path}" folder_name=$(extract_folder_name "${destination_path}") pushd "${output_folder}" proto_files=$(find "${proto_path}" -type f -name "*.proto" | sort) +# include or exclude certain protos in grpc plugin and gapic generator java. +case "${proto_path}" in + "google/cloud/aiplatform/v1beta1"*) + # this proto is excluded from //google/cloud/aiplatform/v1beta1/schema:schema_proto + removed_proto="google/cloud/aiplatform/v1beta1/schema/io_format.proto" + proto_files="${proto_files//${removed_proto}/}" + ;; + "google/cloud/filestore"*) + # this proto is included in //google/cloud/filestore/v1:google-cloud-filestore-v1-java + # and //google/cloud/filestore/v1beta1:google-cloud-filestore-v1-java + proto_files="${proto_files} google/cloud/common/operation_metadata.proto" + ;; + "google/cloud/oslogin"*) + # this proto is included in //google/cloud/oslogin/v1:google-cloud-oslogin-v1-java + # and //google/cloud/oslogin/v1beta1:google-cloud-oslogin-v1-java + proto_files="${proto_files} google/cloud/oslogin/common/common.proto" + ;; +esac # download gapic-generator-java, protobuf and grpc plugin. download_tools "${gapic_generator_version}" "${protobuf_version}" "${grpc_version}" "${os_architecture}" ##################### Section 1 ##################### @@ -162,6 +180,22 @@ fi ##################### Section 3 ##################### # generate proto-*/ ##################################################### +# exclude certain protos to java compiler. +case "${proto_path}" in + "google/cloud/aiplatform/v1beta1"*) + # these protos are excluded from //google/cloud/aiplatform/v1beta1:google-cloud-aiplatform-v1beta1-java + prefix="google/cloud/aiplatform/v1beta1/schema" + protos="${prefix}/annotation_payload.proto ${prefix}/annotation_spec_color.proto ${prefix}/data_item_payload.proto ${prefix}/dataset_metadata.proto ${prefix}/geometry.proto" + for removed_proto in ${protos}; do + proto_files="${proto_files//${removed_proto}/}" + done + ;; + "google/devtools/containeranalysis/v1beta1"*) + # this proto is excluded from //google/devtools/containeranalysis/v1beta1:google-cloud-devtools-containeranalysis-v1beta1-java + removed_proto="google/devtools/containeranalysis/v1beta1/cvss/cvss.proto" + proto_files="${proto_files//${removed_proto}/}" + ;; +esac "$protoc_path"/protoc "--java_out=${destination_path}/java_proto.jar" ${proto_files} if [[ "${proto_only}" == "false" ]]; then # move java_gapic_srcjar/proto/src/main/java (generated resource name helper class) @@ -172,8 +206,24 @@ fi unzip_src_files "proto" # remove empty files in proto-*/src/main/java remove_empty_files "proto" +# include certain protos in generated library. +case "${proto_path}" in + "google/cloud/aiplatform/v1beta1"*) + prefix="google/cloud/aiplatform/v1beta1/schema" + protos="${prefix}/annotation_payload.proto ${prefix}/annotation_spec_color.proto ${prefix}/data_item_payload.proto ${prefix}/dataset_metadata.proto ${prefix}/geometry.proto" + for added_proto in ${protos}; do + proto_files="${proto_files} ${added_proto}" + done + ;; + "google/devtools/containeranalysis/v1beta1"*) + proto_files="${proto_files} google/devtools/containeranalysis/v1beta1/cvss/cvss.proto" + ;; +esac # copy proto files to proto-*/src/main/proto for proto_src in ${proto_files}; do + if [[ "${proto_src}" == "google/cloud/common/operation_metadata.proto" ]]; then + continue + fi mkdir -p "${destination_path}/proto-${folder_name}/src/main/proto" rsync -R "${proto_src}" "${destination_path}/proto-${folder_name}/src/main/proto" done From 055ac8310dfb2cdbfb89ebaabc67bbf24672011b Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:45:16 +0000 Subject: [PATCH 04/64] chore: Fixing renovate config (#2093) --- renovate.json | 104 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 70 insertions(+), 34 deletions(-) diff --git a/renovate.json b/renovate.json index c42ea6051b..5c7fcd3a76 100644 --- a/renovate.json +++ b/renovate.json @@ -1,65 +1,101 @@ { "extends": [ - "config:base" + "config:recommended" ], "dependencyDashboard": true, - "ignoreDeps": ["rules_pkg"], - "regexManagers": [ + "ignoreDeps": [ + "rules_pkg" + ], + "customManagers": [ { - "fileMatch": ["^gax-java/dependencies\\.properties$"], - "matchStrings": ["=(?.+\\:.+?):(?.+?)\\n"], + "customType": "regex", + "fileMatch": [ + "^gax-java/dependencies\\.properties$" + ], + "matchStrings": [ + "=(?.+\\:.+?):(?.+?)\\n" + ], "datasourceTemplate": "maven" }, { - "fileMatch": ["^gax-java/dependencies\\.properties$"], - "matchStrings": ["version\\.com_google_protobuf=(?.+?)\\n"], + "customType": "regex", + "fileMatch": [ + "^gax-java/dependencies\\.properties$" + ], + "matchStrings": [ + "version\\.com_google_protobuf=(?.+?)\\n" + ], "depNameTemplate": "com.google.protobuf:protobuf-java", "datasourceTemplate": "maven" }, { - "fileMatch": ["^gax-java/dependencies\\.properties$"], - "matchStrings": ["version\\.google_java_format=(?.+?)\\n"], + "customType": "regex", + "fileMatch": [ + "^gax-java/dependencies\\.properties$" + ], + "matchStrings": [ + "version\\.google_java_format=(?.+?)\\n" + ], "depNameTemplate": "com.google.googlejavaformat:google-java-format", "datasourceTemplate": "maven" }, { - "fileMatch": ["^gax-java/dependencies\\.properties$"], - "matchStrings": ["version\\.io_grpc=(?.+?)\\n"], + "customType": "regex", + "fileMatch": [ + "^gax-java/dependencies\\.properties$" + ], + "matchStrings": [ + "version\\.io_grpc=(?.+?)\\n" + ], "depNameTemplate": "io.grpc:grpc-core", "datasourceTemplate": "maven" }, { - "fileMatch": ["^\\.kokoro/presubmit/.*\\.sh"], - "matchStrings": ["SHOWCASE_VERSION=(?.+?)\\n"], + "customType": "regex", + "fileMatch": [ + "^\\.kokoro/presubmit/.*\\.sh" + ], + "matchStrings": [ + "SHOWCASE_VERSION=(?.+?)\\n" + ], "datasourceTemplate": "go" }, { - "fileMatch": ["^showcase/gapic-showcase/pom\\.xml$"], - "matchStrings": ["(?.+?)\\n"], + "customType": "regex", + "fileMatch": [ + "^showcase/gapic-showcase/pom\\.xml$" + ], + "matchStrings": [ + "(?.+?)\\n" + ], "datasourceTemplate": "go" } ], "packageRules": [ - { - "matchUpdateTypes": ["major"], - "matchPackagePatterns": ["*"], + { + "matchUpdateTypes": [ + "major" + ], + "matchPackagePatterns": [ + "*" + ], "enabled": false }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^com.google.guava:" ], - "versionScheme": "docker" + "versioning": "docker" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "*" ], "semanticCommitType": "deps", "semanticCommitScope": null }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^org.apache.maven", "^org.jacoco:", "^org.codehaus.mojo:", @@ -71,7 +107,7 @@ "semanticCommitScope": "deps" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^{{metadata['repo']['distribution_name']}}", "^com.google.cloud:libraries-bom", "^com.google.cloud.samples:shared-configuration" @@ -80,7 +116,7 @@ "semanticCommitScope": "deps" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", @@ -91,58 +127,58 @@ "semanticCommitScope": "deps" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^com.google.cloud:google-cloud-" ], "ignoreUnstable": false }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^com.google.protobuf" ], "groupName": "Protobuf dependencies" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^io.grpc" ], "groupName": "gRPC dependencies" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^com.google.auth" ], "groupName": "Google Auth Library dependencies" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^com.google.api" ], "groupName": "Google API dependencies" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^com.google.http-client" ], "groupName": "Google HTTP Client dependencies" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^io.opencensus" ], "groupName": "OpenCensus dependencies" }, { - "packagePatterns": [ + "matchPackagePatterns": [ "^io.netty" ], "groupName": "Netty dependencies" } ] -} +} \ No newline at end of file From 500ff5ddeac5f385500c233c6fa8cc639cca5306 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:07:12 +0000 Subject: [PATCH 05/64] chore: add exceptions to search in `proto_path`, but not in its subdirectories (#2090) * chore: add exceptions to search in `proto_path`, but not in its subdirectories * exclude subdirectories in google/cloud * exclude subdirectories in google/rpc * exclude subdirectories in google/iam/v1 * exclude two protos in generated library --- library_generation/generate_library.sh | 27 +++++++++++++++++-- .../test/resources/proto_path_list.txt | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index 57ee22d67a..82f5a29e86 100755 --- a/library_generation/generate_library.sh +++ b/library_generation/generate_library.sh @@ -107,9 +107,20 @@ mkdir -p "${output_folder}/${destination_path}" # get a fixed order. folder_name=$(extract_folder_name "${destination_path}") pushd "${output_folder}" -proto_files=$(find "${proto_path}" -type f -name "*.proto" | sort) +find_depth="" +case "${proto_path}" in + "google/api" | "google/cloud" | "google/iam/v1" | "google/rpc") + find_depth="-maxdepth 1" + ;; +esac +proto_files=$(find "${proto_path}" ${find_depth} -type f -name "*.proto" | sort) # include or exclude certain protos in grpc plugin and gapic generator java. case "${proto_path}" in + "google/cloud") + # this proto is excluded from //google/cloud:google-apps-script-type-java + removed_proto="google/cloud/common_resources.proto" + proto_files="${proto_files//${removed_proto}/}" + ;; "google/cloud/aiplatform/v1beta1"*) # this proto is excluded from //google/cloud/aiplatform/v1beta1/schema:schema_proto removed_proto="google/cloud/aiplatform/v1beta1/schema/io_format.proto" @@ -125,6 +136,11 @@ case "${proto_path}" in # and //google/cloud/oslogin/v1beta1:google-cloud-oslogin-v1-java proto_files="${proto_files} google/cloud/oslogin/common/common.proto" ;; + "google/rpc") + # this proto is excluded from //google/rpc:google-rpc-java + removed_proto="google/rpc/http.proto" + proto_files="${proto_files//${removed_proto}/}" + ;; esac # download gapic-generator-java, protobuf and grpc plugin. download_tools "${gapic_generator_version}" "${protobuf_version}" "${grpc_version}" "${os_architecture}" @@ -206,7 +222,6 @@ fi unzip_src_files "proto" # remove empty files in proto-*/src/main/java remove_empty_files "proto" -# include certain protos in generated library. case "${proto_path}" in "google/cloud/aiplatform/v1beta1"*) prefix="google/cloud/aiplatform/v1beta1/schema" @@ -218,6 +233,14 @@ case "${proto_path}" in "google/devtools/containeranalysis/v1beta1"*) proto_files="${proto_files} google/devtools/containeranalysis/v1beta1/cvss/cvss.proto" ;; + "google/iam/v1") + # these protos are excluded from //google/iam/v1:google-iam-v1-java + prefix="google/iam/v1" + protos="${prefix}/options.proto ${prefix}/policy.proto" + for removed_proto in ${protos}; do + proto_files="${proto_files//${removed_proto}/}" + done + ;; esac # copy proto files to proto-*/src/main/proto for proto_src in ${proto_files}; do diff --git a/library_generation/test/resources/proto_path_list.txt b/library_generation/test/resources/proto_path_list.txt index 3075927c66..1e5faf9e8f 100755 --- a/library_generation/test/resources/proto_path_list.txt +++ b/library_generation/test/resources/proto_path_list.txt @@ -10,7 +10,7 @@ google/cloud/redis/v1 google-cloud-redis-v1-java google/example/library/v1 google-cloud-example-library-v1-java google/devtools/containeranalysis/v1 google-cloud-devtools-containeranalysis-v1-java google/firestore/bundle google-cloud-firestore-bundle-v1-java -# google/iam/v1 google-iam-v1-java +google/iam/v1 google-iam-v1-java google/iam/credentials/v1 google-cloud-iam-credentials-v1-java google/logging/v2 google-cloud-logging-v2-java google/pubsub/v1 google-cloud-pubsub-v1-java From 33ee2ffac041ea01a00d7f7c8f4702c3930e2a14 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:26:41 +0000 Subject: [PATCH 06/64] chore: modify showcase test coverage (#2106) * chore: modify showcase IT test coverage * change it source and test * add projectBaseDir * change properties in profile * skip api-common-java * skip gax-java and java-core * skip sonar in grpc- and proto- in showcase * remove comments --- .github/workflows/sonar.yaml | 12 ------------ showcase/grpc-gapic-showcase-v1beta1/pom.xml | 15 +++++++++++++++ showcase/proto-gapic-showcase-v1beta1/pom.xml | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index bff20faa8e..013ff88b36 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -74,15 +74,3 @@ jobs: -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.projectName=java_showcase_integration_tests - - name: Build and analyze Showcase Unit Tests Coverage - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: | - mvn -B clean test -Dcheckstyle.skip \ - -DenableShowcaseTestCoverage \ - org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ - -Dsonar.projectKey=googleapis_gapic-generator-java_unit_tests \ - -Dsonar.organization=googleapis \ - -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.projectName=java_showcase_unit_tests \ No newline at end of file diff --git a/showcase/grpc-gapic-showcase-v1beta1/pom.xml b/showcase/grpc-gapic-showcase-v1beta1/pom.xml index 50b89a1e81..9fce31015f 100644 --- a/showcase/grpc-gapic-showcase-v1beta1/pom.xml +++ b/showcase/grpc-gapic-showcase-v1beta1/pom.xml @@ -47,4 +47,19 @@ guava + + + + + showcase-sonar-analysis + + + enableShowcaseTestCoverage + + + + true + + + diff --git a/showcase/proto-gapic-showcase-v1beta1/pom.xml b/showcase/proto-gapic-showcase-v1beta1/pom.xml index e4d74f6a84..cef41f54ff 100644 --- a/showcase/proto-gapic-showcase-v1beta1/pom.xml +++ b/showcase/proto-gapic-showcase-v1beta1/pom.xml @@ -39,4 +39,19 @@ guava + + + + + showcase-sonar-analysis + + + enableShowcaseTestCoverage + + + + true + + + From 946d6448b1b9a6698a3efcd5e93763d34bffc1ad Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Thu, 12 Oct 2023 19:06:14 +0000 Subject: [PATCH 07/64] chore: Debugging renovate-bot failure. (#2108) --- renovate.json | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/renovate.json b/renovate.json index 5c7fcd3a76..51fb38011c 100644 --- a/renovate.json +++ b/renovate.json @@ -49,26 +49,6 @@ ], "depNameTemplate": "io.grpc:grpc-core", "datasourceTemplate": "maven" - }, - { - "customType": "regex", - "fileMatch": [ - "^\\.kokoro/presubmit/.*\\.sh" - ], - "matchStrings": [ - "SHOWCASE_VERSION=(?.+?)\\n" - ], - "datasourceTemplate": "go" - }, - { - "customType": "regex", - "fileMatch": [ - "^showcase/gapic-showcase/pom\\.xml$" - ], - "matchStrings": [ - "(?.+?)\\n" - ], - "datasourceTemplate": "go" } ], "packageRules": [ @@ -181,4 +161,4 @@ "groupName": "Netty dependencies" } ] -} \ No newline at end of file +} From 6c6e57fea5ef7a1a1b8315fcbf03f571f5c31a03 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 16:18:48 +0200 Subject: [PATCH 08/64] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.4.5 (#2112) --- java-common-protos/pom.xml | 2 +- java-iam/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index e6bceccf05..bf2b51f38c 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -112,7 +112,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.2 + 3.4.5 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 38115a9107..cdedb332e8 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -149,7 +149,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.2 + 3.4.5 From e0ad3e678ac9a42cb4c9a6111e8da750a2294ba6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 16:20:12 +0200 Subject: [PATCH 09/64] deps: update dependency net.bytebuddy:byte-buddy to v1.14.9 (#2116) --- gax-java/dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 49544448f1..5d183ff93a 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -82,5 +82,5 @@ maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 maven.com_google_truth_truth=com.google.truth:truth:1.1.3 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0 -maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.3 +maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.9 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 From 93bb1f06a179089fd301335619a1f3c433434509 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 16:20:50 +0200 Subject: [PATCH 10/64] test(deps): update dependency com.google.truth:truth to v1.1.5 (#2119) --- api-common-java/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- gax-java/pom.xml | 2 +- java-core/pom.xml | 2 +- showcase/gapic-showcase/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index c9e9ee6d02..d5386d76c1 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -77,7 +77,7 @@ com.google.truth truth - 1.1.3 + 1.1.5 test diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index a3fda696c6..a3a2e568b6 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -467,7 +467,7 @@ com.google.truth truth - 1.1.3 + 1.1.5 test diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 5d183ff93a..fb8f1ac1a4 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -80,7 +80,7 @@ maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.1 maven.junit_junit=junit:junit:4.13.2 maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 -maven.com_google_truth_truth=com.google.truth:truth:1.1.3 +maven.com_google_truth_truth=com.google.truth:truth:1.1.5 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0 maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.9 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 778bd2978c..0fb78e9431 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -176,7 +176,7 @@ com.google.truth truth - 1.1.3 + 1.1.5 org.checkerframework diff --git a/java-core/pom.xml b/java-core/pom.xml index 66c94e095a..3fb36c2791 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -47,7 +47,7 @@ com.google.truth truth - 1.1.3 + 1.1.5 test diff --git a/showcase/gapic-showcase/pom.xml b/showcase/gapic-showcase/pom.xml index 5eab85a38d..fd57ed57cc 100644 --- a/showcase/gapic-showcase/pom.xml +++ b/showcase/gapic-showcase/pom.xml @@ -139,7 +139,7 @@ com.google.truth truth - 1.1.3 + 1.1.5 test From cd9748d4a62b843080c107309c15d6894eb0eb28 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 16:39:48 +0200 Subject: [PATCH 11/64] deps: update dependency gradle to v7.6.3 (#2115) --- .../resources/gradle/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules_java_gapic/resources/gradle/gradle/wrapper/gradle-wrapper.properties b/rules_java_gapic/resources/gradle/gradle/wrapper/gradle-wrapper.properties index 774fae8767..068cdb2dc2 100644 --- a/rules_java_gapic/resources/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/rules_java_gapic/resources/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 8a39fc7dfc56118cf5baadf5421822f5dc3c5901 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 19:19:28 +0200 Subject: [PATCH 12/64] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.0 (#2126) --- java-common-protos/pom.xml | 2 +- java-iam/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index bf2b51f38c..22e7eacbc1 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 html diff --git a/java-iam/pom.xml b/java-iam/pom.xml index cdedb332e8..c31a6d1360 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 html From c066286ef3da2f8587d44d2b3d60db63be24875a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 19:20:10 +0200 Subject: [PATCH 13/64] deps: update dependency org.apache.commons:commons-lang3 to v3.13.0 (#2131) --- gax-java/dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index fb8f1ac1a4..9ed129ae5b 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -59,7 +59,7 @@ maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1 maven.com_google_guava_guava=com.google.guava:guava:32.1.2-jre maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1 -maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.12.0 +maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.13.0 maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4 maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2 maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.20.0 From e996e76712b7a613ce207519a2d04e27decbac58 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 19:20:25 +0200 Subject: [PATCH 14/64] build(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.1.2 (#2127) --- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- showcase/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index e59069b36f..01e50bb79b 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -110,7 +110,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M8 + 3.1.2 diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index a3a2e568b6..e684aa302d 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -317,7 +317,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 diff --git a/showcase/pom.xml b/showcase/pom.xml index d90caf3d1d..79b3533d7c 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M8 + 3.1.2 sponge_log ${skipUnitTests} From e2f57f2fe20c920eafb0306ea51c8205e371d972 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 19:21:03 +0200 Subject: [PATCH 15/64] deps: update dependency cryptography to v41.0.4 [security] (#2109) --- .kokoro/requirements.txt | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 9a65bc06b3..66d88b0cb4 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -99,30 +99,30 @@ colorlog==6.7.0 \ --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 # via gcp-docuploader -cryptography==41.0.3 \ - --hash=sha256:0d09fb5356f975974dbcb595ad2d178305e5050656affb7890a1583f5e02a306 \ - --hash=sha256:23c2d778cf829f7d0ae180600b17e9fceea3c2ef8b31a99e3c694cbbf3a24b84 \ - --hash=sha256:3fb248989b6363906827284cd20cca63bb1a757e0a2864d4c1682a985e3dca47 \ - --hash=sha256:41d7aa7cdfded09b3d73a47f429c298e80796c8e825ddfadc84c8a7f12df212d \ - --hash=sha256:42cb413e01a5d36da9929baa9d70ca90d90b969269e5a12d39c1e0d475010116 \ - --hash=sha256:4c2f0d35703d61002a2bbdcf15548ebb701cfdd83cdc12471d2bae80878a4207 \ - --hash=sha256:4fd871184321100fb400d759ad0cddddf284c4b696568204d281c902fc7b0d81 \ - --hash=sha256:5259cb659aa43005eb55a0e4ff2c825ca111a0da1814202c64d28a985d33b087 \ - --hash=sha256:57a51b89f954f216a81c9d057bf1a24e2f36e764a1ca9a501a6964eb4a6800dd \ - --hash=sha256:652627a055cb52a84f8c448185922241dd5217443ca194d5739b44612c5e6507 \ - --hash=sha256:67e120e9a577c64fe1f611e53b30b3e69744e5910ff3b6e97e935aeb96005858 \ - --hash=sha256:6af1c6387c531cd364b72c28daa29232162010d952ceb7e5ca8e2827526aceae \ - --hash=sha256:6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34 \ - --hash=sha256:7efe8041897fe7a50863e51b77789b657a133c75c3b094e51b5e4b5cec7bf906 \ - --hash=sha256:84537453d57f55a50a5b6835622ee405816999a7113267739a1b4581f83535bd \ - --hash=sha256:8f09daa483aedea50d249ef98ed500569841d6498aa9c9f4b0531b9964658922 \ - --hash=sha256:95dd7f261bb76948b52a5330ba5202b91a26fbac13ad0e9fc8a3ac04752058c7 \ - --hash=sha256:a74fbcdb2a0d46fe00504f571a2a540532f4c188e6ccf26f1f178480117b33c4 \ - --hash=sha256:a983e441a00a9d57a4d7c91b3116a37ae602907a7618b882c8013b5762e80574 \ - --hash=sha256:ab8de0d091acbf778f74286f4989cf3d1528336af1b59f3e5d2ebca8b5fe49e1 \ - --hash=sha256:aeb57c421b34af8f9fe830e1955bf493a86a7996cc1338fe41b30047d16e962c \ - --hash=sha256:ce785cf81a7bdade534297ef9e490ddff800d956625020ab2ec2780a556c313e \ - --hash=sha256:d0d651aa754ef58d75cec6edfbd21259d93810b73f6ec246436a21b7841908de +cryptography==41.0.4 \ + --hash=sha256:004b6ccc95943f6a9ad3142cfabcc769d7ee38a3f60fb0dddbfb431f818c3a67 \ + --hash=sha256:047c4603aeb4bbd8db2756e38f5b8bd7e94318c047cfe4efeb5d715e08b49311 \ + --hash=sha256:0d9409894f495d465fe6fda92cb70e8323e9648af912d5b9141d616df40a87b8 \ + --hash=sha256:23a25c09dfd0d9f28da2352503b23e086f8e78096b9fd585d1d14eca01613e13 \ + --hash=sha256:2ed09183922d66c4ec5fdaa59b4d14e105c084dd0febd27452de8f6f74704143 \ + --hash=sha256:35c00f637cd0b9d5b6c6bd11b6c3359194a8eba9c46d4e875a3660e3b400005f \ + --hash=sha256:37480760ae08065437e6573d14be973112c9e6dcaf5f11d00147ee74f37a3829 \ + --hash=sha256:3b224890962a2d7b57cf5eeb16ccaafba6083f7b811829f00476309bce2fe0fd \ + --hash=sha256:5a0f09cefded00e648a127048119f77bc2b2ec61e736660b5789e638f43cc397 \ + --hash=sha256:5b72205a360f3b6176485a333256b9bcd48700fc755fef51c8e7e67c4b63e3ac \ + --hash=sha256:7e53db173370dea832190870e975a1e09c86a879b613948f09eb49324218c14d \ + --hash=sha256:7febc3094125fc126a7f6fb1f420d0da639f3f32cb15c8ff0dc3997c4549f51a \ + --hash=sha256:80907d3faa55dc5434a16579952ac6da800935cd98d14dbd62f6f042c7f5e839 \ + --hash=sha256:86defa8d248c3fa029da68ce61fe735432b047e32179883bdb1e79ed9bb8195e \ + --hash=sha256:8ac4f9ead4bbd0bc8ab2d318f97d85147167a488be0e08814a37eb2f439d5cf6 \ + --hash=sha256:93530900d14c37a46ce3d6c9e6fd35dbe5f5601bf6b3a5c325c7bffc030344d9 \ + --hash=sha256:9eeb77214afae972a00dee47382d2591abe77bdae166bda672fb1e24702a3860 \ + --hash=sha256:b5f4dfe950ff0479f1f00eda09c18798d4f49b98f4e2006d644b3301682ebdca \ + --hash=sha256:c3391bd8e6de35f6f1140e50aaeb3e2b3d6a9012536ca23ab0d9c35ec18c8a91 \ + --hash=sha256:c880eba5175f4307129784eca96f4e70b88e57aa3f680aeba3bab0e980b0f37d \ + --hash=sha256:cecfefa17042941f94ab54f769c8ce0fe14beff2694e9ac684176a2535bf9714 \ + --hash=sha256:e40211b4923ba5a6dc9769eab704bdb3fbb58d56c5b336d30996c24fcf12aadb \ + --hash=sha256:efc8ad4e6fc4f1752ebfb58aefece8b4e3c4cae940b0994d43649bdfce8d0d4f # via # -r requirements.in # gcp-releasetool From 5f40056fdb5d62e59744d43dd149d5da20979e59 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 19:21:18 +0200 Subject: [PATCH 16/64] deps: update dependency urllib3 to v1.26.17 [security] (#2110) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 66d88b0cb4..209e9015fb 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -398,9 +398,9 @@ typing-extensions==4.1.1 \ --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 # via -r requirements.in -urllib3==1.26.15 \ - --hash=sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305 \ - --hash=sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42 +urllib3==1.26.17 \ + --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ + --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b # via requests zipp==3.6.0 \ --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ From 69d12593dfbd0d69d2bd79df8d42def42eccb892 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 19:21:26 +0200 Subject: [PATCH 17/64] deps: update dependency gcp-releasetool to v1.16.0 (#2111) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 209e9015fb..adb799cccd 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -131,9 +131,9 @@ gcp-docuploader==0.6.5 \ --hash=sha256:30221d4ac3e5a2b9c69aa52fdbef68cc3f27d0e6d0d90e220fc024584b8d2318 \ --hash=sha256:b7458ef93f605b9d46a4bf3a8dc1755dad1f31d030c8679edf304e343b347eea # via -r requirements.in -gcp-releasetool==1.10.5 \ - --hash=sha256:174b7b102d704b254f2a26a3eda2c684fd3543320ec239baf771542a2e58e109 \ - --hash=sha256:e29d29927fe2ca493105a82958c6873bb2b90d503acac56be2c229e74de0eec9 +gcp-releasetool==1.16.0 \ + --hash=sha256:27bf19d2e87aaa884096ff941aa3c592c482be3d6a2bfe6f06afafa6af2353e3 \ + --hash=sha256:a316b197a543fd036209d0caba7a8eb4d236d8e65381c80cbc6d7efaa7606d63 # via -r requirements.in google-api-core==2.8.2 \ --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ From c8194cf29dfee221d87aaaca13983794ad089433 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 20:00:19 +0200 Subject: [PATCH 18/64] deps: update dependency google-cloud-core to v2.3.3 (#2113) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index adb799cccd..7a371d3abf 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -148,9 +148,9 @@ google-auth==2.14.1 \ # google-api-core # google-cloud-core # google-cloud-storage -google-cloud-core==2.3.2 \ - --hash=sha256:8417acf6466be2fa85123441696c4badda48db314c607cf1e5d543fa8bdc22fe \ - --hash=sha256:b9529ee7047fd8d4bf4a2182de619154240df17fbe60ead399078c1ae152af9a +google-cloud-core==2.3.3 \ + --hash=sha256:37b80273c8d7eee1ae816b3a20ae43585ea50506cb0e60f3cf5be5f87f1373cb \ + --hash=sha256:fbd11cad3e98a7e5b0343dc07cb1039a5ffd7a5bb96e1f1e27cee4bda4a90863 # via google-cloud-storage google-cloud-storage==2.0.0 \ --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ From bd4ae4fab88a421ad93e597f99cabb7997f91e1d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 20:42:19 +0200 Subject: [PATCH 19/64] deps: update google api dependencies (#2132) --- gax-java/dependencies.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 9ed129ae5b..5133152d24 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -35,8 +35,8 @@ version.io_grpc=1.58.0 # It should be constructed the following way: # 1) Take full artifact id (including the group and classifier (if any) portions) and remove version portion. # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character -maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.15.0 -maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.15.0 +maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.26.0 +maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.26.0 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.18.0 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.18.0 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1 @@ -66,10 +66,10 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_ maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.2 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.2 -maven.com_google_api_api_common=com.google.api:api-common:2.7.0 +maven.com_google_api_api_common=com.google.api:api-common:2.18.0 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8 -maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.10.0 -maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.10.0 +maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.21.0 +maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.21.0 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.43.3 maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.43.3 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23 From 5edca8b542e767cc9a9a899420f2707a5c91e1e7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 20:42:47 +0200 Subject: [PATCH 20/64] deps: update dependency com.google.auto.value:auto-value to v1.10.4 (#2137) --- gax-java/dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 5133152d24..859acb894f 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -64,7 +64,7 @@ maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4 maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2 maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.20.0 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8 -maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.2 +maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.4 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.2 maven.com_google_api_api_common=com.google.api:api-common:2.18.0 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8 From fedc7b921f5415b2d51d3147ef1aaebf1b75ccdb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 20:43:13 +0200 Subject: [PATCH 21/64] deps: update netty dependencies (#2141) --- gax-java/dependencies.properties | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 859acb894f..431472d0ea 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -42,18 +42,18 @@ maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-aut maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1 -maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.59.Final -maven.io_netty_netty_handler=io.netty:netty-handler:4.1.90.Final -maven.io_netty_netty_common=io.netty:netty-common:4.1.90.Final -maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.90.Final -maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.90.Final -maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.90.Final -maven.io_netty_netty_codec=io.netty:netty-codec:4.1.90.Final -maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.90.Final -maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.90.Final -maven.io_netty_netty_transport=io.netty:netty-transport:4.1.90.Final -maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.90.Final -maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.90.Final +maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.62.Final +maven.io_netty_netty_handler=io.netty:netty-handler:4.1.100.Final +maven.io_netty_netty_common=io.netty:netty-common:4.1.100.Final +maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.100.Final +maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.100.Final +maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.100.Final +maven.io_netty_netty_codec=io.netty:netty-codec:4.1.100.Final +maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.100.Final +maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.100.Final +maven.io_netty_netty_transport=io.netty:netty-transport:4.1.100.Final +maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.100.Final +maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.100.Final maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.26.0 maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1 From be2555565c91580df0b81ae09ad2cda8ef5a40a7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 20:43:37 +0200 Subject: [PATCH 22/64] deps: update dependency com.fasterxml.jackson:jackson-bom to v2.15.3 (#2136) --- java-shared-dependencies/third-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 2be21582fe..42882c628d 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -29,7 +29,7 @@ 0.31.1 3.0.2 2.20.0 - 2.15.2 + 2.15.3 1.15 4.4.16 4.5.14 From 38035ba5266757c2e67ac740b4947cb9b24af2a4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 20:43:53 +0200 Subject: [PATCH 23/64] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.11 (#2135) --- coverage-report/pom.xml | 2 +- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- showcase/gapic-showcase/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 17857b753f..17cd2ed7b2 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -55,7 +55,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.11 unit-tests-report-aggregate diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 01e50bb79b..6940327ffb 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -151,7 +151,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.11 unit-test-execution diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index e684aa302d..f0048036b8 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -331,7 +331,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.11 diff --git a/showcase/gapic-showcase/pom.xml b/showcase/gapic-showcase/pom.xml index fd57ed57cc..543229da11 100644 --- a/showcase/gapic-showcase/pom.xml +++ b/showcase/gapic-showcase/pom.xml @@ -27,7 +27,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.11 report From 7b3f4b97b013a32f171bd8a365d6d712b94b3849 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 20:45:56 +0200 Subject: [PATCH 24/64] deps: update protobuf dependencies to v3.24.4 (#2118) --- gapic-generator-java-pom-parent/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 6940327ffb..6c22c554e3 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -31,7 +31,7 @@ 1.43.3 2.10.1 32.1.2-jre - 3.24.3 + 3.24.4 8 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 431472d0ea..befab623f7 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -26,7 +26,7 @@ version.gax_httpjson=2.35.1-SNAPSHOT # The protobuf version is only used for generating gradle files for showcase module, # not for self-service clients (from googleapis project). -version.com_google_protobuf=3.24.3 +version.com_google_protobuf=3.24.4 version.google_java_format=1.15.0 version.io_grpc=1.58.0 From 705c358804767419f742978185fa9a93e622a1da Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 21:06:16 +0200 Subject: [PATCH 25/64] deps: update dependency com.google.auto.value:auto-value-annotations to v1.10.4 (#2138) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend 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.auto.value:auto-value-annotations](https://togithub.com/google/auto/tree/main/value) ([source](https://togithub.com/google/auto)) | `1.10.2` -> `1.10.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.auto.value:auto-value-annotations/1.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.auto.value:auto-value-annotations/1.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.auto.value:auto-value-annotations/1.10.2/1.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.auto.value:auto-value-annotations/1.10.2/1.10.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - 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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). --- gax-java/dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index befab623f7..c3c23343af 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -65,7 +65,7 @@ maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2 maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.20.0 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.4 -maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.2 +maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.4 maven.com_google_api_api_common=com.google.api:api-common:2.18.0 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.21.0 From ce59ed8be29a6b05f7c999bf48cb4d442fc2294a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 21:22:20 +0200 Subject: [PATCH 26/64] deps: update google auth library dependencies to v1.20.0 (#2142) --- gapic-generator-java-pom-parent/pom.xml | 2 +- gax-java/dependencies.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 6c22c554e3..039acb5dea 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -27,7 +27,7 @@ consistent across modules in this repository --> 1.3.2 1.58.0 - 1.19.0 + 1.20.0 1.43.3 2.10.1 32.1.2-jre diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index c3c23343af..a7a651d4ce 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -37,8 +37,8 @@ version.io_grpc=1.58.0 # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.26.0 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.26.0 -maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.18.0 -maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.18.0 +maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.20.0 +maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.20.0 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1 From c4fde0226103a559405722828f9e93e5f9969940 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 21:23:49 +0200 Subject: [PATCH 27/64] build(deps): update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.1.2 (#2143) --- gapic-generator-java-pom-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 039acb5dea..8026def588 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.1.2 From f9363315f20f27237324a5797ba20a0097283410 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 21:28:23 +0200 Subject: [PATCH 28/64] deps: update dependency com.google.errorprone:error_prone_annotations to v2.22.0 (#2145) --- java-shared-dependencies/third-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 42882c628d..e84f8c435f 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -28,7 +28,7 @@ 1.23 0.31.1 3.0.2 - 2.20.0 + 2.22.0 2.15.3 1.15 4.4.16 From 97f97c6063f91183af260d875d58958f4bba658b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 21:33:46 +0200 Subject: [PATCH 29/64] deps: update googleapis/java-cloud-bom digest to e485c2f (#2134) --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d7de8f331c..16e05aab00 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -282,7 +282,7 @@ jobs: run: | mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip - name: Validate gapic-generator-java-bom - uses: googleapis/java-cloud-bom/tests/validate-bom@2414e159ab8f882717ab7f6ae4c4a02c096b94fa + uses: googleapis/java-cloud-bom/tests/validate-bom@e485c2f4ca9ec4f06098e23ee4a24b94ff193784 with: bom-path: gapic-generator-java-bom/pom.xml From 36c2ac37466b0dcc0df1c955bcff3782d8e0b47a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 21:34:03 +0200 Subject: [PATCH 30/64] build(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.1 (#2144) --- gapic-generator-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index f0048036b8..033684e244 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -351,7 +351,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.1 package From 759e957a1a3738218a6e360660d340cb99a3268e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 21:34:26 +0200 Subject: [PATCH 31/64] deps: update dependency charset-normalizer to v2.1.1 (#2148) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 7a371d3abf..062e5ecc7c 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -84,9 +84,9 @@ cffi==1.15.1 \ --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 # via cryptography -charset-normalizer==2.0.12 \ - --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ - --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df +charset-normalizer==2.1.1 \ + --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \ + --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f # via requests click==8.0.4 \ --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ From 805daf1a9967f63b747624dd4098d78a80c083bf Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 22:06:16 +0200 Subject: [PATCH 32/64] deps: update dependency com.google.errorprone:error_prone_annotations to v2.22.0 (#2130) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend 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.errorprone:error_prone_annotations](https://errorprone.info) ([source](https://togithub.com/google/error-prone)) | `2.20.0` -> `2.22.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.errorprone:error_prone_annotations/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.errorprone:error_prone_annotations/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.errorprone:error_prone_annotations/2.20.0/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.errorprone:error_prone_annotations/2.20.0/2.22.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
google/error-prone (com.google.errorprone:error_prone_annotations) ### [`v2.22.0`](https://togithub.com/google/error-prone/releases/tag/v2.22.0): Error Prone 2.22.0 [Compare Source](https://togithub.com/google/error-prone/compare/v2.21.1...v2.22.0) We are considering raising the minimum supported JDK from JDK 11 to JDK 17 in a future release of Error Prone, see [#​3803](https://togithub.com/google/error-prone/issues/3803). Note that using a newer JDK version to run javac during the build doesn't prevent building code that is deployed to earlier versions, for example it's supported to use the JDK 17 javac and pass `--release 11` to compile Java 11 code that is deployed to a JDK 11 runtime. If you have feedback, please comment on [#​3803](https://togithub.com/google/error-prone/issues/3803). New checks: - [`ClosingStandardOutputStreams`](https://errorprone.info/bugpattern/ClosingStandardOutputStreams): Prevents accidentally closing `System.{out,err}` with try-with-resources - [`TruthContainsExactlyElementsInUsage`](https://errorprone.info/bugpattern/TruthContainsExactlyElementsInUsage): `containsExactly` is preferred over `containsExactlyElementsIn` when creating new iterables - [`UnnecessaryAsync`](https://errorprone.info/bugpattern/UnnecessaryAsync): detects unnecessary use of async primitives in local (and hence single-threaded) scopes - [`ReturnAtTheEndOfVoidFunction`](https://errorprone.info/bugpattern/ReturnAtTheEndOfVoidFunction): detects unnecessary `return` statements at the end of `void` functions - [`MultimapKeys`](https://errorprone.info/bugpattern/MultimapKeys): Suggests using `keySet()` instead of iterating over `Multimap.keys()`, which does not collapse duplicates Bug fixes and improvements: - Don't complain about literal IP addresses in `AddressSelection` (https://togithub.com/google/error-prone/commit/44b65527debbc57892f21ca3ba458b16771e423e) - Prevent SuggestedFixes#renameMethod from modifying return type declaration ([#​4043](https://togithub.com/google/error-prone/issues/4043)) - Fix UnusedVariable false positives for private record parameters ([#​2713](https://togithub.com/google/error-prone/issues/2713)) - When running in conservative mode, no longer assume that implementations of `Map.get`, etc. return `null` ([#​2910](https://togithub.com/google/error-prone/issues/2910)) - CanIgnoreReturnValueSuggester: Support additional exempting method annotations ([#​4009](https://togithub.com/google/error-prone/issues/4009)) - UnusedVariable: exclude junit5's `@RegisterExtension` ([#​3892](https://togithub.com/google/error-prone/issues/3892)) - Support running all available patch checks ([#​947](https://togithub.com/google/error-prone/issues/947)) - Upgrade java-diff-utils 4.0 -> 4.12 ([#​4081](https://togithub.com/google/error-prone/issues/4081)) - Flag unused Refaster template parameters ([#​4060](https://togithub.com/google/error-prone/issues/4060)) - Support `@SuppressWarnings("all")` ([#​4065](https://togithub.com/google/error-prone/issues/4065)) - Prevent Refaster `UMemberSelect` from matching method parameters ([#​2456](https://togithub.com/google/error-prone/issues/2456)) - MissingDefault : Don't require `// fall out` comments on expression switches ([#​2709](https://togithub.com/google/error-prone/issues/2709)) - Skip UnnecessaryLambda findings for usages in enhanced for loops ([#​2518](https://togithub.com/google/error-prone/issues/2518)) - Fix bug where nested MissingBraces violations' suggested fixes result in broken code ([#​3797](https://togithub.com/google/error-prone/issues/3797)) - Add support for specifying `exemptPrefixes`/`exemptNames` for UnusedVariable via flags ([#​2753](https://togithub.com/google/error-prone/issues/2753)) - UnusedMethod: Added exempting variable annotations ([#​2881](https://togithub.com/google/error-prone/issues/2881)) Full Changelog: https://togithub.com/google/error-prone/compare/v2.21.1...v2.22.0 ### [`v2.21.1`](https://togithub.com/google/error-prone/releases/tag/v2.21.1): Error Prone 2.21.1 [Compare Source](https://togithub.com/google/error-prone/compare/v2.21.0...v2.21.1) Changes: - Handle overlapping ranges in suppressedRegions (fixes [#​4040](https://togithub.com/google/error-prone/issues/4040)) - Add [` AddressSelection `](https://errorprone.info/bugpattern/AddressSelection) to discourage APIs that convert a hostname to a single address Full Changelog: https://togithub.com/google/error-prone/compare/v2.21.0...v2.21.1 ### [`v2.21.0`](https://togithub.com/google/error-prone/releases/tag/v2.21.0): Error Prone 2.21.0 [Compare Source](https://togithub.com/google/error-prone/compare/v2.20.0...v2.21.0) New Checkers: - [`AttemptedNegativeZero`](https://errorprone.info/bugpattern/AttemptedNegativeZero): Prevents accidental use of `-0`, which is the same as `0`. The floating-point negative zero is `-0.0`. - [`ICCProfileGetInstance`](https://errorprone.info/bugpattern/ICCProfileGetInstance): Warns on uses of `ICC_Profile.getInstance(String)`, due to [JDK-8191622](https://bugs.openjdk.org/browse/JDK-8191622). - [`MutableGuiceModule`](https://errorprone.info/bugpattern/MutableGuiceModule): Fields in Guice modules should be `final`. - [`NullableOptional`](https://errorprone.info/bugpattern/NullableOptional): Discourages `@Nullable`-annotated `Optional`s. - [`OverridingMethodInconsistentArgumentNamesChecker`](https://errorprone.info/bugpattern/OverridingMethodInconsistentArgumentNamesChecker): Arguments of overriding method are inconsistent with overridden method. Fixed issues: [#​3976](https://togithub.com/google/error-prone/issues/3976), [#​3986](https://togithub.com/google/error-prone/issues/3986), [#​4001](https://togithub.com/google/error-prone/issues/4001), [#​4002](https://togithub.com/google/error-prone/issues/4002), [#​4026](https://togithub.com/google/error-prone/issues/4026), [#​4027](https://togithub.com/google/error-prone/issues/4027) Full Changelog: https://togithub.com/google/error-prone/compare/v2.20.0...v2.21.0
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - 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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). --- api-common-java/pom.xml | 2 +- gapic-generator-java/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index d5386d76c1..990f4317e7 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -63,7 +63,7 @@ com.google.errorprone error_prone_annotations - 2.20.0 + 2.22.0 compile diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 033684e244..c0ac8fa2ac 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -451,7 +451,7 @@ com.google.errorprone error_prone_annotations - 2.20.0 + 2.22.0 From 8c1baf59fac515b10698b1548a7104e8ef82cd1e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 22:43:22 +0200 Subject: [PATCH 34/64] deps: update dependency google-api-core to v2.12.0 (#2153) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 062e5ecc7c..314eff5fe6 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -135,9 +135,9 @@ gcp-releasetool==1.16.0 \ --hash=sha256:27bf19d2e87aaa884096ff941aa3c592c482be3d6a2bfe6f06afafa6af2353e3 \ --hash=sha256:a316b197a543fd036209d0caba7a8eb4d236d8e65381c80cbc6d7efaa7606d63 # via -r requirements.in -google-api-core==2.8.2 \ - --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ - --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 +google-api-core==2.12.0 \ + --hash=sha256:c22e01b1e3c4dcd90998494879612c38d0a3411d1f7b679eb89e2abe3ce1f553 \ + --hash=sha256:ec6054f7d64ad13b41e43d96f735acbd763b0f3b695dabaa2d579673f6a6e160 # via # google-cloud-core # google-cloud-storage From db37d5ba609adf571c75f9f2f51c39b7453b862b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 22:48:28 +0200 Subject: [PATCH 35/64] deps: update dependency cffi to v1.16.0 (#2147) --- .kokoro/requirements.txt | 118 ++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 65 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 314eff5fe6..96e2b4f6d8 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -18,71 +18,59 @@ certifi==2023.7.22 \ # via # -r requirements.in # requests -cffi==1.15.1 \ - --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ - --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ - --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \ - --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \ - --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \ - --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \ - --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \ - --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \ - --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \ - --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \ - --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \ - --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \ - --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \ - --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \ - --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \ - --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \ - --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \ - --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \ - --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \ - --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \ - --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \ - --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \ - --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \ - --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \ - --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \ - --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \ - --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \ - --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \ - --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \ - --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \ - --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \ - --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \ - --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \ - --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \ - --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \ - --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \ - --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \ - --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \ - --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \ - --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \ - --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \ - --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \ - --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \ - --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \ - --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \ - --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \ - --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \ - --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \ - --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \ - --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \ - --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \ - --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \ - --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \ - --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \ - --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \ - --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \ - --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \ - --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \ - --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \ - --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \ - --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \ - --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ - --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ - --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 +cffi==1.16.0 \ + --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \ + --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \ + --hash=sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417 \ + --hash=sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab \ + --hash=sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520 \ + --hash=sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36 \ + --hash=sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743 \ + --hash=sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8 \ + --hash=sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed \ + --hash=sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684 \ + --hash=sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56 \ + --hash=sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324 \ + --hash=sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d \ + --hash=sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235 \ + --hash=sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e \ + --hash=sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088 \ + --hash=sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000 \ + --hash=sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7 \ + --hash=sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e \ + --hash=sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673 \ + --hash=sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c \ + --hash=sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe \ + --hash=sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2 \ + --hash=sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098 \ + --hash=sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8 \ + --hash=sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a \ + --hash=sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0 \ + --hash=sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b \ + --hash=sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896 \ + --hash=sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e \ + --hash=sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9 \ + --hash=sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2 \ + --hash=sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b \ + --hash=sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6 \ + --hash=sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404 \ + --hash=sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f \ + --hash=sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0 \ + --hash=sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4 \ + --hash=sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc \ + --hash=sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936 \ + --hash=sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba \ + --hash=sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872 \ + --hash=sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb \ + --hash=sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614 \ + --hash=sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1 \ + --hash=sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d \ + --hash=sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969 \ + --hash=sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b \ + --hash=sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4 \ + --hash=sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627 \ + --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \ + --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357 # via cryptography charset-normalizer==2.1.1 \ --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \ From 49d7f55df0efd1ebf4ec074a8b9c23324de69149 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 22:50:19 +0200 Subject: [PATCH 36/64] deps: update dependency attrs to v22.2.0 (#2146) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [attrs](https://togithub.com/python-attrs/attrs) ([changelog](https://www.attrs.org/en/stable/changelog.html)) | `==22.1.0` -> `==22.2.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/attrs/22.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/attrs/22.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/attrs/22.1.0/22.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/attrs/22.1.0/22.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
python-attrs/attrs (attrs) ### [`v22.2.0`](https://togithub.com/python-attrs/attrs/blob/HEAD/CHANGELOG.md#2220---2022-12-21) [Compare Source](https://togithub.com/python-attrs/attrs/compare/22.1.0...22.2.0) ##### Backwards-incompatible Changes - Python 3.5 is not supported anymore. [#​988](https://togithub.com/python-attrs/attrs/issues/988) ##### Deprecations - Python 3.6 is now deprecated and support will be removed in the next release. [#​1017](https://togithub.com/python-attrs/attrs/issues/1017) ##### Changes - `attrs.field()` now supports an *alias* option for explicit `__init__` argument names. Get `__init__` signatures matching any taste, peculiar or plain! The [PEP 681 compatible](https://peps.python.org/pep-0681/#field-specifier-parameters) *alias* option can be use to override private attribute name mangling, or add other arbitrary field argument name overrides. [#​950](https://togithub.com/python-attrs/attrs/issues/950) - `attrs.NOTHING` is now an enum value, making it possible to use with e.g. [`typing.Literal`](https://docs.python.org/3/library/typing.html#typing.Literal). [#​983](https://togithub.com/python-attrs/attrs/issues/983) - Added missing re-import of `attr.AttrsInstance` to the `attrs` namespace. [#​987](https://togithub.com/python-attrs/attrs/issues/987) - Fix slight performance regression in classes with custom `__setattr__` and speedup even more. [#​991](https://togithub.com/python-attrs/attrs/issues/991) - Class-creation performance improvements by switching performance-sensitive templating operations to f-strings. You can expect an improvement of about 5% -- even for very simple classes. [#​995](https://togithub.com/python-attrs/attrs/issues/995) - `attrs.has()` is now a [`TypeGuard`](https://docs.python.org/3/library/typing.html#typing.TypeGuard) for `AttrsInstance`. That means that type checkers know a class is an instance of an `attrs` class if you check it using `attrs.has()` (or `attr.has()`) first. [#​997](https://togithub.com/python-attrs/attrs/issues/997) - Made `attrs.AttrsInstance` stub available at runtime and fixed type errors related to the usage of `attrs.AttrsInstance` in *Pyright*. [#​999](https://togithub.com/python-attrs/attrs/issues/999) - On Python 3.10 and later, call [`abc.update_abstractmethods()`](https://docs.python.org/3/library/abc.html#abc.update_abstractmethods) on dict classes after creation. This improves the detection of abstractness. [#​1001](https://togithub.com/python-attrs/attrs/issues/1001) - *attrs*'s pickling methods now use dicts instead of tuples. That is safer and more robust across different versions of a class. [#​1009](https://togithub.com/python-attrs/attrs/issues/1009) - Added `attrs.validators.not_(wrapped_validator)` to logically invert *wrapped_validator* by accepting only values where *wrapped_validator* rejects the value with a `ValueError` or `TypeError` (by default, exception types configurable). [#​1010](https://togithub.com/python-attrs/attrs/issues/1010) - The type stubs for `attrs.cmp_using()` now have default values. [#​1027](https://togithub.com/python-attrs/attrs/issues/1027) - To conform with [PEP 681](https://peps.python.org/pep-0681/), `attr.s()` and `attrs.define()` now accept *unsafe_hash* in addition to *hash*. [#​1065](https://togithub.com/python-attrs/attrs/issues/1065)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - 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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 96e2b4f6d8..af7067c433 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -4,9 +4,9 @@ # # pip-compile --generate-hashes .kokoro/requirements.in # -attrs==22.1.0 \ - --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ - --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c +attrs==22.2.0 \ + --hash=sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836 \ + --hash=sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99 # via gcp-releasetool cachetools==4.2.4 \ --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ From 3645fed46926cf4f402e4986749db55b86fab6b6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 23:24:59 +0200 Subject: [PATCH 37/64] deps: update dependency google-auth to v2.23.3 (#2154) --- .kokoro/requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index af7067c433..049e945da5 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -129,8 +129,9 @@ google-api-core==2.12.0 \ # via # google-cloud-core # google-cloud-storage -google-auth==2.14.1 \ - --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 +google-auth==2.23.3 \ + --hash=sha256:6864247895eea5d13b9c57c9e03abb49cb94ce2dc7c58e91cba3248c7477c9e3 \ + --hash=sha256:a8f4608e65c244ead9e0538f181a96c6e11199ec114d41f1d7b1bffa96937bda # via # gcp-releasetool # google-api-core From f7fd515b00ff615cbd7b86c8471b2a1d8a1ce2ee Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 23:25:17 +0200 Subject: [PATCH 38/64] deps: update dependency googleapis-common-protos to v1.61.0 (#2156) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 049e945da5..c180de386c 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -194,9 +194,9 @@ google-resumable-media==2.3.3 \ --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 # via google-cloud-storage -googleapis-common-protos==1.56.3 \ - --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ - --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 +googleapis-common-protos==1.61.0 \ + --hash=sha256:22f1915393bb3245343f6efe87f6fe868532efc12aa26b391b15132e1279f1c0 \ + --hash=sha256:8a64866a97f6304a7179873a465d6eee97b7a24ec6cfd78e0f575e96b821240b # via google-api-core idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ From 6556ed588bad9901592949ce5674ac2894102bd2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 00:04:26 +0200 Subject: [PATCH 39/64] deps: update dependency google-crc32c to v1.5.0 (#2157) --- .kokoro/requirements.txt | 113 ++++++++++++++++++++++++--------------- 1 file changed, 69 insertions(+), 44 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index c180de386c..30ae1c445d 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -145,50 +145,75 @@ google-cloud-storage==2.0.0 \ --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 # via gcp-docuploader -google-crc32c==1.3.0 \ - --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ - --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ - --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \ - --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \ - --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \ - --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \ - --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \ - --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \ - --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \ - --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \ - --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \ - --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \ - --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \ - --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \ - --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \ - --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \ - --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \ - --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \ - --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \ - --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \ - --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \ - --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \ - --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \ - --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \ - --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \ - --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \ - --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \ - --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \ - --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \ - --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \ - --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \ - --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \ - --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \ - --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \ - --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \ - --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \ - --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \ - --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \ - --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \ - --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \ - --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ - --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ - --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 +google-crc32c==1.5.0 \ + --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ + --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \ + --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \ + --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \ + --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \ + --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \ + --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \ + --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \ + --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \ + --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \ + --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \ + --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \ + --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \ + --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \ + --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \ + --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \ + --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \ + --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \ + --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \ + --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \ + --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \ + --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \ + --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \ + --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \ + --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \ + --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \ + --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \ + --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \ + --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \ + --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \ + --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \ + --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \ + --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \ + --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \ + --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \ + --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \ + --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \ + --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \ + --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \ + --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \ + --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \ + --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \ + --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \ + --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \ + --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \ + --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \ + --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \ + --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \ + --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \ + --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \ + --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \ + --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \ + --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \ + --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \ + --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \ + --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \ + --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \ + --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \ + --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \ + --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \ + --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \ + --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \ + --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \ + --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \ + --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \ + --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \ + --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \ + --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4 # via google-resumable-media google-resumable-media==2.3.3 \ --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ From dfe2bbcd6079ab0b28f091bc132dfc27c9ab98c0 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 00:04:49 +0200 Subject: [PATCH 40/64] deps: update dependency org.checkerframework:checker-qual to v3.39.0 (#2158) --- java-shared-dependencies/third-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 8f4160d07f..a7bb92be0d 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -34,7 +34,7 @@ 4.4.16 4.5.14 - 3.33.0 + 3.39.0 0.26.0 2.8
From 8daf1452351aa0df2e282676a69e90c3743b4edf Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 00:05:16 +0200 Subject: [PATCH 41/64] deps: update dependency org.easymock:easymock to v5.2.0 (#2159) --- java-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-core/pom.xml b/java-core/pom.xml index 3fb36c2791..ff53b56d8d 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -59,7 +59,7 @@ org.easymock easymock - 5.1.0 + 5.2.0 test From 0664bf6e578861197abd3ed31148d7db27b8eb53 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 00:05:44 +0200 Subject: [PATCH 42/64] deps: update dependency org.yaml:snakeyaml to v2.2 (#2160) --- gapic-generator-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index c0ac8fa2ac..33693ba0f7 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -436,7 +436,7 @@ org.yaml snakeyaml - 2.0 + 2.2 com.google.googlejavaformat From 87dd6f2862dbd82fe267008306e841c4e9bb5af2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 00:12:38 +0200 Subject: [PATCH 43/64] deps: update dependency google-resumable-media to v2.6.0 (#2161) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 30ae1c445d..b5712a8579 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -215,9 +215,9 @@ google-crc32c==1.5.0 \ --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \ --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4 # via google-resumable-media -google-resumable-media==2.3.3 \ - --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ - --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 +google-resumable-media==2.6.0 \ + --hash=sha256:972852f6c65f933e15a4a210c2b96930763b47197cdf4aa5f5bea435efb626e7 \ + --hash=sha256:fc03d344381970f79eebb632a3c18bb1828593a2dc5572b5f90115ef7d11e81b # via google-cloud-storage googleapis-common-protos==1.61.0 \ --hash=sha256:22f1915393bb3245343f6efe87f6fe868532efc12aa26b391b15132e1279f1c0 \ From 0ec902795ae36ff16890a1c02c07b2b977dfed14 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 01:05:12 +0200 Subject: [PATCH 44/64] deps: update dependency google-cloud-storage to v2.12.0 (#2155) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index b5712a8579..ee7775d95c 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -141,9 +141,9 @@ google-cloud-core==2.3.3 \ --hash=sha256:37b80273c8d7eee1ae816b3a20ae43585ea50506cb0e60f3cf5be5f87f1373cb \ --hash=sha256:fbd11cad3e98a7e5b0343dc07cb1039a5ffd7a5bb96e1f1e27cee4bda4a90863 # via google-cloud-storage -google-cloud-storage==2.0.0 \ - --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ - --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 +google-cloud-storage==2.12.0 \ + --hash=sha256:57c0bcda2f5e11f008a155d8636d8381d5abab46b58e0cae0e46dd5e595e6b46 \ + --hash=sha256:bc52563439d42981b6e21b071a76da2791672776eda3ba99d13a8061ebbd6e5e # via gcp-docuploader google-crc32c==1.5.0 \ --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ From ac6e3d5bbeab2dbf35aefc14b20217119e99460d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 01:05:41 +0200 Subject: [PATCH 45/64] deps: update dependency importlib-metadata to v4.13.0 (#2162) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index ee7775d95c..33e37f7206 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -227,9 +227,9 @@ idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 # via requests -importlib-metadata==4.8.3 \ - --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ - --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 +importlib-metadata==4.13.0 \ + --hash=sha256:8a8a81bcf996e74fee46f0d16bd3eaa382a7eb20fd82445c3ad11f4090334116 \ + --hash=sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d # via keyring jeepney==0.7.1 \ --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ From 59744b56409564dab142f24533672b1fa9726313 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 03:24:28 +0200 Subject: [PATCH 46/64] deps: update dependency jeepney to v0.8.0 (#2165) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 33e37f7206..93c0655837 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -231,9 +231,9 @@ importlib-metadata==4.13.0 \ --hash=sha256:8a8a81bcf996e74fee46f0d16bd3eaa382a7eb20fd82445c3ad11f4090334116 \ --hash=sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d # via keyring -jeepney==0.7.1 \ - --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ - --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f +jeepney==0.8.0 \ + --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ + --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 # via # keyring # secretstorage From 4abbf858712b1f629df8b19a9007d1a09451e5e2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 03:24:50 +0200 Subject: [PATCH 47/64] deps: update dependency pyasn1-modules to v0.3.0 (#2171) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 93c0655837..48d0a635d1 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -361,9 +361,9 @@ pyasn1==0.4.8 \ # via # pyasn1-modules # rsa -pyasn1-modules==0.2.8 \ - --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ - --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74 +pyasn1-modules==0.3.0 \ + --hash=sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c \ + --hash=sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d # via google-auth pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ From ea26b1aedcdb4eb08449194b111b00e07c2c0d02 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 03:25:10 +0200 Subject: [PATCH 48/64] deps: update dependency markupsafe to v2.1.3 (#2168) --- .kokoro/requirements.txt | 131 ++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 70 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 48d0a635d1..7f79f1166b 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -249,76 +249,67 @@ keyring==23.4.1 \ # via # -r requirements.in # gcp-releasetool -markupsafe==2.0.1 \ - --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ - --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ - --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \ - --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \ - --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \ - --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \ - --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \ - --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \ - --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \ - --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \ - --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \ - --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \ - --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \ - --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \ - --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \ - --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \ - --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \ - --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \ - --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \ - --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \ - --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \ - --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \ - --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \ - --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \ - --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \ - --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \ - --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \ - --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \ - --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \ - --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \ - --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \ - --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \ - --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \ - --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \ - --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \ - --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \ - --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \ - --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \ - --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \ - --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \ - --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \ - --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \ - --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \ - --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \ - --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \ - --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \ - --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \ - --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \ - --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \ - --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \ - --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \ - --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \ - --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \ - --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \ - --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \ - --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \ - --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \ - --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \ - --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \ - --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \ - --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \ - --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \ - --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \ - --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \ - --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \ - --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \ - --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ - --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ - --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 +MarkupSafe==2.1.3 \ + --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \ + --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \ + --hash=sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431 \ + --hash=sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686 \ + --hash=sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c \ + --hash=sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559 \ + --hash=sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc \ + --hash=sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb \ + --hash=sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939 \ + --hash=sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c \ + --hash=sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0 \ + --hash=sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4 \ + --hash=sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9 \ + --hash=sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575 \ + --hash=sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba \ + --hash=sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d \ + --hash=sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd \ + --hash=sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3 \ + --hash=sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00 \ + --hash=sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155 \ + --hash=sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac \ + --hash=sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52 \ + --hash=sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f \ + --hash=sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8 \ + --hash=sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b \ + --hash=sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007 \ + --hash=sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24 \ + --hash=sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea \ + --hash=sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198 \ + --hash=sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0 \ + --hash=sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee \ + --hash=sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be \ + --hash=sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2 \ + --hash=sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1 \ + --hash=sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707 \ + --hash=sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6 \ + --hash=sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c \ + --hash=sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58 \ + --hash=sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823 \ + --hash=sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779 \ + --hash=sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636 \ + --hash=sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c \ + --hash=sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad \ + --hash=sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee \ + --hash=sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc \ + --hash=sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2 \ + --hash=sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48 \ + --hash=sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7 \ + --hash=sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e \ + --hash=sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b \ + --hash=sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa \ + --hash=sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5 \ + --hash=sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e \ + --hash=sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb \ + --hash=sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9 \ + --hash=sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57 \ + --hash=sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc \ + --hash=sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc \ + --hash=sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2 \ + --hash=sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11 # via jinja2 packaging==21.3 \ --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ From c7ac765237c7bbed041e7b15b040625f411eee5c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 03:25:22 +0200 Subject: [PATCH 49/64] deps: update dependency jinja2 to v3.1.2 (#2166) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 7f79f1166b..e58492f06e 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -237,9 +237,9 @@ jeepney==0.8.0 \ # via # keyring # secretstorage -jinja2==3.0.3 \ - --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ - --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 +Jinja2==3.1.2 \ + --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ + --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 # via # -r requirements.in # gcp-releasetool From 669d3698cb76471cd0c9c6a398fb7b3d848d1571 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 15:10:10 +0200 Subject: [PATCH 50/64] deps: update dependency protobuf to v3.20.3 (#2169) --- .kokoro/requirements.txt | 49 +++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index e58492f06e..e66fb334fb 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -315,32 +315,29 @@ packaging==21.3 \ --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via gcp-releasetool -protobuf==3.19.5 \ - --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \ - --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \ - --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \ - --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \ - --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \ - --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \ - --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \ - --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \ - --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \ - --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \ - --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \ - --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \ - --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \ - --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \ - --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \ - --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \ - --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \ - --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \ - --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \ - --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \ - --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \ - --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \ - --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \ - --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \ - --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de +protobuf==3.20.3 \ + --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ + --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \ + --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \ + --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \ + --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \ + --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \ + --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \ + --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \ + --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \ + --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \ + --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \ + --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \ + --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \ + --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \ + --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \ + --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \ + --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \ + --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \ + --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \ + --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \ + --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \ + --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee # via # gcp-docuploader # gcp-releasetool From a842045c71cdf88975505c90b5915eba321f0a65 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 15:10:34 +0200 Subject: [PATCH 51/64] deps: update dependency pyasn1 to v0.5.0 (#2170) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index e66fb334fb..6ba69cce40 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -343,9 +343,9 @@ protobuf==3.20.3 \ # gcp-releasetool # google-api-core # google-cloud-storage -pyasn1==0.4.8 \ - --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ - --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba +pyasn1==0.5.0 \ + --hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \ + --hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde # via # pyasn1-modules # rsa From 875146eb3c1ac3cb1953980825f79c75c3251ea6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 15:10:46 +0200 Subject: [PATCH 52/64] deps: update dependency pyjwt to v2.8.0 (#2172) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 6ba69cce40..b0eb4fbf4a 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -357,9 +357,9 @@ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 # via cffi -pyjwt==2.4.0 \ - --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ - --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba +PyJWT==2.8.0 \ + --hash=sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de \ + --hash=sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320 # via gcp-releasetool pyparsing==3.0.9 \ --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ From caac8316a12aa0d8b7ef5f57912727a1abfc3151 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 15:10:59 +0200 Subject: [PATCH 53/64] deps: update dependency pyparsing to v3.1.1 (#2173) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index b0eb4fbf4a..c1f45b7784 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -361,9 +361,9 @@ PyJWT==2.8.0 \ --hash=sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de \ --hash=sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320 # via gcp-releasetool -pyparsing==3.0.9 \ - --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ - --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc +pyparsing==3.1.1 \ + --hash=sha256:32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb \ + --hash=sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db # via packaging pyperclip==1.8.2 \ --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 From 1a8f7a446665b6fe03dd98856734ec48b59e080f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 15:11:11 +0200 Subject: [PATCH 54/64] deps: update dependency typing-extensions to v4.8.0 (#2174) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index c1f45b7784..d4a6b11c0f 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -396,9 +396,9 @@ six==1.16.0 \ # gcp-docuploader # google-auth # python-dateutil -typing-extensions==4.1.1 \ - --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ - --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 +typing-extensions==4.8.0 \ + --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \ + --hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef # via -r requirements.in urllib3==1.26.17 \ --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ From 1700c597a74f906689a3a53e023ac094c9deeaff Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 15:11:28 +0200 Subject: [PATCH 55/64] deps: update dependency zipp to v3.17.0 (#2175) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index d4a6b11c0f..5f2e1813cd 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -404,7 +404,7 @@ urllib3==1.26.17 \ --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b # via requests -zipp==3.6.0 \ - --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ - --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc +zipp==3.17.0 \ + --hash=sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 \ + --hash=sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0 # via importlib-metadata From 9683111627bca74ed0d123caf37ff0993c71d2ea Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 21:02:03 +0200 Subject: [PATCH 56/64] deps: update dependency urllib3 to v1.26.18 (#2177) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 5f2e1813cd..56bdc9e94a 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -400,9 +400,9 @@ typing-extensions==4.8.0 \ --hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \ --hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef # via -r requirements.in -urllib3==1.26.17 \ - --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ - --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b +urllib3==1.26.18 \ + --hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \ + --hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0 # via requests zipp==3.17.0 \ --hash=sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 \ From b17d8a12575b273b4536b42c37bf61b321fc0e5a Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Tue, 17 Oct 2023 19:16:49 +0000 Subject: [PATCH 57/64] feat: add gapic options as inputs to `generate_library.sh` (#2121) * feat: add gapic options as inputs * fix unit tests * fix showcase generation * make sure gapic option exists in `proto_path` * add docs * change log format * add two libraries in integration test * add a warning if gapic option does not exist * change grpc_service_config to service_config * search for gapic options in `proto_path` if they are empty * format gapic options * fix unit tests --- library_generation/README.md | 18 ++++++ library_generation/generate_library.sh | 26 +++++++- .../test/generate_library_integration_test.sh | 14 ++++- .../test/generate_library_unit_tests.sh | 18 +++++- .../test/resources/proto_path_list.txt | 2 + library_generation/test/test_utilities.sh | 61 +++++++++++++++++++ library_generation/utilities.sh | 33 ++++++---- showcase/scripts/generate_showcase.sh | 6 ++ 8 files changed, 160 insertions(+), 18 deletions(-) diff --git a/library_generation/README.md b/library_generation/README.md index 19f033e0a0..7a2fe32e3e 100644 --- a/library_generation/README.md +++ b/library_generation/README.md @@ -122,6 +122,24 @@ The default value is `true`. Use `--rest_numeric_enums` to specify the value. +### gapic_yaml (optional) +One of GAPIC options passed to the generator. +The default value is an empty string. + +Use `--gapic_yaml` to specify the value. + +### service_config (optional) +One of GAPIC options passed to the generator. +The default value is an empty string. + +Use `--service_config` to specify the value. + +### service_yaml (optional) +One of GAPIC options passed to the generator. +The default value is an empty string. + +Use `--service_yaml` to specify the value. + ### include_samples (optional) Whether generates code samples. The value is either `true` or `false`. The default value is `true`. diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index 82f5a29e86..04e3fbe860 100755 --- a/library_generation/generate_library.sh +++ b/library_generation/generate_library.sh @@ -45,6 +45,18 @@ case $key in rest_numeric_enums="$2" shift ;; + --gapic_yaml) + gapic_yaml="$2" + shift + ;; + --service_config) + service_config="$2" + shift + ;; + --service_yaml) + service_yaml="$2" + shift + ;; --include_samples) include_samples="$2" shift @@ -89,6 +101,18 @@ if [ -z "${rest_numeric_enums}" ]; then rest_numeric_enums="true" fi +if [ -z "${gapic_yaml}" ]; then + gapic_yaml="" +fi + +if [ -z "${service_config}" ]; then + service_config="" +fi + +if [ -z "${service_yaml}" ]; then + service_yaml="" +fi + if [ -z "${include_samples}" ]; then include_samples="true" fi @@ -166,7 +190,7 @@ if [[ "${proto_only}" == "false" ]]; then "$protoc_path"/protoc --experimental_allow_proto3_optional \ "--plugin=protoc-gen-java_gapic=${script_dir}/gapic-generator-java-wrapper" \ "--java_gapic_out=metadata:${destination_path}/java_gapic_srcjar_raw.srcjar.zip" \ - "--java_gapic_opt=$(get_gapic_opts)" \ + "--java_gapic_opt=$(get_gapic_opts "${transport}" "${rest_numeric_enums}" "${gapic_yaml}" "${service_config}" "${service_yaml}")" \ ${proto_files} ${gapic_additional_protos} unzip -o -q "${destination_path}/java_gapic_srcjar_raw.srcjar.zip" -d "${destination_path}" diff --git a/library_generation/test/generate_library_integration_test.sh b/library_generation/test/generate_library_integration_test.sh index 910c22415b..c4ea9fde25 100755 --- a/library_generation/test/generate_library_integration_test.sh +++ b/library_generation/test/generate_library_integration_test.sh @@ -68,9 +68,18 @@ grep -v '^ *#' < "${proto_path_list}" | while IFS= read -r line; do gapic_additional_protos=$(get_gapic_additional_protos_from_BUILD "${proto_build_file_path}") transport=$(get_transport_from_BUILD "${proto_build_file_path}") rest_numeric_enums=$(get_rest_numeric_enums_from_BUILD "${proto_build_file_path}") + gapic_yaml=$(get_gapic_yaml_from_BUILD "${proto_build_file_path}") + service_config=$(get_service_config_from_BUILD "${proto_build_file_path}") + service_yaml=$(get_service_yaml_from_BUILD "${proto_build_file_path}") include_samples=$(get_include_samples_from_BUILD "${proto_build_file_path}") popd # output_folder - echo "GAPIC options are transport=${transport}, rest_numeric_enums=${rest_numeric_enums}, include_samples=${include_samples}." + echo "GAPIC options are + transport=${transport}, + rest_numeric_enums=${rest_numeric_enums}, + gapic_yaml=${gapic_yaml}, + service_config=${service_config}, + service_yaml=${service_yaml}, + include_samples=${include_samples}." # generate GAPIC client library echo "Generating library from ${proto_path}, to ${destination_path}..." "${library_generation_dir}"/generate_library.sh \ @@ -82,6 +91,9 @@ grep -v '^ *#' < "${proto_path_list}" | while IFS= read -r line; do --gapic_additional_protos "${gapic_additional_protos}" \ --transport "${transport}" \ --rest_numeric_enums "${rest_numeric_enums}" \ + --gapic_yaml "${gapic_yaml}" \ + --service_config "${service_config}" \ + --service_yaml "${service_yaml}" \ --include_samples "${include_samples}" echo "Generate library finished." echo "Checking out googleapis-gen repository..." diff --git a/library_generation/test/generate_library_unit_tests.sh b/library_generation/test/generate_library_unit_tests.sh index 8906f3c4cd..8fc94ce94b 100755 --- a/library_generation/test/generate_library_unit_tests.sh +++ b/library_generation/test/generate_library_unit_tests.sh @@ -46,7 +46,7 @@ get_gapic_opts_with_rest_test() { local transport="grpc" local rest_numeric_enums="true" local gapic_opts - gapic_opts="$(get_gapic_opts)" + gapic_opts="$(get_gapic_opts "${transport}" "${rest_numeric_enums}" "" "" "")" assertEquals \ "transport=grpc,rest-numeric-enums,grpc-service-config=${proto_path}/example_grpc_service_config.json,gapic-config=${proto_path}/example_gapic.yaml,api-service-config=${proto_path}/example.yaml" \ "${gapic_opts}" @@ -57,9 +57,20 @@ get_gapic_opts_without_rest_test() { local transport="grpc" local rest_numeric_enums="false" local gapic_opts - gapic_opts="$(get_gapic_opts)" + gapic_opts="$(get_gapic_opts "${transport}" "${rest_numeric_enums}" "" "" "")" assertEquals \ - "transport=grpc,grpc-service-config=${proto_path}/example_grpc_service_config.json,gapic-config=${proto_path}/example_gapic.yaml,api-service-config=${proto_path}/example.yaml" \ + "transport=grpc,,grpc-service-config=${proto_path}/example_grpc_service_config.json,gapic-config=${proto_path}/example_gapic.yaml,api-service-config=${proto_path}/example.yaml" \ + "$gapic_opts" +} + +get_gapic_opts_with_non_default_test() { + local proto_path="${script_dir}/resources/gapic_options" + local transport="grpc" + local rest_numeric_enums="false" + local gapic_opts + gapic_opts="$(get_gapic_opts "${transport}" "${rest_numeric_enums}" "${proto_path}/example_gapic.yaml" "${proto_path}/example_grpc_service_config.json" "${proto_path}/example.yaml")" + assertEquals \ + "transport=grpc,,grpc-service-config=${proto_path}/example_grpc_service_config.json,gapic-config=${proto_path}/example_gapic.yaml,api-service-config=${proto_path}/example.yaml" \ "$gapic_opts" } @@ -304,6 +315,7 @@ test_list=( get_protobuf_version_failed_with_invalid_generator_version_test get_gapic_opts_with_rest_test get_gapic_opts_without_rest_test + get_gapic_opts_with_non_default_test remove_grpc_version_test download_generator_success_with_valid_version_test download_generator_failed_with_invalid_version_test diff --git a/library_generation/test/resources/proto_path_list.txt b/library_generation/test/resources/proto_path_list.txt index 1e5faf9e8f..2910caa62b 100755 --- a/library_generation/test/resources/proto_path_list.txt +++ b/library_generation/test/resources/proto_path_list.txt @@ -6,7 +6,9 @@ google/cloud/apigeeconnect/v1 google-cloud-apigeeconnect-v1-java google/cloud/asset/v1 google-cloud-asset-v1-java google/cloud/compute/v1 google-cloud-compute-v1-java google/cloud/kms/v1 google-cloud-kms-v1-java +google/cloud/optimization/v1 google-cloud-optimization-v1-java google/cloud/redis/v1 google-cloud-redis-v1-java +google/cloud/videointelligence/v1p3beta1 google-cloud-videointelligence-v1p3beta1-java google/example/library/v1 google-cloud-example-library-v1-java google/devtools/containeranalysis/v1 google-cloud-devtools-containeranalysis-v1-java google/firestore/bundle google-cloud-firestore-bundle-v1-java diff --git a/library_generation/test/test_utilities.sh b/library_generation/test/test_utilities.sh index 5620ecd49d..578dd8c56d 100755 --- a/library_generation/test/test_utilities.sh +++ b/library_generation/test/test_utilities.sh @@ -44,6 +44,46 @@ __get_config_from_BUILD() { echo "${result}" } +__get_gapic_option_from_BUILD() { + local build_file=$1 + local pattern=$2 + local gapic_option + local file_path + gapic_option=$(grep "${pattern}" "${build_file}" |\ + head -1 |\ + sed 's/.*\"\([^]]*\)\".*/\1/g' |\ + sed 's/^[[:space:]]*//;s/[[:space:]]*$//' + ) + if [ -z "${gapic_option}" ] || [[ "${gapic_option}" == *"None"* ]]; then + echo "" + return + fi + + if [[ "${gapic_option}" == ":"* ]] || [[ "${gapic_option}" == "*"* ]]; then + # if gapic_option starts with : or *, remove the first character. + gapic_option="${gapic_option:1}" + elif [[ "${gapic_option}" == "//"* ]]; then + # gapic option is a bazel target, use the file path and name directly. + # remove the leading "//". + gapic_option="${gapic_option:2}" + # replace ":" with "/" + gapic_option="${gapic_option//://}" + echo "${gapic_option}" + return + fi + + file_path="${build_file%/*}" + # Make sure gapic option (*.yaml or *.json) exists in proto_path; otherwise + # reset gapic option to empty string. + if [ -f "${file_path}/${gapic_option}" ]; then + gapic_option="${file_path}/${gapic_option}" + else + echo "WARNING: file ${file_path}/${gapic_option} does not exist, reset gapic option to empty string." >&2 + gapic_option="" + fi + echo "${gapic_option}" +} + __get_iam_policy_from_BUILD() { local build_file=$1 local contains_iam_policy @@ -190,6 +230,27 @@ get_rest_numeric_enums_from_BUILD() { echo "${rest_numeric_enums}" } +get_gapic_yaml_from_BUILD() { + local build_file=$1 + local gapic_yaml + gapic_yaml=$(__get_gapic_option_from_BUILD "${build_file}" "gapic_yaml = ") + echo "${gapic_yaml}" +} + +get_service_config_from_BUILD() { + local build_file=$1 + local service_config + service_config=$(__get_gapic_option_from_BUILD "${build_file}" "grpc_service_config = ") + echo "${service_config}" +} + +get_service_yaml_from_BUILD() { + local build_file=$1 + local service_yaml + service_yaml=$(__get_gapic_option_from_BUILD "${build_file}" "service_yaml") + echo "${service_yaml}" +} + get_include_samples_from_BUILD() { local build_file=$1 local include_samples diff --git a/library_generation/utilities.sh b/library_generation/utilities.sh index 8897b5c425..cd92506c6e 100755 --- a/library_generation/utilities.sh +++ b/library_generation/utilities.sh @@ -56,23 +56,30 @@ unzip_src_files() { # get gapic options from .yaml and .json files from proto_path. get_gapic_opts() { - local gapic_config - local grpc_service_config - local api_service_config - gapic_config=$(find "${proto_path}" -type f -name "*gapic.yaml") - if [ -z "${gapic_config}" ]; then - gapic_config="" - else - gapic_config="gapic-config=${gapic_config}," - fi - grpc_service_config=$(find "${proto_path}" -type f -name "*service_config.json") - api_service_config=$(find "${proto_path}" -maxdepth 1 -type f \( -name "*.yaml" ! -name "*gapic*.yaml" \)) + local transport=$1 + local rest_numeric_enums=$2 + local gapic_yaml=$3 + local service_config=$4 + local service_yaml=$5 if [ "${rest_numeric_enums}" == "true" ]; then - rest_numeric_enums="rest-numeric-enums," + rest_numeric_enums="rest-numeric-enums" else rest_numeric_enums="" fi - echo "transport=${transport},${rest_numeric_enums}grpc-service-config=${grpc_service_config},${gapic_config}api-service-config=${api_service_config}" + # If any of the gapic options is empty (default value), try to search for + # it in proto_path. + if [[ "${gapic_yaml}" == "" ]]; then + gapic_yaml=$(find "${proto_path}" -type f -name "*gapic.yaml") + fi + + if [[ "${service_config}" == "" ]]; then + service_config=$(find "${proto_path}" -type f -name "*service_config.json") + fi + + if [[ "${service_yaml}" == "" ]]; then + service_yaml=$(find "${proto_path}" -maxdepth 1 -type f \( -name "*.yaml" ! -name "*gapic*.yaml" \)) + fi + echo "transport=${transport},${rest_numeric_enums},grpc-service-config=${service_config},gapic-config=${gapic_yaml},api-service-config=${service_yaml}" } remove_grpc_version() { diff --git a/showcase/scripts/generate_showcase.sh b/showcase/scripts/generate_showcase.sh index 26ffdd7a45..69530fe354 100755 --- a/showcase/scripts/generate_showcase.sh +++ b/showcase/scripts/generate_showcase.sh @@ -49,6 +49,9 @@ ggj_version=$(get_version_from_versions_txt ../../versions.txt "gapic-generator- gapic_additional_protos="google/iam/v1/iam_policy.proto google/cloud/location/locations.proto" rest_numeric_enums="false" transport="grpc+rest" +gapic_yaml="" +service_config="schema/google/showcase/v1beta1/showcase_grpc_service_config.json" +service_yaml="schema/google/showcase/v1beta1/showcase_v1beta1.yaml" include_samples="false" rm -rdf output/showcase-output mkdir output/showcase-output @@ -59,6 +62,9 @@ bash "${SCRIPT_DIR}/../../library_generation/generate_library.sh" \ --gapic_generator_version "${ggj_version}" \ --gapic_additional_protos "${gapic_additional_protos}" \ --rest_numeric_enums "${rest_numeric_enums}" \ + --gapic_yaml "${gapic_yaml}" \ + --service_config "${service_config}" \ + --service_yaml "${service_yaml}" \ --include_samples "${include_samples}" \ --transport "${transport}" From baf7e8e786855aaa41a2f47f916188980a7e8ef5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 23:06:17 +0200 Subject: [PATCH 58/64] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.6.0 (#2176) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend 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.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.5.8` -> `1.6.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-shared-config/1.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-shared-config/1.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-shared-config/1.5.8/1.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-shared-config/1.5.8/1.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
googleapis/java-shared-config (com.google.cloud:google-cloud-shared-config) ### [`v1.6.0`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#160-2023-10-17) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.5.8...v1.6.0) ##### Features - Add graal-sdk dependency management to java-shared-config ([#​683](https://togithub.com/googleapis/java-shared-config/issues/683)) ([5cd1d84](https://togithub.com/googleapis/java-shared-config/commit/5cd1d84bf2d68dbe8f9fa7e02d9065082bd56726))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - 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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). --- gapic-generator-java-pom-parent/pom.xml | 2 +- gax-java/gax-bom/pom.xml | 2 +- java-shared-dependencies/first-party-dependencies/pom.xml | 2 +- java-shared-dependencies/third-party-dependencies/pom.xml | 2 +- java-shared-dependencies/upper-bound-check/pom.xml | 2 +- showcase/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 8026def588..8ad6eb6bc4 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-config - 1.5.8 + 1.6.0 diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 49a4b045d3..7c31b7245c 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -11,7 +11,7 @@ com.google.cloud google-cloud-shared-config - 1.5.8 + 1.6.0 diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 1ae8017b76..0e2389ef6b 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-config - 1.5.8 + 1.6.0 diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index a7bb92be0d..a5573d8df0 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-config - 1.5.8 + 1.6.0 diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index aecce7e867..7e2487d2bc 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -16,7 +16,7 @@ com.google.cloud google-cloud-shared-config - 1.5.8 + 1.6.0 diff --git a/showcase/pom.xml b/showcase/pom.xml index 79b3533d7c..15b6cfdf59 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-config - 1.5.8 + 1.6.0 From 6a8972ea287f665d82046b8314887edee27a6c1a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 23:33:39 +0200 Subject: [PATCH 59/64] deps: update googleapis/java-cloud-bom digest to 4b9b60d (#2178) --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 16e05aab00..51a0c78f22 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -282,7 +282,7 @@ jobs: run: | mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip - name: Validate gapic-generator-java-bom - uses: googleapis/java-cloud-bom/tests/validate-bom@e485c2f4ca9ec4f06098e23ee4a24b94ff193784 + uses: googleapis/java-cloud-bom/tests/validate-bom@4b9b60df0e240de0f3ac6ad729d53de2039ad0ef with: bom-path: gapic-generator-java-bom/pom.xml From e5247ba61eb4c2e543bab79110eaba3766a8264f Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 18 Oct 2023 14:10:33 +0000 Subject: [PATCH 60/64] feat: replace graal version declarion with properties placeholder (#2120) --- gax-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 0fb78e9431..db4f337ca0 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -142,7 +142,7 @@ org.graalvm.sdk graal-sdk - 22.3.2 + ${graal-sdk.version} com.google.http-client From 88bccd9e4b6c3245c0fae7e142954155bf373274 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 18 Oct 2023 17:05:40 +0200 Subject: [PATCH 61/64] deps: update googleapis/java-cloud-bom digest to a0bfee4 (#2181) --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 51a0c78f22..d1d0ae6bf4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -282,7 +282,7 @@ jobs: run: | mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip - name: Validate gapic-generator-java-bom - uses: googleapis/java-cloud-bom/tests/validate-bom@4b9b60df0e240de0f3ac6ad729d53de2039ad0ef + uses: googleapis/java-cloud-bom/tests/validate-bom@a0bfee488b0d74f9b68918ae01d4bf130520d2c5 with: bom-path: gapic-generator-java-bom/pom.xml From 860ae7646a985786966af55c5d3be35981e0fab1 Mon Sep 17 00:00:00 2001 From: Mohan Li <67390330+mohanli-ml@users.noreply.github.com> Date: Wed, 18 Oct 2023 13:21:47 -0700 Subject: [PATCH 62/64] feat: Log DirectPath misconfiguration (#2105) --- .../InstantiatingGrpcChannelProvider.java | 34 +++++++++ .../InstantiatingGrpcChannelProviderTest.java | 69 +++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java b/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java index 06d0c18e51..4e7a654f7e 100644 --- a/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java +++ b/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java @@ -64,6 +64,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.annotation.Nullable; import javax.net.ssl.KeyManagerFactory; import org.threeten.bp.Duration; @@ -82,6 +84,9 @@ */ @InternalExtensionOnly public final class InstantiatingGrpcChannelProvider implements TransportChannelProvider { + @VisibleForTesting + static final Logger LOG = Logger.getLogger(InstantiatingGrpcChannelProvider.class.getName()); + private static final String DIRECT_PATH_ENV_DISABLE_DIRECT_PATH = "GOOGLE_CLOUD_DISABLE_DIRECT_PATH"; private static final String DIRECT_PATH_ENV_ENABLE_XDS = "GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS"; @@ -140,6 +145,7 @@ private InstantiatingGrpcChannelProvider(Builder builder) { builder.directPathServiceConfig == null ? getDefaultDirectPathServiceConfig() : builder.directPathServiceConfig; + logDirectPathMisconfig(); } /** @@ -266,6 +272,33 @@ boolean isDirectPathXdsEnabled() { return false; } + private void logDirectPathMisconfig() { + if (isDirectPathXdsEnabled()) { + // Case 1: does not enable DirectPath + if (!isDirectPathEnabled()) { + LOG.log( + Level.WARNING, + "DirectPath is misconfigured. Please set the attemptDirectPath option along with the" + + " attemptDirectPathXds option."); + } else { + // Case 2: credential is not correctly set + if (!isNonDefaultServiceAccountAllowed()) { + LOG.log( + Level.WARNING, + "DirectPath is misconfigured. Please make sure the credential is an instance of " + + ComputeEngineCredentials.class.getName() + + " ."); + } + // Case 3: not running on GCE + if (!isOnComputeEngine()) { + LOG.log( + Level.WARNING, + "DirectPath is misconfigured. DirectPath is only available in a GCE environment."); + } + } + } + } + private boolean isNonDefaultServiceAccountAllowed() { if (allowNonDefaultServiceAccount != null && allowNonDefaultServiceAccount) { return true; @@ -275,6 +308,7 @@ private boolean isNonDefaultServiceAccountAllowed() { // DirectPath should only be used on Compute Engine. // Notice Windows is supported for now. + @VisibleForTesting static boolean isOnComputeEngine() { String osName = System.getProperty("os.name"); if ("Linux".equals(osName)) { diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java index d58a3b56b6..edd7a73768 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java +++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java @@ -56,6 +56,9 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.logging.Handler; +import java.util.logging.LogRecord; +import java.util.stream.Collectors; import javax.annotation.Nullable; import org.junit.Test; import org.junit.runner.RunWith; @@ -503,4 +506,70 @@ protected Object getMtlsObjectFromTransportChannel(MtlsProvider provider) .build(); return channelProvider.createMtlsChannelCredentials(); } + + @Test + public void testLogDirectPathMisconfigAttrempDirectPathNotSet() { + FakeLogHandler logHandler = new FakeLogHandler(); + InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler); + InstantiatingGrpcChannelProvider provider = + InstantiatingGrpcChannelProvider.newBuilder().setAttemptDirectPathXds().build(); + assertThat(logHandler.getAllMessages()) + .contains( + "DirectPath is misconfigured. Please set the attemptDirectPath option along with the" + + " attemptDirectPathXds option."); + InstantiatingGrpcChannelProvider.LOG.removeHandler(logHandler); + } + + @Test + public void testLogDirectPathMisconfigWrongCredential() { + FakeLogHandler logHandler = new FakeLogHandler(); + InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler); + InstantiatingGrpcChannelProvider provider = + InstantiatingGrpcChannelProvider.newBuilder() + .setAttemptDirectPathXds() + .setAttemptDirectPath(true) + .build(); + assertThat(logHandler.getAllMessages()) + .contains( + "DirectPath is misconfigured. Please make sure the credential is an instance of" + + " com.google.auth.oauth2.ComputeEngineCredentials ."); + InstantiatingGrpcChannelProvider.LOG.removeHandler(logHandler); + } + + @Test + public void testLogDirectPathMisconfigNotOnGCE() { + FakeLogHandler logHandler = new FakeLogHandler(); + InstantiatingGrpcChannelProvider.LOG.addHandler(logHandler); + InstantiatingGrpcChannelProvider provider = + InstantiatingGrpcChannelProvider.newBuilder() + .setAttemptDirectPathXds() + .setAttemptDirectPath(true) + .setAllowNonDefaultServiceAccount(true) + .build(); + if (!InstantiatingGrpcChannelProvider.isOnComputeEngine()) { + assertThat(logHandler.getAllMessages()) + .contains( + "DirectPath is misconfigured. DirectPath is only available in a GCE environment."); + } + InstantiatingGrpcChannelProvider.LOG.removeHandler(logHandler); + } + + private static class FakeLogHandler extends Handler { + List records = new ArrayList<>(); + + @Override + public void publish(LogRecord record) { + records.add(record); + } + + @Override + public void flush() {} + + @Override + public void close() throws SecurityException {} + + List getAllMessages() { + return records.stream().map(LogRecord::getMessage).collect(Collectors.toList()); + } + } } From d2d624def3d72ecdaa3fdf7e2a92fd29d39ff1aa Mon Sep 17 00:00:00 2001 From: Blake Li Date: Thu, 19 Oct 2023 17:39:20 -0400 Subject: [PATCH 63/64] fix: Make sure outstanding RPCs count in ChannelPool can not go negative (#2185) Add two flags wasClosed and wasReleased to ReleasingClientCall to check various scenarios. The combination of these two flags can make sure the count of outstanding RPCs can never go negative, and help us identify what exactly goes wrong next time it happens. --- .../com/google/api/gax/grpc/ChannelPool.java | 48 ++++++++-- .../google/api/gax/grpc/ChannelPoolTest.java | 93 +++++++++++++++++-- 2 files changed, 125 insertions(+), 16 deletions(-) diff --git a/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java b/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java index df3888dfc9..c3e26dc4e2 100644 --- a/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java +++ b/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java @@ -68,7 +68,7 @@ *

Package-private for internal use. */ class ChannelPool extends ManagedChannel { - private static final Logger LOG = Logger.getLogger(ChannelPool.class.getName()); + @VisibleForTesting static final Logger LOG = Logger.getLogger(ChannelPool.class.getName()); private static final Duration REFRESH_PERIOD = Duration.ofMinutes(50); private final ChannelPoolSettings settings; @@ -421,9 +421,25 @@ private Entry getEntry(int affinity) { } /** Bundles a gRPC {@link ManagedChannel} with some usage accounting. */ - private static class Entry { + static class Entry { private final ManagedChannel channel; - private final AtomicInteger outstandingRpcs = new AtomicInteger(0); + + /** + * The primary purpose of keeping a count for outstanding RPCs is to track when a channel is + * safe to close. In grpc, initialization & starting of rpcs is split between 2 methods: + * Channel#newCall() and ClientCall#start. gRPC already has a mechanism to safely close channels + * that have rpcs that have been started. However, it does not protect calls that have been + * created but not started. In the sequence: Channel#newCall() Channel#shutdown() + * ClientCall#Start(), gRpc will error out the call telling the caller that the channel is + * shutdown. + * + *

Hence, the increment of outstanding RPCs has to happen when the ClientCall is initialized, + * as part of Channel#newCall(), not after the ClientCall is started. The decrement of + * outstanding RPCs has to happen when the ClientCall is closed or the ClientCall failed to + * start. + */ + @VisibleForTesting final AtomicInteger outstandingRpcs = new AtomicInteger(0); + private final AtomicInteger maxOutstanding = new AtomicInteger(); // Flag that the channel should be closed once all of the outstanding RPC complete. @@ -470,7 +486,7 @@ private boolean retain() { private void release() { int newCount = outstandingRpcs.decrementAndGet(); if (newCount < 0) { - throw new IllegalStateException("Bug: reference count is negative!: " + newCount); + LOG.log(Level.WARNING, "Bug! Reference count is negative (" + newCount + ")!"); } // Must check outstandingRpcs after shutdownRequested (in reverse order of retain()) to ensure @@ -526,6 +542,8 @@ public ClientCall newCall( static class ReleasingClientCall extends SimpleForwardingClientCall { @Nullable private CancellationException cancellationException; final Entry entry; + private final AtomicBoolean wasClosed = new AtomicBoolean(); + private final AtomicBoolean wasReleased = new AtomicBoolean(); public ReleasingClientCall(ClientCall delegate, Entry entry) { super(delegate); @@ -542,17 +560,35 @@ public void start(Listener responseListener, Metadata headers) { new SimpleForwardingClientCallListener(responseListener) { @Override public void onClose(Status status, Metadata trailers) { + if (!wasClosed.compareAndSet(false, true)) { + LOG.log( + Level.WARNING, + "Call is being closed more than once. Please make sure that onClose() is not being manually called."); + return; + } try { super.onClose(status, trailers); } finally { - entry.release(); + if (wasReleased.compareAndSet(false, true)) { + entry.release(); + } else { + LOG.log( + Level.WARNING, + "Entry was released before the call is closed. This may be due to an exception on start of the call."); + } } } }, headers); } catch (Exception e) { // In case start failed, make sure to release - entry.release(); + if (wasReleased.compareAndSet(false, true)) { + entry.release(); + } else { + LOG.log( + Level.WARNING, + "The entry is already released. This indicates that onClose() has already been called previously"); + } throw e; } } diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/ChannelPoolTest.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/ChannelPoolTest.java index c38d98e91f..173528d6e2 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/ChannelPoolTest.java +++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/ChannelPoolTest.java @@ -29,17 +29,20 @@ */ package com.google.api.gax.grpc; +import static com.google.api.gax.grpc.testing.FakeServiceGrpc.METHOD_RECOGNIZE; import static com.google.api.gax.grpc.testing.FakeServiceGrpc.METHOD_SERVER_STREAMING_RECOGNIZE; import static com.google.common.truth.Truth.assertThat; +import com.google.api.core.ApiFuture; import com.google.api.gax.grpc.testing.FakeChannelFactory; import com.google.api.gax.grpc.testing.FakeMethodDescriptor; -import com.google.api.gax.grpc.testing.FakeServiceGrpc; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.ResponseObserver; import com.google.api.gax.rpc.ServerStreamingCallSettings; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.StreamController; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.api.gax.rpc.UnaryCallable; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -63,6 +66,9 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Handler; +import java.util.logging.LogRecord; +import java.util.stream.Collectors; import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -117,7 +123,7 @@ public void testRoundRobin() throws IOException { private void verifyTargetChannel( ChannelPool pool, List channels, ManagedChannel targetChannel) { - MethodDescriptor methodDescriptor = FakeServiceGrpc.METHOD_RECOGNIZE; + MethodDescriptor methodDescriptor = METHOD_RECOGNIZE; CallOptions callOptions = CallOptions.DEFAULT; @SuppressWarnings("unchecked") ClientCall expectedClientCall = Mockito.mock(ClientCall.class); @@ -143,7 +149,7 @@ public void ensureEvenDistribution() throws InterruptedException, IOException { final ManagedChannel[] channels = new ManagedChannel[numChannels]; final AtomicInteger[] counts = new AtomicInteger[numChannels]; - final MethodDescriptor methodDescriptor = FakeServiceGrpc.METHOD_RECOGNIZE; + final MethodDescriptor methodDescriptor = METHOD_RECOGNIZE; final CallOptions callOptions = CallOptions.DEFAULT; @SuppressWarnings("unchecked") final ClientCall clientCall = Mockito.mock(ClientCall.class); @@ -472,8 +478,7 @@ public void channelCountShouldNotChangeWhenOutstandingRpcsAreWithinLimits() thro // Start the minimum number of for (int i = 0; i < 2; i++) { ClientCalls.futureUnaryCall( - pool.newCall(FakeServiceGrpc.METHOD_RECOGNIZE, CallOptions.DEFAULT), - Color.getDefaultInstance()); + pool.newCall(METHOD_RECOGNIZE, CallOptions.DEFAULT), Color.getDefaultInstance()); } pool.resize(); assertThat(pool.entries.get()).hasSize(2); @@ -481,14 +486,13 @@ public void channelCountShouldNotChangeWhenOutstandingRpcsAreWithinLimits() thro // Add enough RPCs to be just at the brink of expansion for (int i = startedCalls.size(); i < 4; i++) { ClientCalls.futureUnaryCall( - pool.newCall(FakeServiceGrpc.METHOD_RECOGNIZE, CallOptions.DEFAULT), - Color.getDefaultInstance()); + pool.newCall(METHOD_RECOGNIZE, CallOptions.DEFAULT), Color.getDefaultInstance()); } pool.resize(); assertThat(pool.entries.get()).hasSize(2); // Add another RPC to push expansion - pool.newCall(FakeServiceGrpc.METHOD_RECOGNIZE, CallOptions.DEFAULT); + pool.newCall(METHOD_RECOGNIZE, CallOptions.DEFAULT); pool.resize(); assertThat(pool.entries.get()).hasSize(4); // += ChannelPool::MAX_RESIZE_DELTA assertThat(startedCalls).hasSize(5); @@ -593,8 +597,7 @@ public void removedActiveChannelsAreShutdown() throws Exception { // Start 2 RPCs for (int i = 0; i < 2; i++) { ClientCalls.futureUnaryCall( - pool.newCall(FakeServiceGrpc.METHOD_RECOGNIZE, CallOptions.DEFAULT), - Color.getDefaultInstance()); + pool.newCall(METHOD_RECOGNIZE, CallOptions.DEFAULT), Color.getDefaultInstance()); } // Complete the first one @SuppressWarnings("unchecked") @@ -663,4 +666,74 @@ public void onComplete() {} assertThat(e.getCause()).isInstanceOf(CancellationException.class); assertThat(e.getMessage()).isEqualTo("Call is already cancelled"); } + + @Test + public void testDoubleRelease() throws Exception { + FakeLogHandler logHandler = new FakeLogHandler(); + ChannelPool.LOG.addHandler(logHandler); + + try { + // Create a fake channel pool thats backed by mock channels that simply record invocations + ClientCall mockClientCall = Mockito.mock(ClientCall.class); + ManagedChannel fakeChannel = Mockito.mock(ManagedChannel.class); + Mockito.when(fakeChannel.newCall(Mockito.any(), Mockito.any())).thenReturn(mockClientCall); + ChannelPoolSettings channelPoolSettings = ChannelPoolSettings.staticallySized(1); + ChannelFactory factory = new FakeChannelFactory(ImmutableList.of(fakeChannel)); + + pool = ChannelPool.create(channelPoolSettings, factory); + + // Construct a fake callable to use the channel pool + ClientContext context = + ClientContext.newBuilder() + .setTransportChannel(GrpcTransportChannel.create(pool)) + .setDefaultCallContext(GrpcCallContext.of(pool, CallOptions.DEFAULT)) + .build(); + + UnaryCallSettings settings = + UnaryCallSettings.newUnaryCallSettingsBuilder().build(); + UnaryCallable callable = + GrpcCallableFactory.createUnaryCallable( + GrpcCallSettings.create(METHOD_RECOGNIZE), settings, context); + + // Start the RPC + ApiFuture rpcFuture = + callable.futureCall(Color.getDefaultInstance(), context.getDefaultCallContext()); + + // Get the server side listener and intentionally close it twice + ArgumentCaptor> clientCallListenerCaptor = + ArgumentCaptor.forClass(ClientCall.Listener.class); + Mockito.verify(mockClientCall).start(clientCallListenerCaptor.capture(), Mockito.any()); + clientCallListenerCaptor.getValue().onClose(Status.INTERNAL, new Metadata()); + clientCallListenerCaptor.getValue().onClose(Status.UNKNOWN, new Metadata()); + + // Ensure that the channel pool properly logged the double call and kept the refCount correct + assertThat(logHandler.getAllMessages()) + .contains( + "Call is being closed more than once. Please make sure that onClose() is not being manually called."); + assertThat(pool.entries.get()).hasSize(1); + ChannelPool.Entry entry = pool.entries.get().get(0); + assertThat(entry.outstandingRpcs.get()).isEqualTo(0); + } finally { + ChannelPool.LOG.removeHandler(logHandler); + } + } + + private static class FakeLogHandler extends Handler { + List records = new ArrayList<>(); + + @Override + public void publish(LogRecord record) { + records.add(record); + } + + @Override + public void flush() {} + + @Override + public void close() throws SecurityException {} + + List getAllMessages() { + return records.stream().map(LogRecord::getMessage).collect(Collectors.toList()); + } + } } From b6d83dd385bd66b64492ce6a5f70a0a04899c68c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 18:19:38 -0400 Subject: [PATCH 64/64] chore(main): release 2.28.0 (#2128) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 62 +++++++++++++++++++ WORKSPACE | 2 +- api-common-java/pom.xml | 4 +- coverage-report/pom.xml | 8 +-- gapic-generator-java-bom/pom.xml | 26 ++++---- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 6 +- gax-java/dependencies.properties | 8 +-- gax-java/gax-bom/pom.xml | 20 +++--- gax-java/gax-grpc/pom.xml | 4 +- gax-java/gax-httpjson/pom.xml | 4 +- gax-java/gax/pom.xml | 4 +- gax-java/pom.xml | 14 ++--- .../grpc-google-common-protos/pom.xml | 4 +- java-common-protos/pom.xml | 8 +-- .../proto-google-common-protos/pom.xml | 4 +- java-core/google-cloud-core-bom/pom.xml | 10 +-- java-core/google-cloud-core-grpc/pom.xml | 4 +- java-core/google-cloud-core-http/pom.xml | 4 +- java-core/google-cloud-core/pom.xml | 4 +- java-core/pom.xml | 6 +- java-iam/grpc-google-iam-v1/pom.xml | 4 +- java-iam/grpc-google-iam-v2/pom.xml | 4 +- java-iam/grpc-google-iam-v2beta/pom.xml | 4 +- java-iam/pom.xml | 20 +++--- java-iam/proto-google-iam-v1/pom.xml | 4 +- java-iam/proto-google-iam-v2/pom.xml | 4 +- java-iam/proto-google-iam-v2beta/pom.xml | 4 +- .../dependency-convergence-check/pom.xml | 2 +- .../first-party-dependencies/pom.xml | 10 +-- java-shared-dependencies/pom.xml | 8 +-- .../third-party-dependencies/pom.xml | 2 +- .../upper-bound-check/pom.xml | 4 +- showcase/pom.xml | 2 +- versions.txt | 32 +++++----- 35 files changed, 187 insertions(+), 125 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da8b6c3f3c..ee0300cf54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,67 @@ # Changelog +## [2.28.0](https://github.com/googleapis/sdk-platform-java/compare/v2.27.0...v2.28.0) (2023-10-19) + + +### Features + +* Add gapic options as inputs to `generate_library.sh` ([#2121](https://github.com/googleapis/sdk-platform-java/issues/2121)) ([b17d8a1](https://github.com/googleapis/sdk-platform-java/commit/b17d8a12575b273b4536b42c37bf61b321fc0e5a)) +* Log DirectPath misconfiguration ([#2105](https://github.com/googleapis/sdk-platform-java/issues/2105)) ([860ae76](https://github.com/googleapis/sdk-platform-java/commit/860ae7646a985786966af55c5d3be35981e0fab1)) +* Replace graal version declarion with properties placeholder ([#2120](https://github.com/googleapis/sdk-platform-java/issues/2120)) ([e5247ba](https://github.com/googleapis/sdk-platform-java/commit/e5247ba61eb4c2e543bab79110eaba3766a8264f)) + + +### Bug Fixes + +* Make sure outstanding RPCs count in ChannelPool can not go negative ([#2185](https://github.com/googleapis/sdk-platform-java/issues/2185)) ([d2d624d](https://github.com/googleapis/sdk-platform-java/commit/d2d624def3d72ecdaa3fdf7e2a92fd29d39ff1aa)) + + +### Dependencies + +* Update dependency attrs to v22.2.0 ([#2146](https://github.com/googleapis/sdk-platform-java/issues/2146)) ([49d7f55](https://github.com/googleapis/sdk-platform-java/commit/49d7f55df0efd1ebf4ec074a8b9c23324de69149)) +* Update dependency cffi to v1.16.0 ([#2147](https://github.com/googleapis/sdk-platform-java/issues/2147)) ([db37d5b](https://github.com/googleapis/sdk-platform-java/commit/db37d5ba609adf571c75f9f2f51c39b7453b862b)) +* Update dependency charset-normalizer to v2.1.1 ([#2148](https://github.com/googleapis/sdk-platform-java/issues/2148)) ([759e957](https://github.com/googleapis/sdk-platform-java/commit/759e957a1a3738218a6e360660d340cb99a3268e)) +* Update dependency com.fasterxml.jackson:jackson-bom to v2.15.3 ([#2136](https://github.com/googleapis/sdk-platform-java/issues/2136)) ([be25555](https://github.com/googleapis/sdk-platform-java/commit/be2555565c91580df0b81ae09ad2cda8ef5a40a7)) +* Update dependency com.google.auto.value:auto-value to v1.10.4 ([#2137](https://github.com/googleapis/sdk-platform-java/issues/2137)) ([5edca8b](https://github.com/googleapis/sdk-platform-java/commit/5edca8b542e767cc9a9a899420f2707a5c91e1e7)) +* Update dependency com.google.auto.value:auto-value-annotations to v1.10.4 ([#2138](https://github.com/googleapis/sdk-platform-java/issues/2138)) ([705c358](https://github.com/googleapis/sdk-platform-java/commit/705c358804767419f742978185fa9a93e622a1da)) +* Update dependency com.google.errorprone:error_prone_annotations to v2.22.0 ([#2130](https://github.com/googleapis/sdk-platform-java/issues/2130)) ([805daf1](https://github.com/googleapis/sdk-platform-java/commit/805daf1a9967f63b747624dd4098d78a80c083bf)) +* Update dependency com.google.errorprone:error_prone_annotations to v2.22.0 ([#2145](https://github.com/googleapis/sdk-platform-java/issues/2145)) ([f936331](https://github.com/googleapis/sdk-platform-java/commit/f9363315f20f27237324a5797ba20a0097283410)) +* Update dependency commons-codec:commons-codec to v1.16.0 ([#2152](https://github.com/googleapis/sdk-platform-java/issues/2152)) ([0cf3440](https://github.com/googleapis/sdk-platform-java/commit/0cf34408d97c5d7dd63ea941de27b64a95e35524)) +* Update dependency cryptography to v41.0.4 [security] ([#2109](https://github.com/googleapis/sdk-platform-java/issues/2109)) ([e2f57f2](https://github.com/googleapis/sdk-platform-java/commit/e2f57f2fe20c920eafb0306ea51c8205e371d972)) +* Update dependency gcp-releasetool to v1.16.0 ([#2111](https://github.com/googleapis/sdk-platform-java/issues/2111)) ([69d1259](https://github.com/googleapis/sdk-platform-java/commit/69d12593dfbd0d69d2bd79df8d42def42eccb892)) +* Update dependency google-api-core to v2.12.0 ([#2153](https://github.com/googleapis/sdk-platform-java/issues/2153)) ([8c1baf5](https://github.com/googleapis/sdk-platform-java/commit/8c1baf59fac515b10698b1548a7104e8ef82cd1e)) +* Update dependency google-auth to v2.23.3 ([#2154](https://github.com/googleapis/sdk-platform-java/issues/2154)) ([3645fed](https://github.com/googleapis/sdk-platform-java/commit/3645fed46926cf4f402e4986749db55b86fab6b6)) +* Update dependency google-cloud-core to v2.3.3 ([#2113](https://github.com/googleapis/sdk-platform-java/issues/2113)) ([c8194cf](https://github.com/googleapis/sdk-platform-java/commit/c8194cf29dfee221d87aaaca13983794ad089433)) +* Update dependency google-cloud-storage to v2.12.0 ([#2155](https://github.com/googleapis/sdk-platform-java/issues/2155)) ([0ec9027](https://github.com/googleapis/sdk-platform-java/commit/0ec902795ae36ff16890a1c02c07b2b977dfed14)) +* Update dependency google-crc32c to v1.5.0 ([#2157](https://github.com/googleapis/sdk-platform-java/issues/2157)) ([6556ed5](https://github.com/googleapis/sdk-platform-java/commit/6556ed588bad9901592949ce5674ac2894102bd2)) +* Update dependency google-resumable-media to v2.6.0 ([#2161](https://github.com/googleapis/sdk-platform-java/issues/2161)) ([87dd6f2](https://github.com/googleapis/sdk-platform-java/commit/87dd6f2862dbd82fe267008306e841c4e9bb5af2)) +* Update dependency googleapis-common-protos to v1.61.0 ([#2156](https://github.com/googleapis/sdk-platform-java/issues/2156)) ([f7fd515](https://github.com/googleapis/sdk-platform-java/commit/f7fd515b00ff615cbd7b86c8471b2a1d8a1ce2ee)) +* Update dependency gradle to v7.6.3 ([#2115](https://github.com/googleapis/sdk-platform-java/issues/2115)) ([cd9748d](https://github.com/googleapis/sdk-platform-java/commit/cd9748d4a62b843080c107309c15d6894eb0eb28)) +* Update dependency importlib-metadata to v4.13.0 ([#2162](https://github.com/googleapis/sdk-platform-java/issues/2162)) ([ac6e3d5](https://github.com/googleapis/sdk-platform-java/commit/ac6e3d5bbeab2dbf35aefc14b20217119e99460d)) +* Update dependency jeepney to v0.8.0 ([#2165](https://github.com/googleapis/sdk-platform-java/issues/2165)) ([59744b5](https://github.com/googleapis/sdk-platform-java/commit/59744b56409564dab142f24533672b1fa9726313)) +* Update dependency jinja2 to v3.1.2 ([#2166](https://github.com/googleapis/sdk-platform-java/issues/2166)) ([c7ac765](https://github.com/googleapis/sdk-platform-java/commit/c7ac765237c7bbed041e7b15b040625f411eee5c)) +* Update dependency markupsafe to v2.1.3 ([#2168](https://github.com/googleapis/sdk-platform-java/issues/2168)) ([ea26b1a](https://github.com/googleapis/sdk-platform-java/commit/ea26b1aedcdb4eb08449194b111b00e07c2c0d02)) +* Update dependency net.bytebuddy:byte-buddy to v1.14.9 ([#2116](https://github.com/googleapis/sdk-platform-java/issues/2116)) ([e0ad3e6](https://github.com/googleapis/sdk-platform-java/commit/e0ad3e678ac9a42cb4c9a6111e8da750a2294ba6)) +* Update dependency org.apache.commons:commons-lang3 to v3.13.0 ([#2131](https://github.com/googleapis/sdk-platform-java/issues/2131)) ([c066286](https://github.com/googleapis/sdk-platform-java/commit/c066286ef3da2f8587d44d2b3d60db63be24875a)) +* Update dependency org.checkerframework:checker-qual to v3.39.0 ([#2158](https://github.com/googleapis/sdk-platform-java/issues/2158)) ([dfe2bbc](https://github.com/googleapis/sdk-platform-java/commit/dfe2bbcd6079ab0b28f091bc132dfc27c9ab98c0)) +* Update dependency org.easymock:easymock to v5.2.0 ([#2159](https://github.com/googleapis/sdk-platform-java/issues/2159)) ([8daf145](https://github.com/googleapis/sdk-platform-java/commit/8daf1452351aa0df2e282676a69e90c3743b4edf)) +* Update dependency org.yaml:snakeyaml to v2.2 ([#2160](https://github.com/googleapis/sdk-platform-java/issues/2160)) ([0664bf6](https://github.com/googleapis/sdk-platform-java/commit/0664bf6e578861197abd3ed31148d7db27b8eb53)) +* Update dependency protobuf to v3.20.3 ([#2169](https://github.com/googleapis/sdk-platform-java/issues/2169)) ([669d369](https://github.com/googleapis/sdk-platform-java/commit/669d3698cb76471cd0c9c6a398fb7b3d848d1571)) +* Update dependency pyasn1 to v0.5.0 ([#2170](https://github.com/googleapis/sdk-platform-java/issues/2170)) ([a842045](https://github.com/googleapis/sdk-platform-java/commit/a842045c71cdf88975505c90b5915eba321f0a65)) +* Update dependency pyasn1-modules to v0.3.0 ([#2171](https://github.com/googleapis/sdk-platform-java/issues/2171)) ([4abbf85](https://github.com/googleapis/sdk-platform-java/commit/4abbf858712b1f629df8b19a9007d1a09451e5e2)) +* Update dependency pyjwt to v2.8.0 ([#2172](https://github.com/googleapis/sdk-platform-java/issues/2172)) ([875146e](https://github.com/googleapis/sdk-platform-java/commit/875146eb3c1ac3cb1953980825f79c75c3251ea6)) +* Update dependency pyparsing to v3.1.1 ([#2173](https://github.com/googleapis/sdk-platform-java/issues/2173)) ([caac831](https://github.com/googleapis/sdk-platform-java/commit/caac8316a12aa0d8b7ef5f57912727a1abfc3151)) +* Update dependency typing-extensions to v4.8.0 ([#2174](https://github.com/googleapis/sdk-platform-java/issues/2174)) ([1a8f7a4](https://github.com/googleapis/sdk-platform-java/commit/1a8f7a446665b6fe03dd98856734ec48b59e080f)) +* Update dependency urllib3 to v1.26.17 [security] ([#2110](https://github.com/googleapis/sdk-platform-java/issues/2110)) ([5f40056](https://github.com/googleapis/sdk-platform-java/commit/5f40056fdb5d62e59744d43dd149d5da20979e59)) +* Update dependency urllib3 to v1.26.18 ([#2177](https://github.com/googleapis/sdk-platform-java/issues/2177)) ([9683111](https://github.com/googleapis/sdk-platform-java/commit/9683111627bca74ed0d123caf37ff0993c71d2ea)) +* Update dependency zipp to v3.17.0 ([#2175](https://github.com/googleapis/sdk-platform-java/issues/2175)) ([1700c59](https://github.com/googleapis/sdk-platform-java/commit/1700c597a74f906689a3a53e023ac094c9deeaff)) +* Update google api dependencies ([#2132](https://github.com/googleapis/sdk-platform-java/issues/2132)) ([bd4ae4f](https://github.com/googleapis/sdk-platform-java/commit/bd4ae4fab88a421ad93e597f99cabb7997f91e1d)) +* Update google auth library dependencies to v1.20.0 ([#2142](https://github.com/googleapis/sdk-platform-java/issues/2142)) ([ce59ed8](https://github.com/googleapis/sdk-platform-java/commit/ce59ed8be29a6b05f7c999bf48cb4d442fc2294a)) +* Update googleapis/java-cloud-bom digest to 4b9b60d ([#2178](https://github.com/googleapis/sdk-platform-java/issues/2178)) ([6a8972e](https://github.com/googleapis/sdk-platform-java/commit/6a8972ea287f665d82046b8314887edee27a6c1a)) +* Update googleapis/java-cloud-bom digest to a0bfee4 ([#2181](https://github.com/googleapis/sdk-platform-java/issues/2181)) ([88bccd9](https://github.com/googleapis/sdk-platform-java/commit/88bccd9e4b6c3245c0fae7e142954155bf373274)) +* Update googleapis/java-cloud-bom digest to e485c2f ([#2134](https://github.com/googleapis/sdk-platform-java/issues/2134)) ([97f97c6](https://github.com/googleapis/sdk-platform-java/commit/97f97c6063f91183af260d875d58958f4bba658b)) +* Update netty dependencies ([#2141](https://github.com/googleapis/sdk-platform-java/issues/2141)) ([fedc7b9](https://github.com/googleapis/sdk-platform-java/commit/fedc7b921f5415b2d51d3147ef1aaebf1b75ccdb)) +* Update protobuf dependencies to v3.24.4 ([#2118](https://github.com/googleapis/sdk-platform-java/issues/2118)) ([7b3f4b9](https://github.com/googleapis/sdk-platform-java/commit/7b3f4b97b013a32f171bd8a365d6d712b94b3849)) + ## [2.27.0](https://github.com/googleapis/sdk-platform-java/compare/v2.26.1...v2.27.0) (2023-10-06) diff --git a/WORKSPACE b/WORKSPACE index 99e880b4dc..d86d550b49 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.27.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.28.0" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 990f4317e7..a2e7f86659 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.18.1-SNAPSHOT + 2.19.0 API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 17cd2ed7b2..b20e5d1f9e 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.35.1-SNAPSHOT + 2.36.0 com.google.api gax-grpc - 2.35.1-SNAPSHOT + 2.36.0 com.google.api gax-httpjson - 2.35.1-SNAPSHOT + 2.36.0 com.google.api api-common - 2.18.1-SNAPSHOT + 2.19.0 diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index a54d5bdc36..bf0756438f 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -4,7 +4,7 @@ com.google.api gapic-generator-java-bom pom - 2.27.1-SNAPSHOT + 2.28.0 GAPIC Generator Java BOM BOM for the libraries in gapic-generator-java repository. Users should not @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent @@ -75,61 +75,61 @@ com.google.api api-common - 2.18.1-SNAPSHOT + 2.19.0 com.google.api gax-bom - 2.35.1-SNAPSHOT + 2.36.0 pom import com.google.api gapic-generator-java - 2.27.1-SNAPSHOT + 2.28.0 com.google.api.grpc grpc-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 com.google.api.grpc proto-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 com.google.api.grpc proto-google-iam-v1 - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc proto-google-iam-v2 - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc proto-google-iam-v2beta - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc grpc-google-iam-v1 - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc grpc-google-iam-v2 - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc grpc-google-iam-v2beta - 1.21.1-SNAPSHOT + 1.22.0 diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 8ad6eb6bc4..fb52c48cdd 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 pom GAPIC Generator Java POM Parent https://github.com/googleapis/sdk-platform-java diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 33693ba0f7..6960296a2a 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api gapic-generator-java - 2.27.1-SNAPSHOT + 2.28.0 GAPIC Generator Java GAPIC generator Java @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.27.1-SNAPSHOT + 2.28.0 pom import diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 9dd25a0588..4f4276c0a2 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.35.1-SNAPSHOT +version.gax=2.36.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.35.1-SNAPSHOT +version.gax_grpc=2.36.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.35.1-SNAPSHOT +version.gax_bom=2.36.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.35.1-SNAPSHOT +version.gax_httpjson=2.36.0 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 7c31b7245c..b3bbe3b46f 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.35.1-SNAPSHOT + 2.36.0 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.35.1-SNAPSHOT + 2.36.0 com.google.api gax - 2.35.1-SNAPSHOT + 2.36.0 test-jar testlib com.google.api gax - 2.35.1-SNAPSHOT + 2.36.0 testlib com.google.api gax-grpc - 2.35.1-SNAPSHOT + 2.36.0 com.google.api gax-grpc - 2.35.1-SNAPSHOT + 2.36.0 test-jar testlib com.google.api gax-grpc - 2.35.1-SNAPSHOT + 2.36.0 testlib com.google.api gax-httpjson - 2.35.1-SNAPSHOT + 2.36.0 com.google.api gax-httpjson - 2.35.1-SNAPSHOT + 2.36.0 test-jar testlib com.google.api gax-httpjson - 2.35.1-SNAPSHOT + 2.36.0 testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index 1e474bd2fa..a2f803cc98 100644 --- a/gax-java/gax-grpc/pom.xml +++ b/gax-java/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.35.1-SNAPSHOT + 2.36.0 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.35.1-SNAPSHOT + 2.36.0 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 22ea674303..bf3b7bb0ff 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 2.35.1-SNAPSHOT + 2.36.0 jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.35.1-SNAPSHOT + 2.36.0 diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 9c36d94568..899ad0c6e9 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.35.1-SNAPSHOT + 2.36.0 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.35.1-SNAPSHOT + 2.36.0 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index db4f337ca0..7ccf21d5eb 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.35.1-SNAPSHOT + 2.36.0 GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.18.1-SNAPSHOT + 2.19.0 com.google.auth @@ -108,24 +108,24 @@ com.google.api gax - 2.35.1-SNAPSHOT + 2.36.0 com.google.api gax - 2.35.1-SNAPSHOT + 2.36.0 test-jar testlib com.google.api.grpc proto-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 com.google.api.grpc grpc-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 io.grpc diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index 70c9dc2032..0fa050644f 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.26.1-SNAPSHOT + 2.27.0 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 22e7eacbc1..3639996176 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.26.1-SNAPSHOT + 2.27.0 Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent @@ -68,7 +68,7 @@ com.google.api.grpc grpc-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 io.grpc @@ -80,7 +80,7 @@ com.google.api.grpc proto-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index a3b78fe2b5..7efaac4d8e 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.26.1-SNAPSHOT + 2.27.0 diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index d219901166..b46addb415 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.25.1-SNAPSHOT + 2.26.0 pom com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.25.1-SNAPSHOT + 2.26.0 com.google.cloud google-cloud-core-grpc - 2.25.1-SNAPSHOT + 2.26.0 com.google.cloud google-cloud-core-http - 2.25.1-SNAPSHOT + 2.26.0 diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index 228bb49b98..b8ff82c444 100644 --- a/java-core/google-cloud-core-grpc/pom.xml +++ b/java-core/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.25.1-SNAPSHOT + 2.26.0 jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.25.1-SNAPSHOT + 2.26.0 google-cloud-core-grpc diff --git a/java-core/google-cloud-core-http/pom.xml b/java-core/google-cloud-core-http/pom.xml index d7edfa3df7..3ea1743160 100644 --- a/java-core/google-cloud-core-http/pom.xml +++ b/java-core/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.25.1-SNAPSHOT + 2.26.0 jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.25.1-SNAPSHOT + 2.26.0 google-cloud-core-http diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index d955cfa925..2b1fc88dc2 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.25.1-SNAPSHOT + 2.26.0 jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.25.1-SNAPSHOT + 2.26.0 google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index ff53b56d8d..4747372e94 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.25.1-SNAPSHOT + 2.26.0 Google Cloud Core Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.17.1-SNAPSHOT + 3.18.0 pom import diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index 7157914fbf..52a65be874 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.21.1-SNAPSHOT + 1.22.0 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.21.1-SNAPSHOT + 1.22.0 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index e49c3ddac8..24b5668481 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.21.1-SNAPSHOT + 1.22.0 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.21.1-SNAPSHOT + 1.22.0 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 6c7cee6022..d5f11d280d 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.21.1-SNAPSHOT + 1.22.0 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.1-SNAPSHOT + 1.22.0 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index c31a6d1360..a281d9952c 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.21.1-SNAPSHOT + 1.22.0 Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent @@ -81,44 +81,44 @@ com.google.api gax-bom - 2.35.1-SNAPSHOT + 2.36.0 pom import com.google.api.grpc proto-google-iam-v2 - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc grpc-google-iam-v2 - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc proto-google-common-protos - 2.26.1-SNAPSHOT + 2.27.0 com.google.api.grpc proto-google-iam-v2beta - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc grpc-google-iam-v1 - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc grpc-google-iam-v2beta - 1.21.1-SNAPSHOT + 1.22.0 com.google.api.grpc proto-google-iam-v1 - 1.21.1-SNAPSHOT + 1.22.0 javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index ea694e460c..ad9fd4097a 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.21.1-SNAPSHOT + 1.22.0 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.1-SNAPSHOT + 1.22.0 diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index c9d588a51b..98798aab62 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.21.1-SNAPSHOT + 1.22.0 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.1-SNAPSHOT + 1.22.0 diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index ee0c71800c..8cf5dd86c9 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.21.1-SNAPSHOT + 1.22.0 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.21.1-SNAPSHOT + 1.22.0 diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index b313c5ec92..5719364326 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.17.1-SNAPSHOT + 3.18.0 Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies An dependency convergence test case for the shared dependencies BOM. A failure of this test case means diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 0e2389ef6b..1c61eb8faa 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.17.1-SNAPSHOT + 3.18.0 Google Cloud First-party Shared Dependencies Shared first-party dependencies for Google Cloud Java libraries. @@ -33,7 +33,7 @@ com.google.api gapic-generator-java-bom - 2.27.1-SNAPSHOT + 2.28.0 pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.25.1-SNAPSHOT + 2.26.0 pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.25.1-SNAPSHOT + 2.26.0 test-jar com.google.cloud google-cloud-core - 2.25.1-SNAPSHOT + 2.26.0 tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index f1f652e5a2..d9074d7db6 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.17.1-SNAPSHOT + 3.18.0 first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.27.1-SNAPSHOT + 2.28.0 ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.17.1-SNAPSHOT + 3.18.0 pom import com.google.cloud third-party-dependencies - 3.17.1-SNAPSHOT + 3.18.0 pom import diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index a5573d8df0..65e761dcd9 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.17.1-SNAPSHOT + 3.18.0 Google Cloud Third-party Shared Dependencies Shared third-party dependencies for Google Cloud Java libraries. diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index 7e2487d2bc..c5a82f6f15 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 3.17.1-SNAPSHOT + 3.18.0 Upper bound test for Google Cloud Shared Dependencies An upper bound test case for the shared dependencies BOM. A failure of this test case means @@ -30,7 +30,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.17.1-SNAPSHOT + 3.18.0 pom import diff --git a/showcase/pom.xml b/showcase/pom.xml index 15b6cfdf59..cc988ea2ae 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -34,7 +34,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.17.1-SNAPSHOT + 3.18.0 pom import diff --git a/versions.txt b/versions.txt index cab92ad35d..12b8ad1710 100644 --- a/versions.txt +++ b/versions.txt @@ -1,19 +1,19 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.27.0:2.27.1-SNAPSHOT -api-common:2.18.0:2.18.1-SNAPSHOT -gax:2.35.0:2.35.1-SNAPSHOT -gax-grpc:2.35.0:2.35.1-SNAPSHOT -gax-httpjson:0.120.0:0.120.1-SNAPSHOT -proto-google-common-protos:2.26.0:2.26.1-SNAPSHOT -grpc-google-common-protos:2.26.0:2.26.1-SNAPSHOT -proto-google-iam-v1:1.21.0:1.21.1-SNAPSHOT -grpc-google-iam-v1:1.21.0:1.21.1-SNAPSHOT -proto-google-iam-v2beta:1.21.0:1.21.1-SNAPSHOT -grpc-google-iam-v2beta:1.21.0:1.21.1-SNAPSHOT -google-iam-policy:1.21.0:1.21.1-SNAPSHOT -proto-google-iam-v2:1.21.0:1.21.1-SNAPSHOT -grpc-google-iam-v2:1.21.0:1.21.1-SNAPSHOT -google-cloud-core:2.25.0:2.25.1-SNAPSHOT -google-cloud-shared-dependencies:3.17.0:3.17.1-SNAPSHOT +gapic-generator-java:2.28.0:2.28.0 +api-common:2.19.0:2.19.0 +gax:2.36.0:2.36.0 +gax-grpc:2.36.0:2.36.0 +gax-httpjson:0.121.0:0.121.0 +proto-google-common-protos:2.27.0:2.27.0 +grpc-google-common-protos:2.27.0:2.27.0 +proto-google-iam-v1:1.22.0:1.22.0 +grpc-google-iam-v1:1.22.0:1.22.0 +proto-google-iam-v2beta:1.22.0:1.22.0 +grpc-google-iam-v2beta:1.22.0:1.22.0 +google-iam-policy:1.22.0:1.22.0 +proto-google-iam-v2:1.22.0:1.22.0 +grpc-google-iam-v2:1.22.0:1.22.0 +google-cloud-core:2.26.0:2.26.0 +google-cloud-shared-dependencies:3.18.0:3.18.0