diff --git a/CHANGELOG.md b/CHANGELOG.md index d9e69fa94d..d1c6fdb89c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +## [2.15.3](https://github.com/googleapis/gapic-generator-java/compare/v2.15.2...v2.15.3) (2023-03-13) + + +### Bug Fixes + +* Allow custom HttpRules for REST LROs ([#1288](https://github.com/googleapis/gapic-generator-java/issues/1288)) ([f8ccd2a](https://github.com/googleapis/gapic-generator-java/commit/f8ccd2a1428f96f0ff3231247964c272144b8dc9)) + + +### Dependencies + +* Update actions/checkout action to v3 ([#1365](https://github.com/googleapis/gapic-generator-java/issues/1365)) ([84036c7](https://github.com/googleapis/gapic-generator-java/commit/84036c706620a6c7aef05aeaa5969e7dd0b4674b)) +* Update dependency com.google.api.grpc:grpc-google-common-protos to v2.14.2 ([#1451](https://github.com/googleapis/gapic-generator-java/issues/1451)) ([9566040](https://github.com/googleapis/gapic-generator-java/commit/95660400209c114a460a7d4170da4f093e6e3526)) +* Update dependency com.google.api.grpc:grpc-google-iam-v1 to v1.9.2 ([#1452](https://github.com/googleapis/gapic-generator-java/issues/1452)) ([b30359b](https://github.com/googleapis/gapic-generator-java/commit/b30359bd2a35c3f267b58748012d080bf3f1edf8)) +* Update dependency com.google.code.gson:gson to v2.10.1 ([#1443](https://github.com/googleapis/gapic-generator-java/issues/1443)) ([0ccf457](https://github.com/googleapis/gapic-generator-java/commit/0ccf457a774bd3dbe3b101d82222bdc39f6e5b0e)) +* Update dependency com.google.errorprone:error_prone_annotations to v2.18.0 ([#1459](https://github.com/googleapis/gapic-generator-java/issues/1459)) ([2671dcf](https://github.com/googleapis/gapic-generator-java/commit/2671dcf9131591acaa96d474412ce414fef54a6f)) +* Update dependency io.grpc:grpc-core to v1.53.0 ([#1463](https://github.com/googleapis/gapic-generator-java/issues/1463)) ([6762df6](https://github.com/googleapis/gapic-generator-java/commit/6762df6e121382545cc6da1375553f3de79acb2d)) +* Update dependency io.perfmark:perfmark-api to v0.26.0 ([#1465](https://github.com/googleapis/gapic-generator-java/issues/1465)) ([174f3d8](https://github.com/googleapis/gapic-generator-java/commit/174f3d82408e569028ba5c025b1bc9823e8cdb93)) +* Update dependency net.bytebuddy:byte-buddy to v1.14.1 ([#1467](https://github.com/googleapis/gapic-generator-java/issues/1467)) ([c0d851a](https://github.com/googleapis/gapic-generator-java/commit/c0d851a2afde63b07a620771177c6eb2cf29dc25)) +* Update dependency net.bytebuddy:byte-buddy to v1.14.2 ([#1481](https://github.com/googleapis/gapic-generator-java/issues/1481)) ([cbceed2](https://github.com/googleapis/gapic-generator-java/commit/cbceed21237a5dba62cc318ad0c1903a8d7768f3)) +* Update dependency org.apache.commons:commons-lang3 to v3.12.0 ([#1468](https://github.com/googleapis/gapic-generator-java/issues/1468)) ([2506b91](https://github.com/googleapis/gapic-generator-java/commit/2506b91196f8cbf7f7297af15e01529e7ee51270)) +* Update dependency org.graalvm.sdk:graal-sdk to v22.3.1 ([#1444](https://github.com/googleapis/gapic-generator-java/issues/1444)) ([edb5d12](https://github.com/googleapis/gapic-generator-java/commit/edb5d12689400d0a127b240fc68f12c00e7db0a8)) +* Update dependency org.threeten:threetenbp to v1.6.5 ([#1446](https://github.com/googleapis/gapic-generator-java/issues/1446)) ([842b9e3](https://github.com/googleapis/gapic-generator-java/commit/842b9e398caa6ea273d790c0bc577e7ec22cad39)) +* Update google api dependencies ([#1470](https://github.com/googleapis/gapic-generator-java/issues/1470)) ([e1667f1](https://github.com/googleapis/gapic-generator-java/commit/e1667f1a0eee9a3b9977eae6ee2ae27e06185ad9)) +* Update google auth library dependencies to v1.16.0 ([#1471](https://github.com/googleapis/gapic-generator-java/issues/1471)) ([de67f4e](https://github.com/googleapis/gapic-generator-java/commit/de67f4e2c772ecb1b4a8f7a3d58c5bce564cf788)) +* Update google http client dependencies to v1.43.0 ([#1472](https://github.com/googleapis/gapic-generator-java/issues/1472)) ([524eddb](https://github.com/googleapis/gapic-generator-java/commit/524eddb17488701d0217ee270cdba804b2f8d09b)) +* Update netty dependencies ([#1448](https://github.com/googleapis/gapic-generator-java/issues/1448)) ([97079ef](https://github.com/googleapis/gapic-generator-java/commit/97079ef6b0115d7ed14ffd6060d63b03c0cbd4fd)) + ## [2.15.2](https://github.com/googleapis/gapic-generator-java/compare/v2.15.1...v2.15.2) (2023-02-28) diff --git a/WORKSPACE b/WORKSPACE index 4f1952231f..38a762520f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.15.3-SNAPSHOT" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.15.3" # {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 832158af7a..11465d1b50 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.6.3-SNAPSHOT + 2.6.3 API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.15.3-SNAPSHOT + 2.15.3 ../gapic-generator-java-pom-parent diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index ebbd9b21de..92143fbac6 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.15.3-SNAPSHOT + 2.15.3 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.15.3-SNAPSHOT + 2.15.3 ../gapic-generator-java-pom-parent @@ -60,56 +60,56 @@ com.google.api api-common - 2.6.3-SNAPSHOT + 2.6.3 com.google.api gax-bom - 2.23.3-SNAPSHOT + 2.23.3 pom import com.google.api.grpc grpc-google-common-protos - 2.14.3-SNAPSHOT + 2.14.3 com.google.api.grpc proto-google-common-protos - 2.14.3-SNAPSHOT + 2.14.3 com.google.api.grpc proto-google-iam-v1 - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc proto-google-iam-v2 - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc proto-google-iam-v2beta - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc grpc-google-iam-v1 - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc grpc-google-iam-v2 - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc grpc-google-iam-v2beta - 1.9.3-SNAPSHOT + 1.9.3 diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 5383b59278..6ca5cea869 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.15.3-SNAPSHOT + 2.15.3 pom GAPIC Generator Java POM Parent https://github.com/googleapis/gapic-generator-java diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index ba1e12c3e3..ce0c5ae9e1 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.15.3-SNAPSHOT + 2.15.3 GAPIC Generator Java GAPIC generator Java @@ -23,7 +23,7 @@ com.google.api gapic-generator-java-pom-parent - 2.15.3-SNAPSHOT + 2.15.3 ../gapic-generator-java-pom-parent @@ -32,7 +32,7 @@ com.google.api gapic-generator-java-bom - 2.15.3-SNAPSHOT + 2.15.3 pom import diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 7c6d3ddcf1..e4c0ced3f9 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.23.3-SNAPSHOT +version.gax=2.23.3 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.23.3-SNAPSHOT +version.gax_grpc=2.23.3 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.23.3-SNAPSHOT +version.gax_bom=2.23.3 # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.108.3-SNAPSHOT +version.gax_httpjson=0.108.3 # {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 db1ad1c8ad..9ec28467ac 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.23.3-SNAPSHOT + 2.23.3 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.23.3-SNAPSHOT + 2.23.3 com.google.api gax - 2.23.3-SNAPSHOT + 2.23.3 test-jar testlib com.google.api gax - 2.23.3-SNAPSHOT + 2.23.3 testlib com.google.api gax-grpc - 2.23.3-SNAPSHOT + 2.23.3 com.google.api gax-grpc - 2.23.3-SNAPSHOT + 2.23.3 test-jar testlib com.google.api gax-grpc - 2.23.3-SNAPSHOT + 2.23.3 testlib com.google.api gax-httpjson - 0.108.3-SNAPSHOT + 0.108.3 com.google.api gax-httpjson - 0.108.3-SNAPSHOT + 0.108.3 test-jar testlib com.google.api gax-httpjson - 0.108.3-SNAPSHOT + 0.108.3 testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index e2322000ff..241b9e451d 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.23.3-SNAPSHOT + 2.23.3 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.23.3-SNAPSHOT + 2.23.3 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 59c4219eed..91523f6c95 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 0.108.3-SNAPSHOT + 0.108.3 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.23.3-SNAPSHOT + 2.23.3 diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index e67c2cbf3c..9ba39f1576 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.23.3-SNAPSHOT + 2.23.3 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.23.3-SNAPSHOT + 2.23.3 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index ff62aec5fa..004a2d64e8 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.23.3-SNAPSHOT + 2.23.3 GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.15.3-SNAPSHOT + 2.15.3 ../gapic-generator-java-pom-parent @@ -51,7 +51,7 @@ com.google.api api-common - 2.6.3-SNAPSHOT + 2.6.3 com.google.auth @@ -109,24 +109,24 @@ com.google.api gax - 2.23.3-SNAPSHOT + 2.23.3 com.google.api gax - 2.23.3-SNAPSHOT + 2.23.3 test-jar testlib com.google.api.grpc proto-google-common-protos - 2.14.3-SNAPSHOT + 2.14.3 com.google.api.grpc grpc-google-common-protos - 2.14.3-SNAPSHOT + 2.14.3 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 a28f1c6814..743abe3a14 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.14.3-SNAPSHOT + 2.14.3 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.14.3-SNAPSHOT + 2.14.3 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index d89f017f01..de35e68794 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.14.3-SNAPSHOT + 2.14.3 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.15.3-SNAPSHOT + 2.15.3 ../gapic-generator-java-pom-parent @@ -69,7 +69,7 @@ com.google.api.grpc grpc-google-common-protos - 2.14.3-SNAPSHOT + 2.14.3 io.grpc @@ -81,7 +81,7 @@ com.google.api.grpc proto-google-common-protos - 2.14.3-SNAPSHOT + 2.14.3 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 c41c304a46..bf09b12d27 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.14.3-SNAPSHOT + 2.14.3 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.14.3-SNAPSHOT + 2.14.3 diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index 4e26725e1a..42b4c6d227 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.9.3-SNAPSHOT + 1.9.3 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.9.3-SNAPSHOT + 1.9.3 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index 63f1646efb..088b184aa4 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.9.3-SNAPSHOT + 1.9.3 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.9.3-SNAPSHOT + 1.9.3 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 161de6537c..b0d9d8dec0 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.9.3-SNAPSHOT + 1.9.3 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.3-SNAPSHOT + 1.9.3 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index b37c163b93..57a147d7eb 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.9.3-SNAPSHOT + 1.9.3 Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.15.3-SNAPSHOT + 2.15.3 ../gapic-generator-java-pom-parent @@ -81,49 +81,49 @@ com.google.api gax-bom - 2.23.3-SNAPSHOT + 2.23.3 pom import com.google.api.grpc proto-google-iam-v2 - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc grpc-google-iam-v2 - 1.9.3-SNAPSHOT + 1.9.3 com.google.cloud google-iam-policy - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc proto-google-common-protos - 2.14.3-SNAPSHOT + 2.14.3 com.google.api.grpc proto-google-iam-v2beta - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc grpc-google-iam-v1 - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc grpc-google-iam-v2beta - 1.9.3-SNAPSHOT + 1.9.3 com.google.api.grpc proto-google-iam-v1 - 1.9.3-SNAPSHOT + 1.9.3 javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index 468ea7228e..f6d3bcef5c 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.9.3-SNAPSHOT + 1.9.3 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.3-SNAPSHOT + 1.9.3 diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 2f1c64e973..5641d2d917 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.9.3-SNAPSHOT + 1.9.3 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.3-SNAPSHOT + 1.9.3 diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index dbd6a410a6..254143173c 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.9.3-SNAPSHOT + 1.9.3 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.3-SNAPSHOT + 1.9.3 diff --git a/showcase/pom.xml b/showcase/pom.xml index c8899d01c7..9a4c96de7e 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-bom - 2.15.3-SNAPSHOT + 2.15.3 ../gapic-generator-java-bom diff --git a/versions.txt b/versions.txt index 4f664d8247..86d3f9455e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.15.2:2.15.3-SNAPSHOT -api-common:2.6.2:2.6.3-SNAPSHOT -gax:2.23.2:2.23.3-SNAPSHOT -gax-grpc:2.23.2:2.23.3-SNAPSHOT -gax-httpjson:0.108.2:0.108.3-SNAPSHOT -proto-google-common-protos:2.14.2:2.14.3-SNAPSHOT -grpc-google-common-protos:2.14.2:2.14.3-SNAPSHOT -proto-google-iam-v1:1.9.2:1.9.3-SNAPSHOT -grpc-google-iam-v1:1.9.2:1.9.3-SNAPSHOT -proto-google-iam-v2beta:1.9.2:1.9.3-SNAPSHOT -grpc-google-iam-v2beta:1.9.2:1.9.3-SNAPSHOT -google-iam-policy:1.9.2:1.9.3-SNAPSHOT -proto-google-iam-v2:1.9.2:1.9.3-SNAPSHOT -grpc-google-iam-v2:1.9.2:1.9.3-SNAPSHOT +gapic-generator-java:2.15.3:2.15.3 +api-common:2.6.3:2.6.3 +gax:2.23.3:2.23.3 +gax-grpc:2.23.3:2.23.3 +gax-httpjson:0.108.3:0.108.3 +proto-google-common-protos:2.14.3:2.14.3 +grpc-google-common-protos:2.14.3:2.14.3 +proto-google-iam-v1:1.9.3:1.9.3 +grpc-google-iam-v1:1.9.3:1.9.3 +proto-google-iam-v2beta:1.9.3:1.9.3 +grpc-google-iam-v2beta:1.9.3:1.9.3 +google-iam-policy:1.9.3:1.9.3 +proto-google-iam-v2:1.9.3:1.9.3 +grpc-google-iam-v2:1.9.3:1.9.3