From 7fc555c20c642e813ee60fc27e05966143afc924 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:20:20 -0400 Subject: [PATCH 01/19] chore(main): release 2.28.1-SNAPSHOT (#2186) 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 d86d550b49..e9c11d10cd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.28.0" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.28.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 a2e7f86659..0c842b1a17 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.19.0 + 2.19.1-SNAPSHOT API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index b20e5d1f9e..cce49fcb1f 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.36.0 + 2.36.1-SNAPSHOT com.google.api gax-grpc - 2.36.0 + 2.36.1-SNAPSHOT com.google.api gax-httpjson - 2.36.0 + 2.36.1-SNAPSHOT com.google.api api-common - 2.19.0 + 2.19.1-SNAPSHOT diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index bf0756438f..72d76804b0 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.28.0 + 2.28.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.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -75,61 +75,61 @@ com.google.api api-common - 2.19.0 + 2.19.1-SNAPSHOT com.google.api gax-bom - 2.36.0 + 2.36.1-SNAPSHOT pom import com.google.api gapic-generator-java - 2.28.0 + 2.28.1-SNAPSHOT com.google.api.grpc grpc-google-common-protos - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc proto-google-common-protos - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2 - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2beta - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v1 - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2 - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2beta - 1.22.0 + 1.22.1-SNAPSHOT diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index fb52c48cdd..19dfbdabc2 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.28.0 + 2.28.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 6960296a2a..5903ce661b 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.28.0 + 2.28.1-SNAPSHOT GAPIC Generator Java GAPIC generator Java @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.28.0 + 2.28.1-SNAPSHOT pom import diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 4f4276c0a2..f6a76d8d51 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.36.0 +version.gax=2.36.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.36.0 +version.gax_grpc=2.36.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.36.0 +version.gax_bom=2.36.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.36.0 +version.gax_httpjson=2.36.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 b3bbe3b46f..5922dc371a 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.36.0 + 2.36.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.36.0 + 2.36.1-SNAPSHOT com.google.api gax - 2.36.0 + 2.36.1-SNAPSHOT test-jar testlib com.google.api gax - 2.36.0 + 2.36.1-SNAPSHOT testlib com.google.api gax-grpc - 2.36.0 + 2.36.1-SNAPSHOT com.google.api gax-grpc - 2.36.0 + 2.36.1-SNAPSHOT test-jar testlib com.google.api gax-grpc - 2.36.0 + 2.36.1-SNAPSHOT testlib com.google.api gax-httpjson - 2.36.0 + 2.36.1-SNAPSHOT com.google.api gax-httpjson - 2.36.0 + 2.36.1-SNAPSHOT test-jar testlib com.google.api gax-httpjson - 2.36.0 + 2.36.1-SNAPSHOT testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index a2f803cc98..b20cb88a9a 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.36.0 + 2.36.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.36.0 + 2.36.1-SNAPSHOT diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index bf3b7bb0ff..67fc081543 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.36.0 + 2.36.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.36.0 + 2.36.1-SNAPSHOT diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 899ad0c6e9..2b479dc077 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.36.0 + 2.36.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.36.0 + 2.36.1-SNAPSHOT diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 7ccf21d5eb..7b274dc1b3 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.36.0 + 2.36.1-SNAPSHOT GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.19.0 + 2.19.1-SNAPSHOT com.google.auth @@ -108,24 +108,24 @@ com.google.api gax - 2.36.0 + 2.36.1-SNAPSHOT com.google.api gax - 2.36.0 + 2.36.1-SNAPSHOT test-jar testlib com.google.api.grpc proto-google-common-protos - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc grpc-google-common-protos - 2.27.0 + 2.27.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 0fa050644f..ca9ca46ada 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.27.0 + 2.27.1-SNAPSHOT grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.27.0 + 2.27.1-SNAPSHOT diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 3639996176..9d74588a7a 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.27.0 + 2.27.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.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -68,7 +68,7 @@ com.google.api.grpc grpc-google-common-protos - 2.27.0 + 2.27.1-SNAPSHOT io.grpc @@ -80,7 +80,7 @@ com.google.api.grpc proto-google-common-protos - 2.27.0 + 2.27.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 7efaac4d8e..5fc6a9d26a 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.27.0 + 2.27.1-SNAPSHOT proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.27.0 + 2.27.1-SNAPSHOT diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index b46addb415..969e902057 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.26.0 + 2.26.1-SNAPSHOT pom com.google.api gapic-generator-java-pom-parent - 2.28.0 + 2.28.1-SNAPSHOT ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.26.0 + 2.26.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - 2.26.0 + 2.26.1-SNAPSHOT com.google.cloud google-cloud-core-http - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index b8ff82c444..9f96a847d0 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.26.0 + 2.26.1-SNAPSHOT jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.26.0 + 2.26.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 3ea1743160..495edefa41 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.26.0 + 2.26.1-SNAPSHOT jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.26.0 + 2.26.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 2b1fc88dc2..e5eafac9c5 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.26.0 + 2.26.1-SNAPSHOT jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.26.0 + 2.26.1-SNAPSHOT google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index 4747372e94..c3596eac49 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.26.0 + 2.26.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.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.18.0 + 3.18.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 52a65be874..a5bbf84ab2 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.22.0 + 1.22.1-SNAPSHOT grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.22.0 + 1.22.1-SNAPSHOT diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index 24b5668481..20d6adb757 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.22.0 + 1.22.1-SNAPSHOT grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.22.0 + 1.22.1-SNAPSHOT diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index d5f11d280d..9ab9b3713a 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.22.0 + 1.22.1-SNAPSHOT grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.0 + 1.22.1-SNAPSHOT diff --git a/java-iam/pom.xml b/java-iam/pom.xml index a281d9952c..57fcac9a8d 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.22.0 + 1.22.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.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -81,44 +81,44 @@ com.google.api gax-bom - 2.36.0 + 2.36.1-SNAPSHOT pom import com.google.api.grpc proto-google-iam-v2 - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2 - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc proto-google-common-protos - 2.27.0 + 2.27.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2beta - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v1 - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2beta - 1.22.0 + 1.22.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.22.0 + 1.22.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 ad9fd4097a..93e0faf68b 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.22.0 + 1.22.1-SNAPSHOT proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.0 + 1.22.1-SNAPSHOT diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 98798aab62..b7c864d3da 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.22.0 + 1.22.1-SNAPSHOT proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.0 + 1.22.1-SNAPSHOT diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index 8cf5dd86c9..c46948ac11 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.22.0 + 1.22.1-SNAPSHOT proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.0 + 1.22.1-SNAPSHOT diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index 5719364326..c7ecf9bed2 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.18.0 + 3.18.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 1c61eb8faa..5058d257a0 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.18.0 + 3.18.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.28.0 + 2.28.1-SNAPSHOT pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.26.0 + 2.26.1-SNAPSHOT pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.26.0 + 2.26.1-SNAPSHOT test-jar com.google.cloud google-cloud-core - 2.26.0 + 2.26.1-SNAPSHOT tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index d9074d7db6..3a5edbffc3 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.18.0 + 3.18.1-SNAPSHOT first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.28.0 + 2.28.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.18.0 + 3.18.1-SNAPSHOT pom import com.google.cloud third-party-dependencies - 3.18.0 + 3.18.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 65e761dcd9..54a2a8e89a 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.18.0 + 3.18.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 c5a82f6f15..7778aa5830 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.18.0 + 3.18.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.18.0 + 3.18.1-SNAPSHOT pom import diff --git a/showcase/pom.xml b/showcase/pom.xml index cc988ea2ae..4652379a21 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -34,7 +34,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.18.0 + 3.18.1-SNAPSHOT pom import diff --git a/versions.txt b/versions.txt index 12b8ad1710..cf8f9033fd 100644 --- a/versions.txt +++ b/versions.txt @@ -1,19 +1,19 @@ # Format: # module:released-version:current-version -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 +gapic-generator-java:2.28.0:2.28.1-SNAPSHOT +api-common:2.19.0:2.19.1-SNAPSHOT +gax:2.36.0:2.36.1-SNAPSHOT +gax-grpc:2.36.0:2.36.1-SNAPSHOT +gax-httpjson:0.121.0:0.121.1-SNAPSHOT +proto-google-common-protos:2.27.0:2.27.1-SNAPSHOT +grpc-google-common-protos:2.27.0:2.27.1-SNAPSHOT +proto-google-iam-v1:1.22.0:1.22.1-SNAPSHOT +grpc-google-iam-v1:1.22.0:1.22.1-SNAPSHOT +proto-google-iam-v2beta:1.22.0:1.22.1-SNAPSHOT +grpc-google-iam-v2beta:1.22.0:1.22.1-SNAPSHOT +google-iam-policy:1.22.0:1.22.1-SNAPSHOT +proto-google-iam-v2:1.22.0:1.22.1-SNAPSHOT +grpc-google-iam-v2:1.22.0:1.22.1-SNAPSHOT +google-cloud-core:2.26.0:2.26.1-SNAPSHOT +google-cloud-shared-dependencies:3.18.0:3.18.1-SNAPSHOT From 448b0d1eea5c4bd5f89176315c21cf7d49bc1af5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Oct 2023 20:24:18 +0200 Subject: [PATCH 02/19] deps: update google api dependencies (#2187) --- 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 f6a76d8d51..e43c7b6ed0 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.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_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.27.0 +maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.27.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 @@ -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.4 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.com_google_api_api_common=com.google.api:api-common:2.19.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 -maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.21.0 +maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.22.0 +maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.22.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 15a796f718e7e27991d27a337223314addb0375a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Oct 2023 21:36:45 +0200 Subject: [PATCH 03/19] deps: update googleapis/java-cloud-bom digest to e896c4e (#2198) --- .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 d1d0ae6bf4..1316e6ec86 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@a0bfee488b0d74f9b68918ae01d4bf130520d2c5 + uses: googleapis/java-cloud-bom/tests/validate-bom@e896c4e65a82c3a072d7c8c40b6008abe31902d0 with: bom-path: gapic-generator-java-bom/pom.xml From 097e37e560646ed47925e3620c5a490a78889ec7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Oct 2023 22:13:47 +0200 Subject: [PATCH 04/19] deps: update googleapis/java-cloud-bom digest to d06156f (#2200) --- .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 1316e6ec86..ceebe28654 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@e896c4e65a82c3a072d7c8c40b6008abe31902d0 + uses: googleapis/java-cloud-bom/tests/validate-bom@d06156f6b8580b2b59923dee68ea81b69b98a6f9 with: bom-path: gapic-generator-java-bom/pom.xml From 5654aa64929f471415bc79820d065a3b49d3b92f Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Thu, 26 Oct 2023 22:48:22 +0000 Subject: [PATCH 05/19] chore: Fix flaky testCancelIsTraced test (#2039) * chore: Fix flaky testCancelIsTraced test * chore: Clean up testCancelIsTraced test * chore: Remove similar test * Update gax-java/gax/src/test/java/com/google/api/gax/retrying/ScheduledRetryingExecutorTest.java Co-authored-by: Blake Li * chore: Remove unneeded comment --------- Co-authored-by: Blake Li --- .../ScheduledRetryingExecutorTest.java | 33 +++---------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/gax-java/gax/src/test/java/com/google/api/gax/retrying/ScheduledRetryingExecutorTest.java b/gax-java/gax/src/test/java/com/google/api/gax/retrying/ScheduledRetryingExecutorTest.java index f4255b95a6..279bdd6ab7 100644 --- a/gax-java/gax/src/test/java/com/google/api/gax/retrying/ScheduledRetryingExecutorTest.java +++ b/gax-java/gax/src/test/java/com/google/api/gax/retrying/ScheduledRetryingExecutorTest.java @@ -288,6 +288,11 @@ public void testCancelOuterFutureAfterStart() throws Exception { boolean res = future.cancel(false); assertTrue(res); assertFutureCancel(future); + + // Verify that the cancelled future is traced. Every attempt increases the number + // of cancellation attempts from the tracer. + Mockito.verify(tracer, Mockito.times(executionsCount + 1)).attemptCancelled(); + // Assert that future has at least been attempted once // i.e. The future from executor.submit() has been run by the ScheduledExecutor assertTrue(future.getAttemptSettings().getAttemptCount() > 0); @@ -297,34 +302,6 @@ public void testCancelOuterFutureAfterStart() throws Exception { localExecutor.awaitTermination(10, TimeUnit.SECONDS); } - @Test - public void testCancelIsTraced() throws Exception { - ScheduledExecutorService localExecutor = Executors.newSingleThreadScheduledExecutor(); - FailingCallable callable = new FailingCallable(4, "request", "SUCCESS", tracer); - RetrySettings retrySettings = - FAST_RETRY_SETTINGS - .toBuilder() - .setInitialRetryDelay(Duration.ofMillis(1_000L)) - .setMaxRetryDelay(Duration.ofMillis(1_000L)) - .setTotalTimeout(Duration.ofMillis(10_0000L)) - .build(); - RetryingExecutorWithContext executor = - getRetryingExecutor(getAlgorithm(retrySettings, 0, null), localExecutor); - RetryingFuture future = - executor.createFuture(callable, FakeCallContext.createDefault().withTracer(tracer)); - callable.setExternalFuture(future); - future.setAttemptFuture(executor.submit(future)); - - Thread.sleep(30L); - - boolean res = future.cancel(false); - assertTrue(res); - assertFutureCancel(future); - - Mockito.verify(tracer).attemptCancelled(); - localExecutor.shutdownNow(); - } - @Test public void testCancelProxiedFutureAfterStart() throws Exception { // this is a heavy test, which takes a lot of time, so only few executions. From 96338f118f8aba7e165da7ef4b859216aa5e5aeb Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:27:43 +0000 Subject: [PATCH 06/19] chore: Update release-please configuration (#2197) --- .github/release-please.yml | 1 + .release-please-manifest.json | 3 +++ release-please-config.json | 11 +++++++++++ 3 files changed, 15 insertions(+) create mode 100644 .release-please-manifest.json create mode 100644 release-please-config.json diff --git a/.github/release-please.yml b/.github/release-please.yml index aebf5d41f0..d018289e95 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -2,4 +2,5 @@ releaseType: java-yoshi bumpMinorPreMajor: true handleGHRelease: true primaryBranch: main +manifest: true extraFiles: ["WORKSPACE"] diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000000..fa4d75253f --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "2.28.0" +} \ No newline at end of file diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000000..1e91744643 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,11 @@ +{ + "release-type": "java-yoshi-mono-repo", + "separate-pull-requests": false, + "include-component-in-tag": false, + "group-pull-request-title-pattern": "chore(${branch}): release ${version}", + "packages": { + ".": { + "extraFiles": ["WORKSPACE"] + } + } +} \ No newline at end of file From f9957df04bc00d72e1a26dfd5c4c4805172d58d7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 30 Oct 2023 16:15:40 +0100 Subject: [PATCH 07/19] deps: update googleapis/java-cloud-bom digest to b8394a1 (#2201) --- .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 ceebe28654..b8872a2150 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@d06156f6b8580b2b59923dee68ea81b69b98a6f9 + uses: googleapis/java-cloud-bom/tests/validate-bom@b8394a1979d6a135a059536e1b4f526d7efc84bb with: bom-path: gapic-generator-java-bom/pom.xml From 9152f24e7aafa165326205b12d3709c61c842a3f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 30 Oct 2023 16:36:39 +0100 Subject: [PATCH 08/19] deps: update googleapis/java-cloud-bom digest to 41d86db (#2205) --- .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 b8872a2150..4b86e4b5d3 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@b8394a1979d6a135a059536e1b4f526d7efc84bb + uses: googleapis/java-cloud-bom/tests/validate-bom@41d86dba28c2e724126568b4414ceae6a48e2a49 with: bom-path: gapic-generator-java-bom/pom.xml From 6d1f84a7923573346fbfbfa3107a3da4c0a19bfe Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 30 Oct 2023 17:10:08 +0100 Subject: [PATCH 09/19] deps: update dependency cryptography to v41.0.5 (#2206) --- .kokoro/requirements.txt | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 56bdc9e94a..fcdcf55509 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -87,30 +87,30 @@ colorlog==6.7.0 \ --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 # via gcp-docuploader -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 +cryptography==41.0.5 \ + --hash=sha256:0c327cac00f082013c7c9fb6c46b7cc9fa3c288ca702c74773968173bda421bf \ + --hash=sha256:0d2a6a598847c46e3e321a7aef8af1436f11c27f1254933746304ff014664d84 \ + --hash=sha256:227ec057cd32a41c6651701abc0328135e472ed450f47c2766f23267b792a88e \ + --hash=sha256:22892cc830d8b2c89ea60148227631bb96a7da0c1b722f2aac8824b1b7c0b6b8 \ + --hash=sha256:392cb88b597247177172e02da6b7a63deeff1937fa6fec3bbf902ebd75d97ec7 \ + --hash=sha256:3be3ca726e1572517d2bef99a818378bbcf7d7799d5372a46c79c29eb8d166c1 \ + --hash=sha256:573eb7128cbca75f9157dcde974781209463ce56b5804983e11a1c462f0f4e88 \ + --hash=sha256:580afc7b7216deeb87a098ef0674d6ee34ab55993140838b14c9b83312b37b86 \ + --hash=sha256:5a70187954ba7292c7876734183e810b728b4f3965fbe571421cb2434d279179 \ + --hash=sha256:73801ac9736741f220e20435f84ecec75ed70eda90f781a148f1bad546963d81 \ + --hash=sha256:7d208c21e47940369accfc9e85f0de7693d9a5d843c2509b3846b2db170dfd20 \ + --hash=sha256:8254962e6ba1f4d2090c44daf50a547cd5f0bf446dc658a8e5f8156cae0d8548 \ + --hash=sha256:88417bff20162f635f24f849ab182b092697922088b477a7abd6664ddd82291d \ + --hash=sha256:a48e74dad1fb349f3dc1d449ed88e0017d792997a7ad2ec9587ed17405667e6d \ + --hash=sha256:b948e09fe5fb18517d99994184854ebd50b57248736fd4c720ad540560174ec5 \ + --hash=sha256:c707f7afd813478e2019ae32a7c49cd932dd60ab2d2a93e796f68236b7e1fbf1 \ + --hash=sha256:d38e6031e113b7421db1de0c1b1f7739564a88f1684c6b89234fbf6c11b75147 \ + --hash=sha256:d3977f0e276f6f5bf245c403156673db103283266601405376f075c849a0b936 \ + --hash=sha256:da6a0ff8f1016ccc7477e6339e1d50ce5f59b88905585f77193ebd5068f1e797 \ + --hash=sha256:e270c04f4d9b5671ebcc792b3ba5d4488bf7c42c3c241a3748e2599776f29696 \ + --hash=sha256:e886098619d3815e0ad5790c973afeee2c0e6e04b4da90b88e6bd06e2a0b1b72 \ + --hash=sha256:ec3b055ff8f1dce8e6ef28f626e0972981475173d7973d63f271b29c8a2897da \ + --hash=sha256:fba1e91467c65fe64a82c689dc6cf58151158993b13eb7a7f3f4b7f395636723 # via # -r requirements.in # gcp-releasetool From 25957d3b8cc0424d5b1ac293e771a15f0fc54721 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 30 Oct 2023 17:45:16 +0000 Subject: [PATCH 10/19] deps: update graal-sdk to 22.3.3 in bazel dependencies file (#2209) --- 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 e43c7b6ed0..62df396042 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -74,7 +74,7 @@ maven.com_google_http_client_google_http_client=com.google.http-client:google-ht 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 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 -maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.1 +maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.3 # Testing maven artifacts maven.junit_junit=junit:junit:4.13.2 From 6bccaec168539969b2f5c4db26541ab23e8970a1 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 30 Oct 2023 19:36:45 +0000 Subject: [PATCH 11/19] chore: update graalvm container images to 22.3.3 (#2212) * chore: update graalvm container images to 22.3.3 --- .kokoro/presubmit/graalvm-native-17-downstream.cfg | 2 +- .kokoro/presubmit/graalvm-native-downstream.cfg | 2 +- renovate.json | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.kokoro/presubmit/graalvm-native-17-downstream.cfg b/.kokoro/presubmit/graalvm-native-17-downstream.cfg index d1f84b4eec..ac46d4b89f 100644 --- a/.kokoro/presubmit/graalvm-native-17-downstream.cfg +++ b/.kokoro/presubmit/graalvm-native-17-downstream.cfg @@ -3,5 +3,5 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3" } diff --git a/.kokoro/presubmit/graalvm-native-downstream.cfg b/.kokoro/presubmit/graalvm-native-downstream.cfg index 73a3bdfb44..4535885f5e 100644 --- a/.kokoro/presubmit/graalvm-native-downstream.cfg +++ b/.kokoro/presubmit/graalvm-native-downstream.cfg @@ -3,5 +3,5 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3" } diff --git a/renovate.json b/renovate.json index 51fb38011c..2a04434e6d 100644 --- a/renovate.json +++ b/renovate.json @@ -49,6 +49,14 @@ ], "depNameTemplate": "io.grpc:grpc-core", "datasourceTemplate": "maven" + }, + { + "customType": "regex", + "fileMatch": ["^.kokoro/presubmit/graalvm-native.*.cfg$"], + "matchStrings": ["value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm:(?.*?)\"", + "value: \"gcr.io/cloud-devrel-kokoro-resources/graalvm17:(?.*?)\""], + "depNameTemplate": "ghcr.io/graalvm/graalvm-ce", + "datasourceTemplate": "docker" } ], "packageRules": [ From 7dafa8d452615e5ac5dd5fbb95e645a1ce4a9226 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 31 Oct 2023 01:46:44 +0100 Subject: [PATCH 12/19] deps: update grpc dependencies to v1.59.0 (#2211) --- 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 19dfbdabc2..d4052024a9 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -26,7 +26,7 @@ 1.3.2 - 1.58.0 + 1.59.0 1.20.0 1.43.3 2.10.1 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 62df396042..458f37228f 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -28,7 +28,7 @@ version.gax_httpjson=2.36.1-SNAPSHOT version.com_google_protobuf=3.24.4 version.google_java_format=1.15.0 -version.io_grpc=1.58.0 +version.io_grpc=1.59.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From f3f9894057f2d0ff87b5a46713577db8aa7d4bf8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 31 Oct 2023 02:19:25 +0100 Subject: [PATCH 13/19] build(deps): update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.2.1 (#2207) --- 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 d4052024a9..183ed1c9ac 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.1.2 + 3.2.1 From 3e7328a36375bcc310ece824f1ce642710dc425d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 31 Oct 2023 02:19:49 +0100 Subject: [PATCH 14/19] build(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.2.1 (#2208) --- 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 183ed1c9ac..7937aef941 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.1.2 + 3.2.1 diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 5903ce661b..03832612f2 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.1.2 + 3.2.1 diff --git a/showcase/pom.xml b/showcase/pom.xml index 4652379a21..fb937435db 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.1 sponge_log ${skipUnitTests} From b797924a58ddc902ccf78a64134f3f5495b08aa5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 31 Oct 2023 21:05:14 +0100 Subject: [PATCH 15/19] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.6.1 (#2215) * build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.6.0 * debug statements * add set -x * debug statement * build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.6.1 * undo debug changes --------- Co-authored-by: mpeddada1 --- 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 7937aef941..e427e98d22 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.6.0 + 1.6.1 diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 5922dc371a..c826d5622c 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.6.0 + 1.6.1 diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 5058d257a0..0a03f7c3cb 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.6.0 + 1.6.1 diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 54a2a8e89a..737f0e2408 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.6.0 + 1.6.1 diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index 7778aa5830..644982a1af 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.6.0 + 1.6.1 diff --git a/showcase/pom.xml b/showcase/pom.xml index fb937435db..b331e9ac02 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -15,7 +15,7 @@ com.google.cloud google-cloud-shared-config - 1.6.0 + 1.6.1 From 1af12a8881c2036d4ddb844c061b5f6b17e991d9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 31 Oct 2023 21:06:41 +0100 Subject: [PATCH 16/19] deps: update dependency google-cloud-storage to v2.13.0 (#2216) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index fcdcf55509..597d41e79e 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.12.0 \ - --hash=sha256:57c0bcda2f5e11f008a155d8636d8381d5abab46b58e0cae0e46dd5e595e6b46 \ - --hash=sha256:bc52563439d42981b6e21b071a76da2791672776eda3ba99d13a8061ebbd6e5e +google-cloud-storage==2.13.0 \ + --hash=sha256:ab0bf2e1780a1b74cf17fccb13788070b729f50c252f0c94ada2aae0ca95437d \ + --hash=sha256:f62dc4c7b6cd4360d072e3deb28035fbdad491ac3d9b0b1815a12daea10f37c7 # via gcp-docuploader google-crc32c==1.5.0 \ --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ From f1ee04d902000c5f8dd6a9c51dea57c9de01a25e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 31 Oct 2023 21:42:22 +0100 Subject: [PATCH 17/19] deps: update dependency google-auth to v2.23.4 (#2217) --- .kokoro/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 597d41e79e..32ffca9672 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -129,9 +129,9 @@ google-api-core==2.12.0 \ # via # google-cloud-core # google-cloud-storage -google-auth==2.23.3 \ - --hash=sha256:6864247895eea5d13b9c57c9e03abb49cb94ce2dc7c58e91cba3248c7477c9e3 \ - --hash=sha256:a8f4608e65c244ead9e0538f181a96c6e11199ec114d41f1d7b1bffa96937bda +google-auth==2.23.4 \ + --hash=sha256:79905d6b1652187def79d491d6e23d0cbb3a21d3c7ba0dbaa9c8a01906b13ff3 \ + --hash=sha256:d4bbc92fe4b8bfd2f3e8d88e5ba7085935da208ee38a134fc280e7ce682a05f2 # via # gcp-releasetool # google-api-core From 39b9f0e956b7967d118873ee2e365fe6a02a029b Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Tue, 31 Oct 2023 19:19:41 -0400 Subject: [PATCH 18/19] feat: `generate_library.sh` with postprocessing (#1951) * feat: add * generate gapic and proto folder * refactor utilities * add an action to verify * checkout googleapis-gen * setup repo name * add commit hash of googleapis-gen * change secret * change token * change to git clone * change user name * add input list * include resources folder in main * remove grpc version in `*ServiceGrpc.java` * change destination path * compare generation result with googleapis-gen * fix type in diff command * checkout repo using checkout action * checkout repos as nested repo * sparse checkout googleapis * Revert "sparse checkout googleapis" This reverts commit 3d612f8e4949251d7d97070f507c31ff4170d85a. * change library * change step name * add a readme * make grpc version optional * make protobuf version optional * checkout master branch, rather than a commit hash * allow snapshot version of generator * download snapshot of generator parent pom * update README * download generator and grpc using mvn * change error message * add maven central mirror * add comments in utilities * add comments * add an integration test * fail fast if no file is found * do not delete google/ * get protobuf version from WORKSPACE * add instructions on download `google/` from googleapis * add comments * update description of `destination_path` * update comments * download dependencies using `curl` * increase download time * remove comment * add samples directory in readme * remove prerequisite about `proto_path` * add explanation in prerequisite * add example to generate showcase * add a comment * wip adaptations * add owlbot.py template * run owlbot docker image * fix consolidate config * move owlbot call to its own function * move postprocessing logic * prepare integration test for gh workflow * fix local dev script * post-merge fixes * fix test script and IT * fix parent poms * start fixing samples problem * fix samples folder transfer * cleanup, prepare IT workflow * cleanup ii, sparse clone monorepo * delete preserve script * clean unnecessary lines * infer owlbot sha * add template file * remove newline from owlbot template * chore: newline correction * use stderr for error messages * fix script documentation * function comments * quoting variables * format constant * fix sparse checkout of monorepo * include location to googleapis sparse clone * remove unnecessary parent pom setting * remove consolidate_config.sh * exclude changelog and owlbot copy files from diff check * fixes after merge * include .github in monorepo sparse clone * restore `set_parent_pom.sh` * restore `consolidate_config.sh` * correct parameter resolution * use separate variable for version * postprocessing to use separate versions * remove old IT file * post-merge fixes * enable post-processing by default * post-merge fixes * post-merge fixes * post merge fixes * add script to compare poms * post-merge fixes * post-merge fixes ii * fix pom comparison * include pre-existing poms before running owlbot * change owlbot-staging suffix folder to run owlbot.py * fix newline removal in owlbot.py * split git diff command * enable tests for HW libraries * generate all hw libs except bigtable * all libraries passing * fix unit tests * repo metadata json logic cleanup * remove new library scripts * fix googleapis-gen tests * fix post-processing it * magic empty commit * correct conflict string * use os agnostic string replacement * comments and cleanup on postprocessing * cleanup of IT * temp: use custom gapic library name * use owl-bot-copy * remove api_version logic * remove custom_gapic_name in favor of owl-bot-copy * remove unnecessary new library flag * fix folder name test * remove unnecessary util function * remove unnecessary utils script dir var * rename postprocessing folder, apply_current_versions comment * fix postprocessing comments * correct popd folder name to its variable name * unnecessary sed command * skip generation if more versions coming * do not stage previous versions in owl-bot-staging * do not use custom repo metadatas * reset workspace folder * remove unnecessary owlbot yaml copy * modify readme * expand README instructions * examples for both pre and post processing * exclude new library owlbot.py template * do not process HW libraries * success message, folder navigation fix * set git author * add docker to workflow * lint fix * custom docker step for macos * do not postprocess showcase * os-dependent pom comparison * add python to workflow * explicit python version * add debugging output for compare_poms * correct xargs for macos * remove debug checkpoints * clean compare_poms.py * concise else logic * infer destination_path * add generation times * remove unused transport and include_samples from postprocessing * use versions.txt at root of owlbot postprocessor fs * modify success message * remove unused version processing script * remove owlbot_sha and repo_metadata args * use built-in docker images * manual install of docker ii * manual install of docker iii * manual install of docker iv * manual install of docker v * manual install of docker vi * manual install of docker vii * manual install of docker viii * manual install of docker ix * versions.txt as an argument * fix exit code in time tracking * fix readme * remove unused options * fix macos docker install * do not use cask to install docker * test custom user id in docker run * correct time tracking entry * change postprocessing file structture * move helper postprocess funcs to utilities.sh * add unit tests for postprocess utils * remove repository_path * fix workspace creation logic * fix readme * transfer from workspace to destination path * include folder structure for p.p. libs in readme * omit pre-processed folders * omit package-info.java * fix documentation argument order * fix preparation of copy-code source folder * add unit test for copy_directory_if_exists * fix wrong args to cp * change test monorepo folder names --------- Co-authored-by: JoeWang1127 --- .../workflows/verify_library_generation.yaml | 27 ++- library_generation/README.md | 68 ++++++- library_generation/generate_library.sh | 59 +++++- library_generation/postprocess_library.sh | 101 ++++++++++ library_generation/test/compare_poms.py | 116 ++++++++++++ .../test/generate_library_integration_test.sh | 174 ++++++++++++++---- .../test/generate_library_unit_tests.sh | 56 ++++++ .../test/resources/proto_path_list.txt | 39 ++-- .../test-monorepo/.github/.OwlBot.lock.yaml | 17 ++ .../test-service/.repo-metadata.json | 18 ++ library_generation/test/test_utilities.sh | 40 ++++ library_generation/utilities.sh | 54 +++++- showcase/scripts/generate_showcase.sh | 1 + 13 files changed, 704 insertions(+), 66 deletions(-) create mode 100755 library_generation/postprocess_library.sh create mode 100644 library_generation/test/compare_poms.py create mode 100644 library_generation/test/resources/test-monorepo/.github/.OwlBot.lock.yaml create mode 100644 library_generation/test/resources/test-monorepo/test-service/.repo-metadata.json diff --git a/.github/workflows/verify_library_generation.yaml b/.github/workflows/verify_library_generation.yaml index 5a361828d7..521f586c3d 100644 --- a/.github/workflows/verify_library_generation.yaml +++ b/.github/workflows/verify_library_generation.yaml @@ -14,6 +14,7 @@ jobs: matrix: java: [ 8 ] os: [ ubuntu-22.04, macos-12 ] + post_processing: [ 'true', 'false' ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -22,11 +23,35 @@ jobs: java-version: ${{ matrix.java }} distribution: temurin cache: maven + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + - name: install docker (ubuntu) + if: matrix.os == 'ubuntu-22.04' + run: | + set -x + # install docker + sudo apt install containerd -y + sudo apt install -y docker.io docker-compose + + # launch docker + sudo systemctl start docker + - name: install docker (macos) + if: matrix.os == 'macos-12' + run: | + brew update --preinstall + brew install docker docker-compose qemu + brew upgrade qemu + colima start + docker run --user $(id -u):$(id -g) --rm hello-world - name: Run integration tests run: | set -x + git config --global user.email "github-workflow@github.com" + git config --global user.name "Github Workflow" library_generation/test/generate_library_integration_test.sh \ - --googleapis_gen_url https://cloud-java-bot:${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}@github.com/googleapis/googleapis-gen.git + --googleapis_gen_url https://cloud-java-bot:${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}@github.com/googleapis/googleapis-gen.git \ + --enable_postprocessing "${{ matrix.post_processing }}" unit_tests: strategy: matrix: diff --git a/library_generation/README.md b/library_generation/README.md index 7a2fe32e3e..c2e9826b5b 100644 --- a/library_generation/README.md +++ b/library_generation/README.md @@ -21,6 +21,13 @@ In order to generate a GAPIC library, you need to pull `google/` from [googleapi and put it into `output` since protos in `google/` are likely referenced by protos from which the library are generated. +In order to generate a post-processed GAPIC library, you need to pull the +original repository (i.e. google-cloud-java) and pass the monorepo as +`destination_path` (e.g. `google-cloud-java/java-asset`). +This repository will be the source of truth for pre-existing +pom.xml files, owlbot.py and .OwlBot.yaml files. See the option belows for +custom postprocessed generations (e.g. custom `versions.txt` file). + ## Parameters to run `generate_library.sh` You need to run the script with the following parameters. @@ -40,7 +47,7 @@ Use `-d` or `--destination_path` to specify the value. Note that you do not need to create `$destination_path` beforehand. -The directory structure of the generated library is +The directory structure of the generated library _withtout_ postprocessing is ``` $destination_path |_gapic-* @@ -65,7 +72,35 @@ $destination_path ``` You can't build the library as-is since it does not have `pom.xml` or `build.gradle`. To use the library, copy the generated files to the corresponding directory -of a library repository, e.g., `google-cloud-java`. +of a library repository, e.g., `google-cloud-java` or use the +`enable_postprocessing` flag on top of a pre-existing generated library to +produce the necessary pom files. + +For `asset/v1` the directory structure of the generated library _with_ postprocessing is +``` + +├── google-cloud-asset +│   └── src +│   ├── main +│   │   ├── java +│   │   └── resources +│   └── test +│   └── java +├── google-cloud-asset-bom +├── grpc-google-cloud-asset-v* +│   └── src +│   └── main +│   └── java +├── proto-google-cloud-asset-v* +│   └── src +│   └── main +│   ├── java +│   └── proto +└── samples + └── snippets + └── generated + +``` ### gapic_generator_version You can find the released version of gapic-generator-java in [maven central](https://repo1.maven.org/maven2/com/google/api/gapic-generator-java/). @@ -150,8 +185,33 @@ Use `--include_samples` to specify the value. Choose the protoc binary type from https://github.com/protocolbuffers/protobuf/releases. Default is "linux-x86_64". -## An example to generate a client library +### enable_postprocessing (optional) +Whether to enable the post-processing steps (usage of owlbot) in the generation +of this library +Default is "true". + +### versions_file (optional) +It must point to a versions.txt file containing the versions the post-processed +poms will have. It is required when `enable_postprocessing` is `"true"` + + +## An example to generate a non post-processed client library +```bash +library_generation/generate_library.sh \ +-p google/cloud/confidentialcomputing/v1 \ +-d google-cloud-confidentialcomputing-v1-java \ +--gapic_generator_version 2.24.0 \ +--protobuf_version 23.2 \ +--grpc_version 1.55.1 \ +--gapic_additional_protos "google/cloud/common_resources.proto google/cloud/location/locations.proto" \ +--transport grpc+rest \ +--rest_numeric_enums true \ +--enable_postprocessing false \ +--include_samples true ``` + +## An example to generate a library with postprocessing +```bash library_generation/generate_library.sh \ -p google/cloud/confidentialcomputing/v1 \ -d google-cloud-confidentialcomputing-v1-java \ @@ -161,5 +221,7 @@ library_generation/generate_library.sh \ --gapic_additional_protos "google/cloud/common_resources.proto google/cloud/location/locations.proto" \ --transport grpc+rest \ --rest_numeric_enums true \ +--enable_postprocessing true \ +--versions_file "path/to/versions.txt" \ --include_samples true ``` diff --git a/library_generation/generate_library.sh b/library_generation/generate_library.sh index 04e3fbe860..7df2b226e9 100755 --- a/library_generation/generate_library.sh +++ b/library_generation/generate_library.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -eo pipefail -set -x # parse input parameters while [[ $# -gt 0 ]]; do @@ -61,10 +60,18 @@ case $key in include_samples="$2" shift ;; + --enable_postprocessing) + enable_postprocessing="$2" + shift + ;; --os_architecture) os_architecture="$2" shift ;; + --versions_file) + versions_file="$2" + shift + ;; *) echo "Invalid option: [$1]" exit 1 @@ -74,6 +81,7 @@ shift # past argument or value done script_dir=$(dirname "$(readlink -f "$0")") +# source utility functions source "${script_dir}"/utilities.sh output_folder="$(get_output_folder)" @@ -117,17 +125,20 @@ if [ -z "${include_samples}" ]; then include_samples="true" fi +if [ -z "$enable_postprocessing" ]; then + enable_postprocessing="true" +fi + if [ -z "${os_architecture}" ]; then os_architecture=$(detect_os_architecture) fi - mkdir -p "${output_folder}/${destination_path}" ##################### Section 0 ##################### # prepare tooling ##################################################### # the order of services entries in gapic_metadata.json is relevant to the -# order of proto file, sort the proto files with respect to their name to +# order of proto file, sort the proto files with respect to their bytes to # get a fixed order. folder_name=$(extract_folder_name "${destination_path}") pushd "${output_folder}" @@ -137,7 +148,7 @@ case "${proto_path}" in find_depth="-maxdepth 1" ;; esac -proto_files=$(find "${proto_path}" ${find_depth} -type f -name "*.proto" | sort) +proto_files=$(find "${proto_path}" ${find_depth} -type f -name "*.proto" | LC_COLLATE=C sort) # include or exclude certain protos in grpc plugin and gapic generator java. case "${proto_path}" in "google/cloud") @@ -280,5 +291,41 @@ popd # output_folder ##################################################### pushd "${output_folder}/${destination_path}" rm -rf java_gapic_srcjar java_gapic_srcjar_raw.srcjar.zip java_grpc.jar java_proto.jar temp-codegen.srcjar -popd -set +x +popd # destination path +##################### Section 5 ##################### +# post-processing +##################################################### +if [ "${enable_postprocessing}" != "true" ]; +then + echo "post processing is disabled" + exit 0 +fi +if [ -z "${versions_file}" ];then + echo "no versions.txt argument provided. Please provide one in order to enable post-processing" + exit 1 +fi +workspace="${output_folder}/workspace" +if [ -d "${workspace}" ]; then + rm -rdf "${workspace}" +fi + +mkdir -p "${workspace}" + +bash -x "${script_dir}/postprocess_library.sh" "${workspace}" \ + "${script_dir}" \ + "${destination_path}" \ + "${proto_path}" \ + "${versions_file}" \ + "${output_folder}" + +# for post-procesed libraries, remove pre-processed folders +pushd "${output_folder}/${destination_path}" +rm -rdf "proto-${folder_name}" +rm -rdf "grpc-${folder_name}" +rm -rdf "gapic-${folder_name}" +if [ "${include_samples}" == "false" ]; then + rm -rdf "samples" +fi +popd # output_folder +# move contents of the post-processed library into destination_path +cp -r ${workspace}/* "${output_folder}/${destination_path}" diff --git a/library_generation/postprocess_library.sh b/library_generation/postprocess_library.sh new file mode 100755 index 0000000000..880139db73 --- /dev/null +++ b/library_generation/postprocess_library.sh @@ -0,0 +1,101 @@ +#!/bin/bash +# +# Main functions to interact with owlbot post-processor and postprocessing +# scripts + + +# Runs the owlbot post-processor docker image. The resulting post-processed +# library gets stored in `${output_folder}/workspace` +# Arguments +# 1 - workspace: the location of the grpc,proto and gapic libraries to be +# processed +# 2 - scripts_root: location of the generation scripts +# 3 - destination_path: used to transfer the raw grpc, proto and gapic libraries +# 4 - proto_path: googleapis path of the library. This is used to prepare the +# folder structure to run `owlbot-cli copy-code` +# 5 - versions_file: path to file containing versions to be applied to the poms +# 6 - output_folder: main workspace of the generation process + +workspace=$1 +scripts_root=$2 +destination_path=$3 +proto_path=$4 +versions_file=$5 +output_folder=$6 + +source "${scripts_root}"/utilities.sh + +repository_root=$(echo "${destination_path}" | cut -d/ -f1) +repo_metadata_json_path=$(get_repo_metadata_json "${destination_path}" "${output_folder}") +owlbot_sha=$(get_owlbot_sha "${output_folder}" "${repository_root}") + +# read or infer owlbot sha + +cp "${repo_metadata_json_path}" "${workspace}"/.repo-metadata.json + +# call owl-bot-copy +owlbot_staging_folder="${workspace}/owl-bot-staging" +mkdir -p "${owlbot_staging_folder}" +owlbot_postprocessor_image="gcr.io/cloud-devrel-public-resources/owlbot-java@sha256:${owlbot_sha}" + + + +# copy existing pom, owlbot and version files if the source of truth repo is present +# pre-processed folders are ommited +if [[ -d "${output_folder}/${destination_path}" ]]; then + rsync -avm \ + --include='*/' \ + --include='*.xml' \ + --include='owlbot.py' \ + --include='.OwlBot.yaml' \ + --exclude='*' \ + "${output_folder}/${destination_path}/" \ + "${workspace}" +fi + +echo 'Running owl-bot-copy' +pre_processed_libs_folder="${output_folder}/pre-processed" +# By default (thanks to generation templates), .OwlBot.yaml `deep-copy` section +# references a wildcard pattern matching a folder +# ending with `-java` at the leaf of proto_path. +mkdir -p "${pre_processed_libs_folder}/${proto_path}/generated-java" +folder_name=$(extract_folder_name "${destination_path}") +copy_directory_if_exists "${output_folder}/${destination_path}/proto-${folder_name}" \ + "${pre_processed_libs_folder}/${proto_path}/generated-java/proto-google-cloud-${folder_name}" +copy_directory_if_exists "${output_folder}/${destination_path}/grpc-${folder_name}" \ + "${pre_processed_libs_folder}/${proto_path}/generated-java/grpc-google-cloud-${folder_name}" +copy_directory_if_exists "${output_folder}/${destination_path}/gapic-${folder_name}" \ + "${pre_processed_libs_folder}/${proto_path}/generated-java/gapic-google-cloud-${folder_name}" +copy_directory_if_exists "${output_folder}/${destination_path}/samples" \ + "${pre_processed_libs_folder}/${proto_path}/generated-java/samples" +pushd "${pre_processed_libs_folder}" +# create an empty repository so owl-bot-copy can process this as a repo +# (cannot process non-git-repositories) +git init +git commit --allow-empty -m 'empty commit' +popd # pre_processed_libs_folder + +docker run --rm \ + --user $(id -u):$(id -g) \ + -v "${workspace}:/repo" \ + -v "${pre_processed_libs_folder}:/pre-processed-libraries" \ + -w /repo \ + --env HOME=/tmp \ + gcr.io/cloud-devrel-public-resources/owlbot-cli:latest \ + copy-code \ + --source-repo-commit-hash=none \ + --source-repo=/pre-processed-libraries \ + --config-file=.OwlBot.yaml + + +echo 'running owl-bot post-processor' +versions_file_arg="" +if [ -f "${versions_file}" ];then + versions_file_arg="-v ${versions_file}:/versions.txt" +fi +# run the postprocessor +docker run --rm \ + -v "${workspace}:/workspace" \ + ${versions_file_arg} \ + --user $(id -u):$(id -g) \ + "${owlbot_postprocessor_image}" diff --git a/library_generation/test/compare_poms.py b/library_generation/test/compare_poms.py new file mode 100644 index 0000000000..c2abd8da13 --- /dev/null +++ b/library_generation/test/compare_poms.py @@ -0,0 +1,116 @@ +""" +Utility to compare the contents of two XML files. +This focuses on the tree structure of both XML files, meaning that element order and whitespace will be disregarded. +The only comparison points are: element path (e.g. project/dependencies) and element text +There is a special case for `dependency`, where the maven coordinates are prepared as well +""" + +import sys +import xml.etree.ElementTree as ET +from collections import Counter + +""" +prints to stderr +""" +def eprint(*args, **kwargs): + print(*args, file=sys.stderr, **kwargs) + +""" +Convenience method to access a node's child elements via path and get its text +""" +def get_text_from_element(node, element_name, namespace): + child = node.find(namespace + element_name) + return child.text if child is not None else '' + +""" +Convenience method to pretty print the contents of a Counter (or dict) +""" +def print_counter(counter): + for key, value in counter.items(): + eprint(f'{key}: {value}') + +""" +Recursively traverses a node tree and appends element text to a given +`elements` array. If the element tag is `dependency` +then the maven coordinates for its children will be computed as well +""" +def append_to_element_list(node, path, elements): + namespace_start, namespace_end, tag_name = node.tag.rpartition('}') + namespace = namespace_start + namespace_end + if tag_name == 'dependency': + group_id = get_text_from_element(node, 'groupId', namespace) + artifact_id = get_text_from_element(node, 'artifactId', namespace) + artifact_str = '' + artifact_str += group_id + artifact_str += ':' + artifact_id + elements.append(path + '/' + tag_name + '=' + artifact_str) + if node.text and len(node.text.strip()) > 0: + elements.append(path + '/' + tag_name + '=' + node.text) + + if tag_name == 'version': + # versions may be yet to be processed, we disregard them + return elements + + for child in node: + child_path = path + '/' + tag_name + append_to_element_list(child, child_path, elements) + + return elements + +""" +compares two XMLs for content differences +the argument print_whole_trees determines if both trees should be printed +""" +def compare_xml(file1, file2, print_whole_trees): + try: + tree1 = ET.parse(file1) + tree2 = ET.parse(file2) + except ET.ParseError as e: + eprint(f'Error parsing XML') + raise e + except FileNotFoundError as e: + eprint(f'Error reading file') + raise e + + tree1_elements = [] + tree2_elements = [] + + append_to_element_list(tree1.getroot(), '/', tree1_elements) + append_to_element_list(tree2.getroot(), '/', tree2_elements) + + tree1_counter = Counter(tree1_elements) + tree2_counter = Counter(tree2_elements) + intersection = tree1_counter & tree2_counter + only_in_tree1 = tree1_counter - intersection + only_in_tree2 = tree2_counter - intersection + if print_whole_trees == 'true': + eprint('tree1') + print_counter(tree2_counter) + eprint('tree2') + print_counter(tree1_counter) + if len(only_in_tree1) > 0 or len(only_in_tree2) > 0: + eprint('only in ' + file1) + print_counter(only_in_tree1) + eprint('only in ' + file2) + print_counter(only_in_tree2) + return True + return False + + +if __name__ == "__main__": + if len(sys.argv) != 4: + eprint("Usage: python compare_xml.py ") + sys.exit(1) + + file1 = sys.argv[1] + file2 = sys.argv[2] + print_whole_trees = sys.argv[3] + has_diff = compare_xml(file1, file2, print_whole_trees) + + if has_diff: + eprint(f'The poms are different') + sys.exit(1) + eprint('The XML files are the same.') + sys.exit(0) + + diff --git a/library_generation/test/generate_library_integration_test.sh b/library_generation/test/generate_library_integration_test.sh index c4ea9fde25..64b526e47c 100755 --- a/library_generation/test/generate_library_integration_test.sh +++ b/library_generation/test/generate_library_integration_test.sh @@ -3,34 +3,51 @@ set -xeo pipefail # This script is used to test the result of `generate_library.sh` against generated -# source code in googleapis-gen repository. +# source code in the specified repository. # Specifically, this script will do # 1. checkout the master branch of googleapis/google and WORKSPACE # 2. parse version of gapic-generator-java, protobuf and grpc from WORKSPACE # 3. generate a library with proto_path and destination_path in a proto_path # list by invoking `generate_library.sh`. GAPIC options to generate a library # will be parsed from proto_path/BUILD.bazel. -# 4. checkout the master branch googleapis-gen repository and compare the result. +# 4. depending on whether postprocessing is enabled, +# 4.1 checkout the master branch of googleapis-gen repository and compare the result, or +# 4.2 checkout the master branch of google-cloud-java or HW library repository and compare the result # defaults googleapis_gen_url="git@github.com:googleapis/googleapis-gen.git" +enable_postprocessing="true" + script_dir=$(dirname "$(readlink -f "$0")") proto_path_list="${script_dir}/resources/proto_path_list.txt" library_generation_dir="${script_dir}"/.. source "${script_dir}/test_utilities.sh" +source "${script_dir}/../utilities.sh" output_folder="$(pwd)/output" while [[ $# -gt 0 ]]; do key="$1" case $key in - --proto_path_list) + -p|--proto_path_list) proto_path_list="$2" shift ;; - --googleapis_gen_url) + -e|--enable_postprocessing) + enable_postprocessing="$2" + shift + ;; + -s|--owlbot_sha) + owlbot_sha="$2" + shift + ;; + -g|--googleapis_gen_url) googleapis_gen_url="$2" shift ;; + -v|--versions_file) + versions_file="$2" + shift + ;; *) echo "Invalid option: [$1]" exit 1 @@ -39,7 +56,6 @@ esac shift # past argument or value done -library_generation_dir="${script_dir}"/.. mkdir -p "${output_folder}" pushd "${output_folder}" # checkout the master branch of googleapis/google (proto files) and WORKSPACE @@ -57,12 +73,25 @@ protobuf_version=$(get_version_from_WORKSPACE "protobuf-" WORKSPACE "-") echo "The version of protobuf is ${protobuf_version}" popd # googleapis popd # output_folder +if [ -f "${output_folder}/generation_times" ];then + rm "${output_folder}/generation_times" +fi +if [ -z "${versions_file}" ]; then + # google-cloud-java will be downloaded before each call of + # `generate_library.sh` + versions_file="${output_folder}/google-cloud-java/versions.txt" +fi grep -v '^ *#' < "${proto_path_list}" | while IFS= read -r line; do proto_path=$(echo "$line" | cut -d " " -f 1) - destination_path=$(echo "$line" | cut -d " " -f 2) - # parse GAPIC options from proto_path/BUILD.bazel + repository_path=$(echo "$line" | cut -d " " -f 2) + is_handwritten=$(echo "$line" | cut -d " " -f 3) + # parse destination_path pushd "${output_folder}" + echo "Checking out googleapis-gen repository..." + sparse_clone "${googleapis_gen_url}" "${proto_path}" + destination_path=$(compute_destination_path "${proto_path}" "${output_folder}") + # parse GAPIC options from proto_path/BUILD.bazel proto_build_file_path="${proto_path}/BUILD.bazel" proto_only=$(get_proto_only_from_BUILD "${proto_build_file_path}") gapic_additional_protos=$(get_gapic_additional_protos_from_BUILD "${proto_build_file_path}") @@ -80,39 +109,114 @@ grep -v '^ *#' < "${proto_path_list}" | while IFS= read -r line; do service_config=${service_config}, service_yaml=${service_yaml}, include_samples=${include_samples}." + pushd "${output_folder}" + if [ "${is_handwritten}" == "true" ]; then + echo 'this is a handwritten library' + popd # output folder + continue + else + echo 'this is a monorepo library' + sparse_clone "https://github.com/googleapis/google-cloud-java.git" "${repository_path} google-cloud-pom-parent google-cloud-jar-parent versions.txt .github" + # compute path from output_folder to source of truth library location + # (e.g. google-cloud-java/java-compute) + repository_path="google-cloud-java/${repository_path}" + target_folder="${output_folder}/${repository_path}" + popd # output_folder + fi # generate GAPIC client library echo "Generating library from ${proto_path}, to ${destination_path}..." - "${library_generation_dir}"/generate_library.sh \ - -p "${proto_path}" \ - -d "${destination_path}" \ - --gapic_generator_version "${gapic_generator_version}" \ - --protobuf_version "${protobuf_version}" \ - --proto_only "${proto_only}" \ - --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..." + generation_start=$(date "+%s") + if [ $enable_postprocessing == "true" ]; then + if [[ "${repository_path}" == "null" ]]; then + # we need a repository to compare the generated results with. Skip this + # library + continue + fi + "${library_generation_dir}"/generate_library.sh \ + -p "${proto_path}" \ + -d "${repository_path}" \ + --gapic_generator_version "${gapic_generator_version}" \ + --protobuf_version "${protobuf_version}" \ + --proto_only "${proto_only}" \ + --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}" \ + --enable_postprocessing "true" \ + --versions_file "${output_folder}/google-cloud-java/versions.txt" + else + "${library_generation_dir}"/generate_library.sh \ + -p "${proto_path}" \ + -d "${destination_path}" \ + --gapic_generator_version "${gapic_generator_version}" \ + --protobuf_version "${protobuf_version}" \ + --proto_only "${proto_only}" \ + --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}" \ + --enable_postprocessing "false" + fi + generation_end=$(date "+%s") + # some generations are less than 1 second (0 produces exit code 1 in `expr`) + generation_duration_seconds=$(expr "${generation_end}" - "${generation_start}" || true) + echo "Generation time for ${repository_path} was ${generation_duration_seconds} seconds." + pushd "${output_folder}" + echo "${proto_path} ${generation_duration_seconds}" >> generation_times + echo "Generate library finished." echo "Compare generation result..." - pushd "${output_folder}" - sparse_clone "${googleapis_gen_url}" "${proto_path}/${destination_path}" - RESULT=0 - # include gapic_metadata.json and package-info.java after - # resolving https://github.com/googleapis/sdk-platform-java/issues/1986 - diff -r "googleapis-gen/${proto_path}/${destination_path}" "${output_folder}/${destination_path}" -x "*gradle*" -x "gapic_metadata.json" -x "package-info.java" || RESULT=$? + if [ $enable_postprocessing == "true" ]; then + echo "Checking out repository..." + pushd "${target_folder}" + SOURCE_DIFF_RESULT=0 + git diff \ + --ignore-space-at-eol \ + -r \ + --exit-code \ + -- \ + ':!*pom.xml' \ + ':!*README.md' \ + ':!*package-info.java' \ + || SOURCE_DIFF_RESULT=$? - if [ ${RESULT} == 0 ] ; then - echo "SUCCESS: Comparison finished, no difference is found." - else - echo "FAILURE: Differences found in proto path: ${proto_path}." - exit "${RESULT}" + POM_DIFF_RESULT=$(compare_poms "${target_folder}") + popd # target_folder + if [[ ${SOURCE_DIFF_RESULT} == 0 ]] && [[ ${POM_DIFF_RESULT} == 0 ]] ; then + echo "SUCCESS: Comparison finished, no difference is found." + # Delete google-cloud-java to allow a sparse clone of the next library + rm -rdf google-cloud-java + elif [ ${SOURCE_DIFF_RESULT} != 0 ]; then + echo "FAILURE: Differences found in proto path: ${proto_path}." + exit "${SOURCE_DIFF_RESULT}" + elif [ ${POM_DIFF_RESULT} != 0 ]; then + echo "FAILURE: Differences found in generated poms" + exit "${POM_DIFF_RESULT}" + fi + elif [ $enable_postprocessing == "false" ]; then + # include gapic_metadata.json and package-info.java after + # resolving https://github.com/googleapis/sdk-platform-java/issues/1986 + SOURCE_DIFF_RESULT=0 + diff --strip-trailing-cr -r "googleapis-gen/${proto_path}/${destination_path}" "${output_folder}/${destination_path}" \ + -x "*gradle*" \ + -x "gapic_metadata.json" \ + -x "package-info.java" || SOURCE_DIFF_RESULT=$? + if [ ${SOURCE_DIFF_RESULT} == 0 ] ; then + echo "SUCCESS: Comparison finished, no difference is found." + else + echo "FAILURE: Differences found in proto path: ${proto_path}." + exit "${SOURCE_DIFF_RESULT}" + fi fi + popd # output_folder done - -rm -rf "${output_folder}" +echo "ALL TESTS SUCCEEDED" +echo "generation times in seconds (does not consider repo checkout):" +cat "${output_folder}/generation_times" diff --git a/library_generation/test/generate_library_unit_tests.sh b/library_generation/test/generate_library_unit_tests.sh index 8fc94ce94b..8a6ef0f42d 100755 --- a/library_generation/test/generate_library_unit_tests.sh +++ b/library_generation/test/generate_library_unit_tests.sh @@ -305,6 +305,56 @@ get_version_from_valid_WORKSPACE_test() { assertEquals '2.25.1-SNAPSHOT' "${obtained_ggj_version}" } +get_repo_metadata_json_valid_repo_succeeds() { + local output_folder="${script_dir}/resources" + local repository_path="test-monorepo/test-service" + local repo_metadata_json=$(get_repo_metadata_json "${repository_path}" "${output_folder}") + assertEquals "${output_folder}/${repository_path}/.repo-metadata.json" \ + "${repo_metadata_json}" +} + +get_repo_metadata_json_invalid_repo_fails() { + local output_folder="${script_dir}/resources" + local repository_path="test-monorepo/java-nonexistent" + $(get_repo_metadata_json "${repository_path}" "${output_folder}") || res=$? + assertEquals 1 ${res} +} + +get_owlbot_sha_valid_repo_succeeds() { + local output_folder="${script_dir}/resources" + local repository_root="test-monorepo" + local owlbot_sha=$(get_owlbot_sha "${output_folder}" "${repository_root}") + assertEquals 'fb7584f6adb3847ac480ed49a4bfe1463965026b2919a1be270e3174f3ce1191' \ + "${owlbot_sha}" +} + +get_owlbot_sha_invalid_repo_fails() { + local output_folder="${script_dir}/resources" + local repository_root="nonexistent-repo" + $(get_owlbot_sha "${output_folder}" "${repository_root}") || res=$? + assertEquals 1 ${res} +} + +copy_directory_if_exists_valid_folder_succeeds() { + local source_folder="${script_dir}/resources" + local destination="${script_dir}/test_destination_folder" + mkdir -p "${destination}" + copy_directory_if_exists "${source_folder}" "${destination}/copied-folder" + n_matching_folders=$(ls "${destination}" | grep -e 'copied-folder' | wc -l) + rm -rdf "${destination}" + assertEquals 1 ${n_matching_folders} +} + +copy_directory_if_exists_invalid_folder_does_not_copy() { + local source_folder="${script_dir}/non-existent" + local destination="${script_dir}/test_destination_folder" + mkdir -p "${destination}" + copy_directory_if_exists "${source_folder}" "${destination}/copied-folder" + n_matching_folders=$(ls "${destination}" | grep -e 'copied-folder' | wc -l) || res=$? + rm -rdf "${destination}" + assertEquals 0 ${n_matching_folders} +} + # Execute tests. # One line per test. test_list=( @@ -344,6 +394,12 @@ test_list=( get_include_samples_from_BUILD_false_test get_include_samples_from_BUILD_empty_test get_version_from_valid_WORKSPACE_test + get_repo_metadata_json_valid_repo_succeeds + get_repo_metadata_json_invalid_repo_fails + get_owlbot_sha_valid_repo_succeeds + get_owlbot_sha_invalid_repo_fails + copy_directory_if_exists_valid_folder_succeeds + copy_directory_if_exists_invalid_folder_does_not_copy ) pushd "${script_dir}" diff --git a/library_generation/test/resources/proto_path_list.txt b/library_generation/test/resources/proto_path_list.txt index 2910caa62b..8943c03716 100755 --- a/library_generation/test/resources/proto_path_list.txt +++ b/library_generation/test/resources/proto_path_list.txt @@ -1,19 +1,24 @@ # This file is used in integration test against `generate_library.sh`. # Format: -# proto_path destination_path -google/bigtable/v2 google-cloud-bigtable-v2-java -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 -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 -google/storage/v2 google-cloud-storage-v2-java +# proto_path repository_path is_handwritten +# google/bigtable/admin/v2 java-bigtable true +# google/bigtable/v2 java-bigtable true +google/cloud/apigeeconnect/v1 java-apigee-connect false +google/cloud/asset/v1p5beta1 java-asset false +google/cloud/asset/v1p2beta1 java-asset false +google/cloud/asset/v1p1beta1 java-asset false +google/cloud/asset/v1p7beta1 java-asset false +google/cloud/asset/v1 java-asset false +# google/cloud/dialogflow/v2beta1 java-dialogflow false +# google/cloud/dialogflow/v2 java-dialogflow false +google/cloud/compute/v1 java-compute false +google/cloud/kms/v1 java-kms false +google/cloud/redis/v1 java-redis false +google/cloud/redis/v1beta1 java-redis false +# google/example/library/v1 google-cloud-example-library-v1-java null false +google/devtools/containeranalysis/v1 java-containeranalysis false +google/iam/v1 java-iam false +google/iam/credentials/v1 java-iamcredentials false +google/logging/v2 java-logging true +google/pubsub/v1 java-pubsub true +google/storage/v2 java-storage true diff --git a/library_generation/test/resources/test-monorepo/.github/.OwlBot.lock.yaml b/library_generation/test/resources/test-monorepo/.github/.OwlBot.lock.yaml new file mode 100644 index 0000000000..77200af4c9 --- /dev/null +++ b/library_generation/test/resources/test-monorepo/.github/.OwlBot.lock.yaml @@ -0,0 +1,17 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +docker: + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest + digest: sha256:fb7584f6adb3847ac480ed49a4bfe1463965026b2919a1be270e3174f3ce1191 + # created: 2023-01-20T00:00:00.000000000Z diff --git a/library_generation/test/resources/test-monorepo/test-service/.repo-metadata.json b/library_generation/test/resources/test-monorepo/test-service/.repo-metadata.json new file mode 100644 index 0000000000..d5b5078213 --- /dev/null +++ b/library_generation/test/resources/test-monorepo/test-service/.repo-metadata.json @@ -0,0 +1,18 @@ +{ + "api_shortname": "cloudasset", + "name_pretty": "Cloud Asset Inventory", + "product_documentation": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", + "api_reference": "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview", + "api_description": "provides inventory services based on a time series database. This database keeps a five week history of Google Cloud asset metadata. The Cloud Asset Inventory export service allows you to export all asset metadata at a certain timestamp or export event change history during a timeframe.", + "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-asset/latest/overview", + "issue_tracker": "https://issuetracker.google.com/issues/new?component=187210&template=0", + "release_level": "stable", + "transport": "grpc", + "requires_billing": true, + "language": "java", + "repo": "googleapis/google-cloud-java", + "repo_short": "java-asset", + "distribution_name": "com.google.cloud:google-cloud-asset", + "api_id": "cloudasset.googleapis.com", + "library_type": "GAPIC_AUTO" +} diff --git a/library_generation/test/test_utilities.sh b/library_generation/test/test_utilities.sh index 578dd8c56d..3da3bd0392 100755 --- a/library_generation/test/test_utilities.sh +++ b/library_generation/test/test_utilities.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -xeo pipefail +test_utilities_script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Utility functions commonly used in test cases. @@ -296,3 +297,42 @@ sparse_clone() { git checkout popd } + +# performs a deep structural comparison between the current pom in a git +# folder and the one at HEAD. +# This function is OS-dependent, so it sources the main utilities script to +# perform detection +compare_poms() { + target_dir=$1 + source "${test_utilities_script_dir}/../utilities.sh" + os_architecture=$(detect_os_architecture) + pushd "${target_dir}" &> /dev/null + find . -name 'pom.xml' -exec cp {} {}.new \; + find . -name 'pom.xml' -exec git checkout HEAD -- {} \; + # compare_poms.py exits with non-zero if diffs are found + set -e + result=0 + if [ "${os_architecture}" == "linux-x86_64" ]; then + find . -name 'pom.xml' -print0 | xargs -i -0 python "${test_utilities_script_dir}/compare_poms.py" {} {}.new false || result=$? + else + find . -name 'pom.xml' -print0 | xargs -I{} -0 python "${test_utilities_script_dir}/compare_poms.py" {} {}.new false || result=$? + fi + popd &> /dev/null # target_dir + echo ${result} +} + +# computes the `destination_path` variable by inspecting the contents of the +# googleapis-gen at $proto_path. +compute_destination_path() { + local proto_path=$1 + local output_folder=$2 + pushd "${output_folder}" &> /dev/null + local destination_path=$(find "googleapis-gen/${proto_path}" -maxdepth 1 -name 'google-*-java' \ + | rev \ + | cut -d'/' -f1 \ + | rev + ) + popd &> /dev/null # output_folder + echo "${destination_path}" +} + diff --git a/library_generation/utilities.sh b/library_generation/utilities.sh index cd92506c6e..66e489d2bc 100755 --- a/library_generation/utilities.sh +++ b/library_generation/utilities.sh @@ -6,7 +6,7 @@ set -xeo pipefail extract_folder_name() { local destination_path=$1 local folder_name=${destination_path##*/} - echo "$folder_name" + echo "${folder_name}" } remove_empty_files() { @@ -203,9 +203,7 @@ download_fail() { exit 1 } -# gets the output folder where all sources and dependencies will be located. It -# relies on utilities_script_dir which points to the same location as -# `generate_library.sh` +# gets the output folder where all sources and dependencies will be located. get_output_folder() { echo "$(pwd)/output" } @@ -227,3 +225,51 @@ detect_os_architecture() { esac echo "${os_architecture}" } + +# returns the metadata json path if given, or defaults to the one found in +# $repository_path +# Arguments +# 1 - repository_path: path from output_folder to the location of the library +# containing .repo-metadata. It assumes the existence of google-cloud-java in +# the output folder +# 2 - output_folder: root for the generated libraries, used in conjunction with +get_repo_metadata_json() { + local repository_path=$1 + local output_folder=$2 + >&2 echo 'Attempting to obtain .repo-metadata.json from repository_path' + local default_metadata_json_path="${output_folder}/${repository_path}/.repo-metadata.json" + if [ -f "${default_metadata_json_path}" ]; then + echo "${default_metadata_json_path}" + else + >&2 echo 'failed to obtain json from repository_path' + exit 1 + fi +} + +# returns the owlbot image sha contained in google-cloud-java. This is default +# behavior that may be overriden by a custom value in the future. +# Arguments +# 1 - output_folder: root for the generated libraries, used in conjunction with +# 2 - repository_root: usually "google-cloud-java". The .OwlBot.yaml +# file is looked into its .github folder +get_owlbot_sha() { + local output_folder=$1 + local repository_root=$2 + if [ ! -d "${output_folder}/${repository_root}" ]; + then + >&2 echo 'No repository to infer owlbot_sha was provided. This is necessary for post-processing' >&2 + exit 1 + fi + >&2 echo "Attempting to obtain owlbot_sha from monorepo folder" + owlbot_sha=$(grep 'sha256' "${output_folder}/${repository_root}/.github/.OwlBot.lock.yaml" | cut -d: -f3) + echo "${owlbot_sha}" +} + +# copies $1 as a folder as $2 only if $1 exists +copy_directory_if_exists() { + local source_folder=$1 + local destination_folder=$2 + if [ -d "${source_folder}" ]; then + cp -r "${source_folder}" "${destination_folder}" + fi +} diff --git a/showcase/scripts/generate_showcase.sh b/showcase/scripts/generate_showcase.sh index 69530fe354..ef9e2bf850 100755 --- a/showcase/scripts/generate_showcase.sh +++ b/showcase/scripts/generate_showcase.sh @@ -66,6 +66,7 @@ bash "${SCRIPT_DIR}/../../library_generation/generate_library.sh" \ --service_config "${service_config}" \ --service_yaml "${service_yaml}" \ --include_samples "${include_samples}" \ + --enable_postprocessing "false" \ --transport "${transport}" exit_code=$? From 70da72f472579b880be54fd5334e1f97e736df32 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 21:02:47 -0400 Subject: [PATCH 19/19] chore(main): release 2.29.0 (#2199) * chore(main): release 2.29.0 * change version in WORKSPACE --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Joe Wang --- .release-please-manifest.json | 2 +- CHANGELOG.md | 21 ++++++++++++ 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/README.md | 12 +++---- 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 +-- java-shared-dependencies/README.md | 2 +- .../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 +++++++++---------- 38 files changed, 154 insertions(+), 133 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index fa4d75253f..3a5058bfce 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.28.0" + ".": "2.29.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ee0300cf54..2d5e3b1ba2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [2.29.0](https://github.com/googleapis/sdk-platform-java/compare/v2.28.0...v2.29.0) (2023-10-31) + + +### Features + +* `generate_library.sh` with postprocessing ([#1951](https://github.com/googleapis/sdk-platform-java/issues/1951)) ([39b9f0e](https://github.com/googleapis/sdk-platform-java/commit/39b9f0e956b7967d118873ee2e365fe6a02a029b)) + + +### Dependencies + +* update dependency cryptography to v41.0.5 ([#2206](https://github.com/googleapis/sdk-platform-java/issues/2206)) ([6d1f84a](https://github.com/googleapis/sdk-platform-java/commit/6d1f84a7923573346fbfbfa3107a3da4c0a19bfe)) +* update dependency google-auth to v2.23.4 ([#2217](https://github.com/googleapis/sdk-platform-java/issues/2217)) ([f1ee04d](https://github.com/googleapis/sdk-platform-java/commit/f1ee04d902000c5f8dd6a9c51dea57c9de01a25e)) +* update dependency google-cloud-storage to v2.13.0 ([#2216](https://github.com/googleapis/sdk-platform-java/issues/2216)) ([1af12a8](https://github.com/googleapis/sdk-platform-java/commit/1af12a8881c2036d4ddb844c061b5f6b17e991d9)) +* update google api dependencies ([#2187](https://github.com/googleapis/sdk-platform-java/issues/2187)) ([448b0d1](https://github.com/googleapis/sdk-platform-java/commit/448b0d1eea5c4bd5f89176315c21cf7d49bc1af5)) +* update googleapis/java-cloud-bom digest to 41d86db ([#2205](https://github.com/googleapis/sdk-platform-java/issues/2205)) ([9152f24](https://github.com/googleapis/sdk-platform-java/commit/9152f24e7aafa165326205b12d3709c61c842a3f)) +* update googleapis/java-cloud-bom digest to b8394a1 ([#2201](https://github.com/googleapis/sdk-platform-java/issues/2201)) ([f9957df](https://github.com/googleapis/sdk-platform-java/commit/f9957df04bc00d72e1a26dfd5c4c4805172d58d7)) +* update googleapis/java-cloud-bom digest to d06156f ([#2200](https://github.com/googleapis/sdk-platform-java/issues/2200)) ([097e37e](https://github.com/googleapis/sdk-platform-java/commit/097e37e560646ed47925e3620c5a490a78889ec7)) +* update googleapis/java-cloud-bom digest to e896c4e ([#2198](https://github.com/googleapis/sdk-platform-java/issues/2198)) ([15a796f](https://github.com/googleapis/sdk-platform-java/commit/15a796f718e7e27991d27a337223314addb0375a)) +* update graal-sdk to 22.3.3 in bazel dependencies file ([#2209](https://github.com/googleapis/sdk-platform-java/issues/2209)) ([25957d3](https://github.com/googleapis/sdk-platform-java/commit/25957d3b8cc0424d5b1ac293e771a15f0fc54721)) +* update grpc dependencies to v1.59.0 ([#2211](https://github.com/googleapis/sdk-platform-java/issues/2211)) ([7dafa8d](https://github.com/googleapis/sdk-platform-java/commit/7dafa8d452615e5ac5dd5fbb95e645a1ce4a9226)) + ## [2.28.0](https://github.com/googleapis/sdk-platform-java/compare/v2.27.0...v2.28.0) (2023-10-19) diff --git a/WORKSPACE b/WORKSPACE index e9c11d10cd..a5e55ef93a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.28.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.29.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 0c842b1a17..ffd305bc4c 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.19.1-SNAPSHOT + 2.20.0 API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index cce49fcb1f..717d7ec801 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.36.1-SNAPSHOT + 2.37.0 com.google.api gax-grpc - 2.36.1-SNAPSHOT + 2.37.0 com.google.api gax-httpjson - 2.36.1-SNAPSHOT + 2.37.0 com.google.api api-common - 2.19.1-SNAPSHOT + 2.20.0 diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 72d76804b0..785b33567f 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.28.1-SNAPSHOT + 2.29.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.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent @@ -75,61 +75,61 @@ com.google.api api-common - 2.19.1-SNAPSHOT + 2.20.0 com.google.api gax-bom - 2.36.1-SNAPSHOT + 2.37.0 pom import com.google.api gapic-generator-java - 2.28.1-SNAPSHOT + 2.29.0 com.google.api.grpc grpc-google-common-protos - 2.27.1-SNAPSHOT + 2.28.0 com.google.api.grpc proto-google-common-protos - 2.27.1-SNAPSHOT + 2.28.0 com.google.api.grpc proto-google-iam-v1 - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc proto-google-iam-v2 - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc proto-google-iam-v2beta - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc grpc-google-iam-v1 - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc grpc-google-iam-v2 - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc grpc-google-iam-v2beta - 1.22.1-SNAPSHOT + 1.23.0 diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index e427e98d22..5adb01d380 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.28.1-SNAPSHOT + 2.29.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 03832612f2..5c06fe65ef 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.28.1-SNAPSHOT + 2.29.0 GAPIC Generator Java GAPIC generator Java @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.28.1-SNAPSHOT + 2.29.0 pom import diff --git a/gax-java/README.md b/gax-java/README.md index d6df5d7646..b187a6fed5 100644 --- a/gax-java/README.md +++ b/gax-java/README.md @@ -34,27 +34,27 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 2.23.0 + 2.37.0 com.google.api gax-grpc - 2.23.0 + 2.37.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:2.23.0', - 'com.google.api:gax-grpc:2.23.0' +compile 'com.google.api:gax:2.37.0', + 'com.google.api:gax-grpc:2.37.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "2.23.0" -libraryDependencies += "com.google.api" % "gax-grpc" % "2.23.0" +libraryDependencies += "com.google.api" % "gax" % "2.37.0" +libraryDependencies += "com.google.api" % "gax-grpc" % "2.37.0" ``` [//]: # ({x-version-update-end}) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 458f37228f..80f61f4190 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.36.1-SNAPSHOT +version.gax=2.37.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.36.1-SNAPSHOT +version.gax_grpc=2.37.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.36.1-SNAPSHOT +version.gax_bom=2.37.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.36.1-SNAPSHOT +version.gax_httpjson=2.37.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 c826d5622c..fd51c6c37a 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.36.1-SNAPSHOT + 2.37.0 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.36.1-SNAPSHOT + 2.37.0 com.google.api gax - 2.36.1-SNAPSHOT + 2.37.0 test-jar testlib com.google.api gax - 2.36.1-SNAPSHOT + 2.37.0 testlib com.google.api gax-grpc - 2.36.1-SNAPSHOT + 2.37.0 com.google.api gax-grpc - 2.36.1-SNAPSHOT + 2.37.0 test-jar testlib com.google.api gax-grpc - 2.36.1-SNAPSHOT + 2.37.0 testlib com.google.api gax-httpjson - 2.36.1-SNAPSHOT + 2.37.0 com.google.api gax-httpjson - 2.36.1-SNAPSHOT + 2.37.0 test-jar testlib com.google.api gax-httpjson - 2.36.1-SNAPSHOT + 2.37.0 testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index b20cb88a9a..248a8bfb1f 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.36.1-SNAPSHOT + 2.37.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.36.1-SNAPSHOT + 2.37.0 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 67fc081543..f530f0377a 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.36.1-SNAPSHOT + 2.37.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.36.1-SNAPSHOT + 2.37.0 diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 2b479dc077..cf719ac4bc 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.36.1-SNAPSHOT + 2.37.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.36.1-SNAPSHOT + 2.37.0 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 7b274dc1b3..a8c44dd0fd 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.36.1-SNAPSHOT + 2.37.0 GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.19.1-SNAPSHOT + 2.20.0 com.google.auth @@ -108,24 +108,24 @@ com.google.api gax - 2.36.1-SNAPSHOT + 2.37.0 com.google.api gax - 2.36.1-SNAPSHOT + 2.37.0 test-jar testlib com.google.api.grpc proto-google-common-protos - 2.27.1-SNAPSHOT + 2.28.0 com.google.api.grpc grpc-google-common-protos - 2.27.1-SNAPSHOT + 2.28.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 ca9ca46ada..305718b6b2 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.27.1-SNAPSHOT + 2.28.0 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.27.1-SNAPSHOT + 2.28.0 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 9d74588a7a..ef34e990ec 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.27.1-SNAPSHOT + 2.28.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.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent @@ -68,7 +68,7 @@ com.google.api.grpc grpc-google-common-protos - 2.27.1-SNAPSHOT + 2.28.0 io.grpc @@ -80,7 +80,7 @@ com.google.api.grpc proto-google-common-protos - 2.27.1-SNAPSHOT + 2.28.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 5fc6a9d26a..f5c572fb72 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.27.1-SNAPSHOT + 2.28.0 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.27.1-SNAPSHOT + 2.28.0 diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index 969e902057..214db5b34f 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.26.1-SNAPSHOT + 2.27.0 pom com.google.api gapic-generator-java-pom-parent - 2.28.1-SNAPSHOT + 2.29.0 ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.26.1-SNAPSHOT + 2.27.0 com.google.cloud google-cloud-core-grpc - 2.26.1-SNAPSHOT + 2.27.0 com.google.cloud google-cloud-core-http - 2.26.1-SNAPSHOT + 2.27.0 diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index 9f96a847d0..a55e754310 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.26.1-SNAPSHOT + 2.27.0 jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.26.1-SNAPSHOT + 2.27.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 495edefa41..34503eb9c9 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.26.1-SNAPSHOT + 2.27.0 jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.26.1-SNAPSHOT + 2.27.0 google-cloud-core-http diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index e5eafac9c5..d6047fcaff 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.26.1-SNAPSHOT + 2.27.0 jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.26.1-SNAPSHOT + 2.27.0 google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index c3596eac49..9175b2a272 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.26.1-SNAPSHOT + 2.27.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.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.18.1-SNAPSHOT + 3.19.0 pom import diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index a5bbf84ab2..22d2dbb298 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.22.1-SNAPSHOT + 1.23.0 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.22.1-SNAPSHOT + 1.23.0 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index 20d6adb757..ff9b4fea13 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.22.1-SNAPSHOT + 1.23.0 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.22.1-SNAPSHOT + 1.23.0 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 9ab9b3713a..ec44ea9f77 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.22.1-SNAPSHOT + 1.23.0 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.1-SNAPSHOT + 1.23.0 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 57fcac9a8d..080e5d2e89 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.22.1-SNAPSHOT + 1.23.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.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent @@ -81,44 +81,44 @@ com.google.api gax-bom - 2.36.1-SNAPSHOT + 2.37.0 pom import com.google.api.grpc proto-google-iam-v2 - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc grpc-google-iam-v2 - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc proto-google-common-protos - 2.27.1-SNAPSHOT + 2.28.0 com.google.api.grpc proto-google-iam-v2beta - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc grpc-google-iam-v1 - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc grpc-google-iam-v2beta - 1.22.1-SNAPSHOT + 1.23.0 com.google.api.grpc proto-google-iam-v1 - 1.22.1-SNAPSHOT + 1.23.0 javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index 93e0faf68b..c0c2e67b8f 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.22.1-SNAPSHOT + 1.23.0 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.1-SNAPSHOT + 1.23.0 diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index b7c864d3da..0250b41299 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.22.1-SNAPSHOT + 1.23.0 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.1-SNAPSHOT + 1.23.0 diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index c46948ac11..6fd7be4075 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.22.1-SNAPSHOT + 1.23.0 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.22.1-SNAPSHOT + 1.23.0 diff --git a/java-shared-dependencies/README.md b/java-shared-dependencies/README.md index ce63610d11..a1e698a15b 100644 --- a/java-shared-dependencies/README.md +++ b/java-shared-dependencies/README.md @@ -14,7 +14,7 @@ If you are using Maven, add this to the `dependencyManagement` section. com.google.cloud google-cloud-shared-dependencies - 3.5.0 + 3.19.0 pom import diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index c7ecf9bed2..f5e4a85698 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.18.1-SNAPSHOT + 3.19.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 0a03f7c3cb..2ec12020e3 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.18.1-SNAPSHOT + 3.19.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.28.1-SNAPSHOT + 2.29.0 pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.26.1-SNAPSHOT + 2.27.0 pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.26.1-SNAPSHOT + 2.27.0 test-jar com.google.cloud google-cloud-core - 2.26.1-SNAPSHOT + 2.27.0 tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index 3a5edbffc3..e193abe7b8 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.18.1-SNAPSHOT + 3.19.0 first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.28.1-SNAPSHOT + 2.29.0 ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.18.1-SNAPSHOT + 3.19.0 pom import com.google.cloud third-party-dependencies - 3.18.1-SNAPSHOT + 3.19.0 pom import diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 737f0e2408..06d9d299c6 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.18.1-SNAPSHOT + 3.19.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 644982a1af..3706d25ef1 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.18.1-SNAPSHOT + 3.19.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.18.1-SNAPSHOT + 3.19.0 pom import diff --git a/showcase/pom.xml b/showcase/pom.xml index b331e9ac02..348bd34e95 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -34,7 +34,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.18.1-SNAPSHOT + 3.19.0 pom import diff --git a/versions.txt b/versions.txt index cf8f9033fd..38793e05ef 100644 --- a/versions.txt +++ b/versions.txt @@ -1,19 +1,19 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.28.0:2.28.1-SNAPSHOT -api-common:2.19.0:2.19.1-SNAPSHOT -gax:2.36.0:2.36.1-SNAPSHOT -gax-grpc:2.36.0:2.36.1-SNAPSHOT -gax-httpjson:0.121.0:0.121.1-SNAPSHOT -proto-google-common-protos:2.27.0:2.27.1-SNAPSHOT -grpc-google-common-protos:2.27.0:2.27.1-SNAPSHOT -proto-google-iam-v1:1.22.0:1.22.1-SNAPSHOT -grpc-google-iam-v1:1.22.0:1.22.1-SNAPSHOT -proto-google-iam-v2beta:1.22.0:1.22.1-SNAPSHOT -grpc-google-iam-v2beta:1.22.0:1.22.1-SNAPSHOT -google-iam-policy:1.22.0:1.22.1-SNAPSHOT -proto-google-iam-v2:1.22.0:1.22.1-SNAPSHOT -grpc-google-iam-v2:1.22.0:1.22.1-SNAPSHOT -google-cloud-core:2.26.0:2.26.1-SNAPSHOT -google-cloud-shared-dependencies:3.18.0:3.18.1-SNAPSHOT +gapic-generator-java:2.29.0:2.29.0 +api-common:2.20.0:2.20.0 +gax:2.37.0:2.37.0 +gax-grpc:2.37.0:2.37.0 +gax-httpjson:0.122.0:0.122.0 +proto-google-common-protos:2.28.0:2.28.0 +grpc-google-common-protos:2.28.0:2.28.0 +proto-google-iam-v1:1.23.0:1.23.0 +grpc-google-iam-v1:1.23.0:1.23.0 +proto-google-iam-v2beta:1.23.0:1.23.0 +grpc-google-iam-v2beta:1.23.0:1.23.0 +google-iam-policy:1.23.0:1.23.0 +proto-google-iam-v2:1.23.0:1.23.0 +grpc-google-iam-v2:1.23.0:1.23.0 +google-cloud-core:2.27.0:2.27.0 +google-cloud-shared-dependencies:3.19.0:3.19.0