From 8163f8aa822881d8cd6f1f72aca66b50fbd2e66a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 26 Jul 2022 21:24:39 +0200 Subject: [PATCH 01/10] fix(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.5.2 (#1746) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.5.1` -> `1.5.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.2/compatibility-slim/1.5.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.2/confidence-slim/1.5.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.5.2`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​152-httpsgithubcomgoogleapisjava-shared-configcomparev151v152-2022-07-25) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.5.1...v1.5.2) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v10 ([#​435](https://togithub.com/googleapis/java-shared-config/issues/435)) ([bfc8ce1](https://togithub.com/googleapis/java-shared-config/commit/bfc8ce1deca6292147d002d3afe22a09840aa5d6)) - update dependency org.graalvm.buildtools:junit-platform-native to v0.9.13 ([#​488](https://togithub.com/googleapis/java-shared-config/issues/488)) ([39b91ee](https://togithub.com/googleapis/java-shared-config/commit/39b91ee1283f0a5fbbe63e8bfd1ec97ab4ab377e)) - update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.13 ([#​489](https://togithub.com/googleapis/java-shared-config/issues/489)) ([cc3bcfa](https://togithub.com/googleapis/java-shared-config/commit/cc3bcfa2d6717441a8d5b5048fa78c2cf7aabf2b))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gax-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29c5903f2..a52b09290 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-shared-config - 1.5.1 + 1.5.2 From 0b2b1efcf38ff9f253e426af8c21722d646c8627 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 27 Jul 2022 20:56:13 +0200 Subject: [PATCH 02/10] fix(deps): update dependency com.google.protobuf:protobuf-bom to v3.21.4 (#1747) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.protobuf:protobuf-bom](https://developers.google.com/protocol-buffers/) ([source](https://togithub.com/protocolbuffers/protobuf)) | `3.21.3` -> `3.21.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.protobuf:protobuf-bom/3.21.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.protobuf:protobuf-bom/3.21.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.protobuf:protobuf-bom/3.21.4/compatibility-slim/3.21.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.protobuf:protobuf-bom/3.21.4/confidence-slim/3.21.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
protocolbuffers/protobuf ### [`v3.21.4`](https://togithub.com/protocolbuffers/protobuf/compare/v3.21.3...v3.21.4) [Compare Source](https://togithub.com/protocolbuffers/protobuf/compare/v3.21.3...v3.21.4)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gax-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a52b09290..9a665b17f 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ com.google.protobuf protobuf-bom - 3.21.3 + 3.21.4 pom import From f2b7cb2b6b783095547b798da054b6879d3764f1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 27 Jul 2022 21:04:19 +0200 Subject: [PATCH 03/10] fix(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.5.3 (#1748) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.5.2` -> `1.5.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.3/compatibility-slim/1.5.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.3/confidence-slim/1.5.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.5.3`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​153-httpsgithubcomgoogleapisjava-shared-configcomparev152v153-2022-07-27) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.5.2...v1.5.3) ##### Dependencies - update dependency org.junit.vintage:junit-vintage-engine to v5.9.0 ([#​497](https://togithub.com/googleapis/java-shared-config/issues/497)) ([1fc6ab4](https://togithub.com/googleapis/java-shared-config/commit/1fc6ab445624cd4f9c8b161d109f346a9e5ed09a)) - Update doclet to latest version 1.6.0 ([38fb7c3](https://togithub.com/googleapis/java-shared-config/commit/38fb7c3957fb6c9b2da10f9e463cc93a8b80a3a4))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gax-java). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a665b17f..a430d2371 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-shared-config - 1.5.2 + 1.5.3 From 7c3164f14715fdd6cb7240c20248848b7a1d1424 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 29 Jul 2022 08:26:51 -0400 Subject: [PATCH 04/10] chore: configure Renovate Bot for dependencies.properties (#1749) --- renovate.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/renovate.json b/renovate.json index f45d8f110..9591c029d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,30 @@ { "extends": [ "config:base" + ], + "regexManagers": [ + { + "fileMatch": ["^dependencies\\.properties$"], + "matchStrings": ["=(?.*?):(?.*?)\\n"], + "datasourceTemplate": "maven" + }, + { + "fileMatch": ["^dependencies\\.properties$"], + "matchStrings": ["version\\.com_google_protobuf=(?.*?)\\n"], + "depNameTemplate": "com.google.protobuf:protobuf-java", + "datasourceTemplate": "maven" + }, + { + "fileMatch": ["^dependencies\\.properties$"], + "matchStrings": ["version\\.google_java_format=(?.*?)\\n"], + "depNameTemplate": "com.google.googlejavaformat:google-java-format", + "datasourceTemplate": "maven" + }, + { + "fileMatch": ["^dependencies\\.properties$"], + "matchStrings": ["version\\.io_grpc=(?.*?)\\n"], + "depNameTemplate": "io.grpc:grpc-core", + "datasourceTemplate": "maven" + } ] } From 98db208884627ee52a0497077bab5f408ee4db4e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 29 Jul 2022 18:17:55 +0200 Subject: [PATCH 05/10] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.21.4 (#1751) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index b5699ec14..7f795eeeb 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,7 +23,7 @@ version.gax_httpjson=0.103.5 # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.21.1 +version.com_google_protobuf=3.21.4 version.google_java_format=1.1 version.io_grpc=1.47.0 From b6c59f2ef3e62a03ebe77e6a718ea613088b0472 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 29 Jul 2022 18:21:28 +0200 Subject: [PATCH 06/10] chore(deps): update dependency io.grpc:grpc-core to v1.48.0 (#1753) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 7f795eeeb..d0c889193 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -25,7 +25,7 @@ version.gax_httpjson=0.103.5 # with the sources. version.com_google_protobuf=3.21.4 version.google_java_format=1.1 -version.io_grpc=1.47.0 +version.io_grpc=1.48.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From 37aeab7d82bf778ffb20d42216055c1f0084a695 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 12:22:42 -0400 Subject: [PATCH 07/10] chore(main): release 2.18.6-SNAPSHOT (#1745) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- build.gradle | 2 +- dependencies.properties | 8 ++++---- gax-bom/build.gradle | 2 +- gax-bom/pom.xml | 14 +++++++------- gax-grpc/build.gradle | 2 +- gax-grpc/pom.xml | 4 ++-- gax-httpjson/build.gradle | 2 +- gax-httpjson/pom.xml | 4 ++-- gax/build.gradle | 2 +- gax/pom.xml | 4 ++-- pom.xml | 6 +++--- versions.txt | 8 ++++---- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index f964e98ea..e2ba22469 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { } // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.18.5" // {x-version-update:gax:current} +project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax:current} allprojects { group = 'com.google.api' diff --git a/dependencies.properties b/dependencies.properties index d0c889193..3ea015d1d 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.18.5 +version.gax=2.18.6-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.18.5 +version.gax_grpc=2.18.6-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.18.5 +version.gax_bom=2.18.6-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.103.5 +version.gax_httpjson=0.103.6-SNAPSHOT # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-bom/build.gradle b/gax-bom/build.gradle index 41c573c7e..e3f58a59e 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -5,7 +5,7 @@ plugins { archivesBaseName = 'gax-bom' -project.version = "2.18.5" // {x-version-update:gax-bom:current} +project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax-bom:current} def mavenJavaDir = "$buildDir/publications/mavenJava" def mavenJavaBomOutputFile = file(mavenJavaDir + '/pom-default.xml') diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index 3f1287b6a..a2d5cb264 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.18.5 + 2.18.6-SNAPSHOT pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -33,34 +33,34 @@ com.google.api gax - 2.18.5 + 2.18.6-SNAPSHOT com.google.api gax - 2.18.5 + 2.18.6-SNAPSHOT testlib com.google.api gax-grpc - 2.18.5 + 2.18.6-SNAPSHOT com.google.api gax-grpc - 2.18.5 + 2.18.6-SNAPSHOT testlib com.google.api gax-httpjson - 0.103.5 + 0.103.6-SNAPSHOT com.google.api gax-httpjson - 0.103.5 + 0.103.6-SNAPSHOT testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index a4c2ce7b1..5a8e9133b 100644 --- a/gax-grpc/build.gradle +++ b/gax-grpc/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-grpc' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.18.5" // {x-version-update:gax-grpc:current} +project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax-grpc:current} dependencies { api(project(':gax'), diff --git a/gax-grpc/pom.xml b/gax-grpc/pom.xml index 45004b783..5b7b538b7 100644 --- a/gax-grpc/pom.xml +++ b/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.18.5 + 2.18.6-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.18.5 + 2.18.6-SNAPSHOT diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index b827b3c75..77aa225e9 100644 --- a/gax-httpjson/build.gradle +++ b/gax-httpjson/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-httpjson' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "0.103.5" // {x-version-update:gax-httpjson:current} +project.version = "0.103.6-SNAPSHOT" // {x-version-update:gax-httpjson:current} dependencies { api(project(':gax'), diff --git a/gax-httpjson/pom.xml b/gax-httpjson/pom.xml index 3f7b1ee51..dc8cb6f95 100644 --- a/gax-httpjson/pom.xml +++ b/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 0.103.5 + 0.103.6-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.18.5 + 2.18.6-SNAPSHOT diff --git a/gax/build.gradle b/gax/build.gradle index 24800a59a..790d0ffd6 100644 --- a/gax/build.gradle +++ b/gax/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "gax" // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.18.5" // {x-version-update:gax:current} +project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax:current} dependencies { api(libraries['maven.com_google_api_api_common'], diff --git a/gax/pom.xml b/gax/pom.xml index b32dc63b1..c7605ac70 100644 --- a/gax/pom.xml +++ b/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.18.5 + 2.18.6-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.18.5 + 2.18.6-SNAPSHOT diff --git a/pom.xml b/pom.xml index a430d2371..1932d0b67 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.api gax-parent pom - 2.18.5 + 2.18.6-SNAPSHOT GAX (Google Api eXtensions) for Java (Parent) https://github.com/googleapis/gax-java Google Api eXtensions for Java (Parent) @@ -111,12 +111,12 @@ com.google.api gax - 2.18.5 + 2.18.6-SNAPSHOT com.google.api gax - 2.18.5 + 2.18.6-SNAPSHOT test-jar diff --git a/versions.txt b/versions.txt index b86f45107..632a21985 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -gax:2.18.5:2.18.5 -gax-bom:2.18.5:2.18.5 -gax-grpc:2.18.5:2.18.5 -gax-httpjson:0.103.5:0.103.5 +gax:2.18.5:2.18.6-SNAPSHOT +gax-bom:2.18.5:2.18.6-SNAPSHOT +gax-grpc:2.18.5:2.18.6-SNAPSHOT +gax-httpjson:0.103.5:0.103.6-SNAPSHOT From e1c91a40bcf413af5210da1d43e409d44dcf13bd Mon Sep 17 00:00:00 2001 From: Blake Li Date: Fri, 29 Jul 2022 16:23:17 +0000 Subject: [PATCH 08/10] fix: Exclude error_prone_annotations from guava. (#1750) --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 1932d0b67..5e5593920 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,12 @@ com.google.guava guava 31.1-jre + + + com.google.errorprone + error_prone_annotations + + io.opencensus From 424d212af9a551656a4e1a9e93f17970285f7d60 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 29 Jul 2022 18:58:33 +0200 Subject: [PATCH 09/10] chore(deps): update dependency com.google.googlejavaformat:google-java-format to v1.15.0 (#1752) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 3ea015d1d..6cb0a1bc8 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -24,7 +24,7 @@ version.gax_httpjson=0.103.6-SNAPSHOT # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. version.com_google_protobuf=3.21.4 -version.google_java_format=1.1 +version.google_java_format=1.15.0 version.io_grpc=1.48.0 # Maven artifacts. From b11901fc7fff6c1802ff6c219e173bbb73dc7354 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 13:02:54 -0400 Subject: [PATCH 10/10] chore(main): release 2.18.6 (#1754) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 10 ++++++++++ build.gradle | 2 +- dependencies.properties | 8 ++++---- gax-bom/build.gradle | 2 +- gax-bom/pom.xml | 14 +++++++------- gax-grpc/build.gradle | 2 +- gax-grpc/pom.xml | 4 ++-- gax-httpjson/build.gradle | 2 +- gax-httpjson/pom.xml | 4 ++-- gax/build.gradle | 2 +- gax/pom.xml | 4 ++-- pom.xml | 6 +++--- versions.txt | 8 ++++---- 13 files changed, 39 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73406f7a4..47a38c3e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [2.18.6](https://github.com/googleapis/gax-java/compare/v2.18.5...v2.18.6) (2022-07-29) + + +### Bug Fixes + +* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.2 ([#1746](https://github.com/googleapis/gax-java/issues/1746)) ([8163f8a](https://github.com/googleapis/gax-java/commit/8163f8aa822881d8cd6f1f72aca66b50fbd2e66a)) +* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.3 ([#1748](https://github.com/googleapis/gax-java/issues/1748)) ([f2b7cb2](https://github.com/googleapis/gax-java/commit/f2b7cb2b6b783095547b798da054b6879d3764f1)) +* **deps:** update dependency com.google.protobuf:protobuf-bom to v3.21.4 ([#1747](https://github.com/googleapis/gax-java/issues/1747)) ([0b2b1ef](https://github.com/googleapis/gax-java/commit/0b2b1efcf38ff9f253e426af8c21722d646c8627)) +* Exclude error_prone_annotations from guava. ([#1750](https://github.com/googleapis/gax-java/issues/1750)) ([e1c91a4](https://github.com/googleapis/gax-java/commit/e1c91a40bcf413af5210da1d43e409d44dcf13bd)) + ## [2.18.5](https://github.com/googleapis/gax-java/compare/v2.18.4...v2.18.5) (2022-07-25) diff --git a/build.gradle b/build.gradle index e2ba22469..8f435be2d 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { } // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax:current} +project.version = "2.18.6" // {x-version-update:gax:current} allprojects { group = 'com.google.api' diff --git a/dependencies.properties b/dependencies.properties index 6cb0a1bc8..dae839c69 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.18.6-SNAPSHOT +version.gax=2.18.6 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.18.6-SNAPSHOT +version.gax_grpc=2.18.6 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.18.6-SNAPSHOT +version.gax_bom=2.18.6 # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.103.6-SNAPSHOT +version.gax_httpjson=0.103.6 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-bom/build.gradle b/gax-bom/build.gradle index e3f58a59e..59541c154 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -5,7 +5,7 @@ plugins { archivesBaseName = 'gax-bom' -project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax-bom:current} +project.version = "2.18.6" // {x-version-update:gax-bom:current} def mavenJavaDir = "$buildDir/publications/mavenJava" def mavenJavaBomOutputFile = file(mavenJavaDir + '/pom-default.xml') diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index a2d5cb264..e5343e957 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.18.6-SNAPSHOT + 2.18.6 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -33,34 +33,34 @@ com.google.api gax - 2.18.6-SNAPSHOT + 2.18.6 com.google.api gax - 2.18.6-SNAPSHOT + 2.18.6 testlib com.google.api gax-grpc - 2.18.6-SNAPSHOT + 2.18.6 com.google.api gax-grpc - 2.18.6-SNAPSHOT + 2.18.6 testlib com.google.api gax-httpjson - 0.103.6-SNAPSHOT + 0.103.6 com.google.api gax-httpjson - 0.103.6-SNAPSHOT + 0.103.6 testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index 5a8e9133b..09081468e 100644 --- a/gax-grpc/build.gradle +++ b/gax-grpc/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-grpc' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax-grpc:current} +project.version = "2.18.6" // {x-version-update:gax-grpc:current} dependencies { api(project(':gax'), diff --git a/gax-grpc/pom.xml b/gax-grpc/pom.xml index 5b7b538b7..50ced70a9 100644 --- a/gax-grpc/pom.xml +++ b/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.18.6-SNAPSHOT + 2.18.6 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.18.6-SNAPSHOT + 2.18.6 diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index 77aa225e9..2e18d983d 100644 --- a/gax-httpjson/build.gradle +++ b/gax-httpjson/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-httpjson' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "0.103.6-SNAPSHOT" // {x-version-update:gax-httpjson:current} +project.version = "0.103.6" // {x-version-update:gax-httpjson:current} dependencies { api(project(':gax'), diff --git a/gax-httpjson/pom.xml b/gax-httpjson/pom.xml index dc8cb6f95..7f757ef1b 100644 --- a/gax-httpjson/pom.xml +++ b/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 0.103.6-SNAPSHOT + 0.103.6 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.18.6-SNAPSHOT + 2.18.6 diff --git a/gax/build.gradle b/gax/build.gradle index 790d0ffd6..04838ad94 100644 --- a/gax/build.gradle +++ b/gax/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "gax" // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.18.6-SNAPSHOT" // {x-version-update:gax:current} +project.version = "2.18.6" // {x-version-update:gax:current} dependencies { api(libraries['maven.com_google_api_api_common'], diff --git a/gax/pom.xml b/gax/pom.xml index c7605ac70..3fe8402b5 100644 --- a/gax/pom.xml +++ b/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.18.6-SNAPSHOT + 2.18.6 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.18.6-SNAPSHOT + 2.18.6 diff --git a/pom.xml b/pom.xml index 5e5593920..0501a5f2e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.api gax-parent pom - 2.18.6-SNAPSHOT + 2.18.6 GAX (Google Api eXtensions) for Java (Parent) https://github.com/googleapis/gax-java Google Api eXtensions for Java (Parent) @@ -117,12 +117,12 @@ com.google.api gax - 2.18.6-SNAPSHOT + 2.18.6 com.google.api gax - 2.18.6-SNAPSHOT + 2.18.6 test-jar diff --git a/versions.txt b/versions.txt index 632a21985..db2c3eaa8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -gax:2.18.5:2.18.6-SNAPSHOT -gax-bom:2.18.5:2.18.6-SNAPSHOT -gax-grpc:2.18.5:2.18.6-SNAPSHOT -gax-httpjson:0.103.5:0.103.6-SNAPSHOT +gax:2.18.6:2.18.6 +gax-bom:2.18.6:2.18.6 +gax-grpc:2.18.6:2.18.6 +gax-httpjson:0.103.6:0.103.6