From f02e3827022fe5e3ad49a7d590d711e1547dfaab Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 11:41:29 -0500 Subject: [PATCH 1/9] chore: exclude firestore and spanner samples from formatting (#1295) (#541) * chore: exclude firestore and spanner samples from formatting * chore: remove comment * chore: create a temporary file * chore: fix command Source-Link: https://github.com/googleapis/synthtool/commit/1a34456f4085907ad5523a9a94727f01c32a2405 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:3fc5ed5b0989197e3ee3053d72c90ca230cd0fe8896e591e0ce6fc910072553d Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 1 - CONTRIBUTING.md | 61 +++++---------------------------------- 3 files changed, 8 insertions(+), 56 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dd929fc8..72dadd01 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 \ No newline at end of file + digest: sha256:3fc5ed5b0989197e3ee3053d72c90ca230cd0fe8896e591e0ce6fc910072553d diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 5f5bed07..134256ee 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2dbdee0..b65dd279 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify ## Code Samples -Code Samples must be bundled in separate Maven modules, and guarded by a -Maven profile with the name `enable-samples`. +All code samples must be in compliance with the [java sample formatting guide][3]. +Code Samples must be bundled in separate Maven modules. The samples must be separate from the primary project for a few reasons: -1. Primary projects have a minimum Java version of Java 7 whereas samples have - a minimum Java version of Java 8. Due to this we need the ability to +1. Primary projects have a minimum Java version of Java 8 whereas samples can have + Java version of Java 11. Due to this we need the ability to selectively exclude samples from a build run. 2. Many code samples depend on external GCP services and need credentials to access the service. @@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons: ### Building ```bash -mvn -Penable-samples clean verify +mvn clean verify ``` Some samples require access to GCP services and require a service account: ```bash export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn -Penable-samples clean verify +mvn clean verify ``` -### Profile Config - -1. To add samples in a profile to your Maven project, add the following to your -`pom.xml` - - ```xml - - [...] - - - enable-samples - - sample - - - - [...] - - ``` - -2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory. - ### Code Formatting Code in this repo is formatted with @@ -110,30 +87,6 @@ To run formatting on your project, you can run: mvn com.coveo:fmt-maven-plugin:format ``` -### Profile Activation - -To include code samples when building and testing the project, enable the -`enable-samples` Maven profile. - -#### Command line - -To activate the Maven profile on the command line add `-Penable-samples` to your -Maven command. - -#### Maven `settings.xml` - -To activate the Maven profile in your `~/.m2/settings.xml` add an entry of -`enable-samples` following the instructions in [Active Profiles][2]. - -This method has the benefit of applying to all projects you build (and is -respected by IntelliJ IDEA) and is recommended if you are going to be -contributing samples to several projects. - -#### IntelliJ IDEA - -To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in -[Activate Maven profiles][3] to activate `enable-samples`. - [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account [2]: https://maven.apache.org/settings.html#Active_Profiles -[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles +[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file From e02f557e88e9db165f4341ce8b3c92456e804f7f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 18:51:07 -0500 Subject: [PATCH 2/9] chore: release 2.5.1-SNAPSHOT (#531) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- first-party-dependencies/pom.xml | 2 +- pom.xml | 6 +++--- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 4 ++-- versions.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index d32ae786..2cdd15e8 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 2.5.0 + 2.5.1-SNAPSHOT Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/pom.xml b/pom.xml index 852e5e45..4ec62ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 2.5.0 + 2.5.1-SNAPSHOT first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 2.5.0 + 2.5.1-SNAPSHOT pom import com.google.cloud third-party-dependencies - 2.5.0 + 2.5.1-SNAPSHOT pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index 748e3e66..41ed55ec 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 2.5.0 + 2.5.1-SNAPSHOT Google Cloud Third-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index 843b4b99..b1aa89f1 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 2.5.0 + 2.5.1-SNAPSHOT Upper bound test for Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -53,7 +53,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.5.0 + 2.5.1-SNAPSHOT pom import diff --git a/versions.txt b/versions.txt index 053f29f3..5e896391 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:2.5.0:2.5.0 \ No newline at end of file +google-cloud-shared-dependencies:2.5.0:2.5.1-SNAPSHOT \ No newline at end of file From 4e23adb666dfaa18ae8bf869aca030153de16d62 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 00:51:20 +0100 Subject: [PATCH 3/9] deps: update dependency com.google.api:api-common to v2.1.1 (#533) --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 2cdd15e8..51caa6b5 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -60,7 +60,7 @@ 1.1.0 31.0.1-jre 3.19.1 - 2.1.0 + 2.1.1 2.6.0 2.3.0 1.3.0 From 132445c2e836d96f9f157e8009d0819b63441556 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 00:51:40 +0100 Subject: [PATCH 4/9] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.2 (#535) --- first-party-dependencies/pom.xml | 2 +- pom.xml | 2 +- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 51caa6b5..9e8e6901 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -16,7 +16,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 diff --git a/pom.xml b/pom.xml index 4ec62ca0..818306ad 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index 41ed55ec..4988cea1 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -16,7 +16,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index b1aa89f1..80034a6c 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -17,7 +17,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 From 5a0c480671fa834e600edc6ac6fe77967d1b79b3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 00:56:24 +0100 Subject: [PATCH 5/9] deps: update gax.version to v2.7.1 (#544) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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.api:gax-grpc](https://togithub.com/googleapis/gax-java) | `2.7.0` -> `2.7.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.7.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.7.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.7.1/compatibility-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api:gax-grpc/2.7.1/confidence-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.api:gax-bom](https://togithub.com/googleapis/gax-java) | `2.7.0` -> `2.7.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.7.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.7.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.7.1/compatibility-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api:gax-bom/2.7.1/confidence-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-java (com.google.api:gax-grpc) ### [`v2.7.1`](https://togithub.com/googleapis/gax-java/blob/master/CHANGELOG.md#​271-httpswwwgithubcomgoogleapisgax-javacomparev270v271-2021-12-02) [Compare Source](https://togithub.com/googleapis/gax-java/compare/v2.7.0...v2.7.1)
googleapis/gax-java (com.google.api:gax-bom)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies). --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 9e8e6901..730ec2d6 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -56,7 +56,7 @@ UTF-8 ${project.artifactId} 1.42.1 - 2.7.0 + 2.7.1 1.1.0 31.0.1-jre 3.19.1 From 5295f16b4272b28c6d61dc97f4a726c3e34a0ef0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 23:58:22 +0000 Subject: [PATCH 6/9] chore: keep beta version intact (#1293) (#540) --- .github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 72dadd01..a335feb7 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:3fc5ed5b0989197e3ee3053d72c90ca230cd0fe8896e591e0ce6fc910072553d + digest: sha256:4e961d006ec9e44501273788f3cbe1e060c4666742ba190f60d6a05bcdf3ac8f From af97eb5d9cff397080fdb3d4a6dbf7c2692e0358 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 00:58:27 +0100 Subject: [PATCH 7/9] deps: update google.common-protos.version to v2.7.0 (#542) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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.api.grpc:grpc-google-common-protos](https://togithub.com/googleapis/java-common-protos) | `2.6.0` -> `2.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.7.0/compatibility-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.7.0/confidence-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.api.grpc:proto-google-common-protos](https://togithub.com/googleapis/java-common-protos) | `2.6.0` -> `2.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.7.0/compatibility-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.7.0/confidence-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-common-protos (com.google.api.grpc:grpc-google-common-protos) ### [`v2.7.0`](https://togithub.com/googleapis/java-common-protos/blob/master/CHANGELOG.md#​270-httpswwwgithubcomgoogleapisjava-common-protoscomparev260v270-2021-12-01) [Compare Source](https://togithub.com/googleapis/java-common-protos/compare/v2.6.0...v2.7.0) ##### Features - add Location proto ([#​270](https://www.togithub.com/googleapis/java-common-protos/issues/270)) ([2e2c8dd](https://www.github.com/googleapis/java-common-protos/commit/2e2c8dd798524df1d0b81f2e809d38c1dd5f744d)) - Introduce Native Image testing build script changes ([#​249](https://www.togithub.com/googleapis/java-common-protos/issues/249)) ([c2fa55a](https://www.github.com/googleapis/java-common-protos/commit/c2fa55a07150dc3e80bdc65948b610f851e87b90)) - next release from main branch is 2.7.0 ([#​246](https://www.togithub.com/googleapis/java-common-protos/issues/246)) ([6a113a3](https://www.github.com/googleapis/java-common-protos/commit/6a113a3afdfee35c4c3af0606bbecc81828c85f0)) ##### Dependencies - update dependency com.google.protobuf:protobuf-bom to v3.19.1 ([#​251](https://www.togithub.com/googleapis/java-common-protos/issues/251)) ([a5dd0ab](https://www.github.com/googleapis/java-common-protos/commit/a5dd0ab11989e6e3577f938f42f429203a545b92)) - update dependency com.google.protobuf:protobuf-java to v3.19.1 ([#​250](https://www.togithub.com/googleapis/java-common-protos/issues/250)) ([044a495](https://www.github.com/googleapis/java-common-protos/commit/044a4959423eca8481f723748dbf1919803ec55d)) - update dependency io.grpc:grpc-bom to v1.42.0 ([#​258](https://www.togithub.com/googleapis/java-common-protos/issues/258)) ([dfc00e1](https://www.github.com/googleapis/java-common-protos/commit/dfc00e1857c4428255f6e852eacc6cab338bbf1b)) - update dependency io.grpc:grpc-bom to v1.42.1 ([#​264](https://www.togithub.com/googleapis/java-common-protos/issues/264)) ([68fa087](https://www.github.com/googleapis/java-common-protos/commit/68fa087cafd92bbffd37eee6e3aacbf933886885)) - update dependency io.grpc:grpc-protobuf to v1.42.0 ([#​259](https://www.togithub.com/googleapis/java-common-protos/issues/259)) ([6df71fa](https://www.github.com/googleapis/java-common-protos/commit/6df71facf9f5bb6c36d70cf85571fdee6648299e)) - update dependency io.grpc:grpc-protobuf to v1.42.1 ([#​265](https://www.togithub.com/googleapis/java-common-protos/issues/265)) ([671a4cc](https://www.github.com/googleapis/java-common-protos/commit/671a4ccf8c56b1b12a5be7eba504758fa450be3b)) - update dependency io.grpc:grpc-stub to v1.42.0 ([#​260](https://www.togithub.com/googleapis/java-common-protos/issues/260)) ([b15e723](https://www.github.com/googleapis/java-common-protos/commit/b15e7237e1aac5fe4f925f9300b792d11f1eb41c)) - update dependency io.grpc:grpc-stub to v1.42.1 ([#​266](https://www.togithub.com/googleapis/java-common-protos/issues/266)) ([3b8a1ba](https://www.github.com/googleapis/java-common-protos/commit/3b8a1ba8444fde34ba59b6843463daab86833e35))
googleapis/java-common-protos (com.google.api.grpc:proto-google-common-protos)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies). --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 730ec2d6..dff3dc6e 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -61,7 +61,7 @@ 31.0.1-jre 3.19.1 2.1.1 - 2.6.0 + 2.7.0 2.3.0 1.3.0 1.40.1 From 885acefe4ff5313eb53dc43b4825ca597b97dcfd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 01:48:10 +0100 Subject: [PATCH 8/9] deps: update google.core.version to v2.3.3 (#534) * deps: update google.core.version to v2.3.2 * Update pom.xml Co-authored-by: Neenu Shaji --- first-party-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index dff3dc6e..4d6a4cd4 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -62,7 +62,7 @@ 3.19.1 2.1.1 2.7.0 - 2.3.0 + 2.3.3 1.3.0 1.40.1 1.32.1 From 5e42726a72c1625ad6a6061af4e646aa0a047f20 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 00:56:32 +0000 Subject: [PATCH 9/9] chore: release 2.5.1 (#543) :robot: I have created a release \*beep\* \*boop\* --- ### [2.5.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.5.0...v2.5.1) (2021-12-03) ### Dependencies * update dependency com.google.api:api-common to v2.1.1 ([#533](https://www.github.com/googleapis/java-shared-dependencies/issues/533)) ([4e23adb](https://www.github.com/googleapis/java-shared-dependencies/commit/4e23adb666dfaa18ae8bf869aca030153de16d62)) * update gax.version to v2.7.1 ([#544](https://www.github.com/googleapis/java-shared-dependencies/issues/544)) ([5a0c480](https://www.github.com/googleapis/java-shared-dependencies/commit/5a0c480671fa834e600edc6ac6fe77967d1b79b3)) * update google.common-protos.version to v2.7.0 ([#542](https://www.github.com/googleapis/java-shared-dependencies/issues/542)) ([af97eb5](https://www.github.com/googleapis/java-shared-dependencies/commit/af97eb5d9cff397080fdb3d4a6dbf7c2692e0358)) * update google.core.version to v2.3.3 ([#534](https://www.github.com/googleapis/java-shared-dependencies/issues/534)) ([885acef](https://www.github.com/googleapis/java-shared-dependencies/commit/885acefe4ff5313eb53dc43b4825ca597b97dcfd)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 10 ++++++++++ README.md | 2 +- first-party-dependencies/pom.xml | 2 +- pom.xml | 6 +++--- third-party-dependencies/pom.xml | 2 +- upper-bound-check/pom.xml | 4 ++-- versions.txt | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c4cc3d8..5de57de1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +### [2.5.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.5.0...v2.5.1) (2021-12-03) + + +### Dependencies + +* update dependency com.google.api:api-common to v2.1.1 ([#533](https://www.github.com/googleapis/java-shared-dependencies/issues/533)) ([4e23adb](https://www.github.com/googleapis/java-shared-dependencies/commit/4e23adb666dfaa18ae8bf869aca030153de16d62)) +* update gax.version to v2.7.1 ([#544](https://www.github.com/googleapis/java-shared-dependencies/issues/544)) ([5a0c480](https://www.github.com/googleapis/java-shared-dependencies/commit/5a0c480671fa834e600edc6ac6fe77967d1b79b3)) +* update google.common-protos.version to v2.7.0 ([#542](https://www.github.com/googleapis/java-shared-dependencies/issues/542)) ([af97eb5](https://www.github.com/googleapis/java-shared-dependencies/commit/af97eb5d9cff397080fdb3d4a6dbf7c2692e0358)) +* update google.core.version to v2.3.3 ([#534](https://www.github.com/googleapis/java-shared-dependencies/issues/534)) ([885acef](https://www.github.com/googleapis/java-shared-dependencies/commit/885acefe4ff5313eb53dc43b4825ca597b97dcfd)) + ## [2.5.0](https://www.github.com/googleapis/java-shared-dependencies/compare/2.4.0...v2.5.0) (2021-11-12) diff --git a/README.md b/README.md index 381b87ff..0e61bb15 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you are using Maven, add this to the `dependencyManagement` section. com.google.cloud google-cloud-shared-dependencies - 2.5.0 + 2.5.1 pom import diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 4d6a4cd4..9bcd1879 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 2.5.1-SNAPSHOT + 2.5.1 Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/pom.xml b/pom.xml index 818306ad..531ff51b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 2.5.1-SNAPSHOT + 2.5.1 first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 2.5.1-SNAPSHOT + 2.5.1 pom import com.google.cloud third-party-dependencies - 2.5.1-SNAPSHOT + 2.5.1 pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index 4988cea1..bfa99499 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 2.5.1-SNAPSHOT + 2.5.1 Google Cloud Third-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index 80034a6c..f6eb64a8 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 2.5.1-SNAPSHOT + 2.5.1 Upper bound test for Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -53,7 +53,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.5.1-SNAPSHOT + 2.5.1 pom import diff --git a/versions.txt b/versions.txt index 5e896391..cac1392b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:2.5.0:2.5.1-SNAPSHOT \ No newline at end of file +google-cloud-shared-dependencies:2.5.1:2.5.1 \ No newline at end of file