From 87870a564ebb7d6cd26736cbafcfb13f034bb7f7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 4 Jun 2021 15:32:10 +0000 Subject: [PATCH 01/16] chore: release 1.103.2-SNAPSHOT (#479) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-language-bom/pom.xml | 12 ++++++------ google-cloud-language/pom.xml | 4 ++-- grpc-google-cloud-language-v1/pom.xml | 4 ++-- grpc-google-cloud-language-v1beta2/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-language-v1/pom.xml | 4 ++-- proto-google-cloud-language-v1beta2/pom.xml | 4 ++-- versions.txt | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/google-cloud-language-bom/pom.xml b/google-cloud-language-bom/pom.xml index 222a5c47..a46683bb 100644 --- a/google-cloud-language-bom/pom.xml +++ b/google-cloud-language-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-language-bom - 1.103.1 + 1.103.2-SNAPSHOT pom com.google.cloud @@ -63,27 +63,27 @@ com.google.cloud google-cloud-language - 1.103.1 + 1.103.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1 - 1.85.1 + 1.85.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.86.1 + 0.86.2-SNAPSHOT com.google.api.grpc proto-google-cloud-language-v1 - 1.85.1 + 1.85.2-SNAPSHOT com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.86.1 + 0.86.2-SNAPSHOT diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 92d159e7..e80dae7e 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-language - 1.103.1 + 1.103.2-SNAPSHOT jar Google Cloud Natural Language https://github.com/googleapis/java-language @@ -11,7 +11,7 @@ com.google.cloud google-cloud-language-parent - 1.103.1 + 1.103.2-SNAPSHOT google-cloud-language diff --git a/grpc-google-cloud-language-v1/pom.xml b/grpc-google-cloud-language-v1/pom.xml index a217518d..dd54e98b 100644 --- a/grpc-google-cloud-language-v1/pom.xml +++ b/grpc-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1 - 1.85.1 + 1.85.2-SNAPSHOT grpc-google-cloud-language-v1 GRPC library for grpc-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 1.103.1 + 1.103.2-SNAPSHOT diff --git a/grpc-google-cloud-language-v1beta2/pom.xml b/grpc-google-cloud-language-v1beta2/pom.xml index aac3ee26..5a2e9e7e 100644 --- a/grpc-google-cloud-language-v1beta2/pom.xml +++ b/grpc-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.86.1 + 0.86.2-SNAPSHOT grpc-google-cloud-language-v1beta2 GRPC library for grpc-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 1.103.1 + 1.103.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2fbbe6e9..7316f718 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-language-parent pom - 1.103.1 + 1.103.2-SNAPSHOT Google Cloud Natural Language Parent https://github.com/googleapis/java-language @@ -70,27 +70,27 @@ com.google.api.grpc proto-google-cloud-language-v1 - 1.85.1 + 1.85.2-SNAPSHOT com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.86.1 + 0.86.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1 - 1.85.1 + 1.85.2-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.86.1 + 0.86.2-SNAPSHOT com.google.cloud google-cloud-language - 1.103.1 + 1.103.2-SNAPSHOT diff --git a/proto-google-cloud-language-v1/pom.xml b/proto-google-cloud-language-v1/pom.xml index f73f091a..c60c33fe 100644 --- a/proto-google-cloud-language-v1/pom.xml +++ b/proto-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1 - 1.85.1 + 1.85.2-SNAPSHOT proto-google-cloud-language-v1 PROTO library for proto-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 1.103.1 + 1.103.2-SNAPSHOT diff --git a/proto-google-cloud-language-v1beta2/pom.xml b/proto-google-cloud-language-v1beta2/pom.xml index c4e38974..dd409c7e 100644 --- a/proto-google-cloud-language-v1beta2/pom.xml +++ b/proto-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.86.1 + 0.86.2-SNAPSHOT proto-google-cloud-language-v1beta2 PROTO library for proto-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 1.103.1 + 1.103.2-SNAPSHOT diff --git a/versions.txt b/versions.txt index a0f216ac..0172b49c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-language:1.103.1:1.103.1 -grpc-google-cloud-language-v1:1.85.1:1.85.1 -grpc-google-cloud-language-v1beta2:0.86.1:0.86.1 -proto-google-cloud-language-v1:1.85.1:1.85.1 -proto-google-cloud-language-v1beta2:0.86.1:0.86.1 +google-cloud-language:1.103.1:1.103.2-SNAPSHOT +grpc-google-cloud-language-v1:1.85.1:1.85.2-SNAPSHOT +grpc-google-cloud-language-v1beta2:0.86.1:0.86.2-SNAPSHOT +proto-google-cloud-language-v1:1.85.1:1.85.2-SNAPSHOT +proto-google-cloud-language-v1beta2:0.86.1:0.86.2-SNAPSHOT From 806ef11f318c683e9913bcb05cb361cdb61ca528 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 7 Jun 2021 21:00:27 +0200 Subject: [PATCH 02/16] chore(deps): update dependency com.google.cloud:libraries-bom to v20.6.0 (#482) 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.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.5.0` -> `20.6.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/compatibility-slim/20.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/confidence-slim/20.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### 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 this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- 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-language). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index f3d4a8d1..f6aeb018 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.5.0 + 20.6.0 pom import From 8efde470e585a9a54c9edd134632734cb7933a1c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 7 Jun 2021 21:00:28 +0200 Subject: [PATCH 03/16] chore(deps): update dependency com.google.cloud:libraries-bom to v20.6.0 (#482) 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.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.5.0` -> `20.6.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/compatibility-slim/20.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.6.0/confidence-slim/20.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### 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 this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- 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-language). From a1b0d97a291a2525622dcf45249e11a046cf280d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 7 Jun 2021 12:28:19 -0700 Subject: [PATCH 04/16] chore: regenerate README (#483) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-06-07 19:04:00,707 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-language/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-06-07 19:04:02,287 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/6b56c48c-1c88-4d5c-9fc3-72313dbdc8f9/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index d5a93bfc..ab3cb828 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-language.git", - "sha": "1da72f375e623bbbb4c8d4b4fdc3f522192bd8bc" + "sha": "8efde470e585a9a54c9edd134632734cb7933a1c" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c3e41da0fa256ad7f6b4bc76b9d069dedecdfef4" + "sha": "2430f8d90ed8a508e8422a3a7191e656d5a6bf53" } } ] diff --git a/README.md b/README.md index 78835db9..c61c8c1d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.5.0 + 20.6.0 pom import @@ -45,18 +45,18 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.5.0') +implementation platform('com.google.cloud:libraries-bom:20.6.0') compile 'com.google.cloud:google-cloud-language' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-language:1.103.0' +compile 'com.google.cloud:google-cloud-language:1.103.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.103.0" +libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.103.1" ``` ## Authentication From b463a4057c7b078831c8c7594c7a79e7767276f4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Jun 2021 00:32:08 +0200 Subject: [PATCH 05/16] chore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.23 (#481) 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.cloud.samples:shared-configuration | `1.0.22` -> `1.0.23` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.0.23/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.0.23/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.0.23/compatibility-slim/1.0.22)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.0.23/confidence-slim/1.0.22)](https://docs.renovatebot.com/merge-confidence/) | --- ### 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 this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- 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-language). --- samples/install-without-bom/pom.xml | 2 +- samples/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 05634503..1f4d82b5 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 diff --git a/samples/pom.xml b/samples/pom.xml index ba4382d3..bd9b10aa 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2eef3ee0..1f2991ad 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index f6aeb018..09b78695 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 From 365967ccf1aa3cf383d0ec59c12417a62eb1ae6a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 9 Jun 2021 20:46:48 +0200 Subject: [PATCH 06/16] chore(deps): update dependency com.google.cloud:google-cloud-language to v1.103.1 (#480) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 1f4d82b5..cfdde413 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-language - 1.103.0 + 1.103.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1f2991ad..2b07e5ce 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-language - 1.103.0 + 1.103.1 From ad18ce51c3bc096cb83a750e145eef7f2a66d32f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 9 Jun 2021 11:54:03 -0700 Subject: [PATCH 07/16] chore: regenerate README (#484) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-06-09 18:49:01,574 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-language/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-06-09 18:49:02,916 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/6dd0c887-b2b7-4cde-b092-ae93d310862d/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index ab3cb828..6f552347 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-language.git", - "sha": "8efde470e585a9a54c9edd134632734cb7933a1c" + "sha": "365967ccf1aa3cf383d0ec59c12417a62eb1ae6a" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "2430f8d90ed8a508e8422a3a7191e656d5a6bf53" + "sha": "740366bbb9a7e0f4b77fc75dc26be1d3a376c3e0" } } ] diff --git a/README.md b/README.md index c61c8c1d..43375a55 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-language - 1.103.0 + 1.103.1 ``` From b8d3ad6ae204fe3c6f17720594d668af0c5080a3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 15 Jun 2021 18:04:02 +0000 Subject: [PATCH 08/16] chore: release gapic-generator-java v1.0.12 (#486) Committer: @miraleung PiperOrigin-RevId: 378718217 Source-Link: https://github.com/googleapis/googleapis/commit/08c4eeb531c01ad031134dca94b18e3f7dd35902 Source-Link: https://github.com/googleapis/googleapis-gen/commit/9a27cb4181a8823727458705f4343f0dccdb40d6 --- .../v1/stub/LanguageServiceStubSettings.java | 7 + .../stub/LanguageServiceStubSettings.java | 7 + .../cloud/language/it/ITSystemTest.java | 300 ------------------ .../v1/LanguageServiceClientTest.java | 4 +- .../language/v1/LanguageServiceSmokeTest.java | 64 ---- .../v1beta2/LanguageServiceClientTest.java | 4 +- 6 files changed, 18 insertions(+), 368 deletions(-) delete mode 100644 google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java delete mode 100644 google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java index 15418c1d..dc3df942 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java @@ -159,6 +159,11 @@ public static String getDefaultEndpoint() { return "language.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "language.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -315,6 +320,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java index 37652a9d..c6a73eb6 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java @@ -160,6 +160,11 @@ public static String getDefaultEndpoint() { return "language.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "language.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -316,6 +321,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java deleted file mode 100644 index 7505175b..00000000 --- a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright 2019 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 - * - * https://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. - */ -package com.google.cloud.language.it; - -import static com.google.cloud.language.v1.Document.Type; -import static com.google.cloud.language.v1.PartOfSpeech.Tag; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import com.google.cloud.language.v1.AnalyzeEntitiesRequest; -import com.google.cloud.language.v1.AnalyzeEntitiesResponse; -import com.google.cloud.language.v1.AnalyzeEntitySentimentRequest; -import com.google.cloud.language.v1.AnalyzeEntitySentimentResponse; -import com.google.cloud.language.v1.AnalyzeSentimentResponse; -import com.google.cloud.language.v1.AnalyzeSyntaxRequest; -import com.google.cloud.language.v1.ClassificationCategory; -import com.google.cloud.language.v1.ClassifyTextRequest; -import com.google.cloud.language.v1.ClassifyTextResponse; -import com.google.cloud.language.v1.Document; -import com.google.cloud.language.v1.EncodingType; -import com.google.cloud.language.v1.Entity; -import com.google.cloud.language.v1.EntityMention; -import com.google.cloud.language.v1.LanguageServiceClient; -import com.google.cloud.language.v1.Sentiment; -import com.google.cloud.language.v1.Token; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ITSystemTest { - - private static LanguageServiceClient client; - private static final String GCS_BUCKET; - private static final String GCS_BUCKET_ENV_VAR = "GOOGLE_CLOUD_TESTS_LANGUAGE_BUCKET"; - - static { - if (System.getenv(GCS_BUCKET_ENV_VAR) != null) { - GCS_BUCKET = System.getenv(GCS_BUCKET_ENV_VAR); - } else { - GCS_BUCKET = "cloud-samples-data"; - } - } - - private static final String ANALYZE_TEXT = - "Android is a mobile operating system developed by Google, based on the Linux kernel and designed primarily for touchscreen mobile devices such as smartphones and tablets."; - - @Before - public void setUp() throws IOException { - client = LanguageServiceClient.create(); - } - - @After - public void tearDown() { - client.close(); - } - - @Test - public void analyzeEntitiesFileTest() { - Document doc = - Document.newBuilder() - .setGcsContentUri(String.format("gs://%s/language/android.txt", GCS_BUCKET)) - .setType(Type.PLAIN_TEXT) - .build(); - AnalyzeEntitiesRequest request = AnalyzeEntitiesRequest.newBuilder().setDocument(doc).build(); - AnalyzeEntitiesResponse response = client.analyzeEntities(request); - for (Entity entity : response.getEntitiesList()) { - if (entity.getName().equals("Android")) { - assertEquals(Entity.Type.CONSUMER_GOOD, entity.getType()); - assertEquals(0.69612604, entity.getSalience(), 10); - assertEquals(2, entity.getMentionsCount()); - assertEquals(2, entity.getMetadataMap().size()); - break; - } - } - } - - @Test - public void analyzeEntitiesTextTest() { - Document doc = Document.newBuilder().setContent(ANALYZE_TEXT).setType(Type.PLAIN_TEXT).build(); - AnalyzeEntitiesRequest request = - AnalyzeEntitiesRequest.newBuilder() - .setDocument(doc) - .setEncodingType(EncodingType.UTF16) - .build(); - AnalyzeEntitiesResponse response = client.analyzeEntities(request); - for (Entity entity : response.getEntitiesList()) { - if (entity.getName().equals("Android")) { - assertEquals(Entity.Type.CONSUMER_GOOD, entity.getType()); - assertEquals(0.69612604, entity.getSalience(), 10); - assertEquals(2, entity.getMentionsCount()); - assertEquals(2, entity.getMetadataMap().size()); - break; - } - } - } - - @Test - public void analyzeEntitySentimentFileTest() { - Document doc = - Document.newBuilder() - .setGcsContentUri(String.format("gs://%s/language/president.txt", GCS_BUCKET)) - .setType(Type.PLAIN_TEXT) - .build(); - AnalyzeEntitySentimentRequest request = - AnalyzeEntitySentimentRequest.newBuilder() - .setDocument(doc) - .setEncodingType(EncodingType.UTF16) - .build(); - AnalyzeEntitySentimentResponse response = client.analyzeEntitySentiment(request); - List actual = new ArrayList<>(); - for (Entity entity : response.getEntitiesList()) { - actual.add(entity.getName()); - } - assertEquals(Arrays.asList("Kennedy", "White House"), actual); - } - - @Test - public void analyzeEntitySentimentTextWithExpectedResultTest() { - Document doc = - Document.newBuilder() - .setContent( - "Oranges, grapes, and apples can be found in the cafeterias located in Mountain View, Seattle, and London.") - .setType(Type.PLAIN_TEXT) - .build(); - AnalyzeEntitySentimentRequest request = - AnalyzeEntitySentimentRequest.newBuilder() - .setDocument(doc) - .setEncodingType(EncodingType.UTF16) - .build(); - AnalyzeEntitySentimentResponse response = client.analyzeEntitySentiment(request); - List actual = new ArrayList<>(); - for (Entity entity : response.getEntitiesList()) { - actual.add(entity.getName()); - } - assertTrue(actual.contains("Seattle")); - } - - @Test - public void analyzeEntitySentimentTextWithEncodedExpectedResultTest() { - Document doc = Document.newBuilder().setContent("fooβ†’bar").setType(Type.PLAIN_TEXT).build(); - AnalyzeEntitySentimentRequest request = - AnalyzeEntitySentimentRequest.newBuilder() - .setDocument(doc) - .setEncodingType(EncodingType.UTF16) - .build(); - AnalyzeEntitySentimentResponse response = client.analyzeEntitySentiment(request); - List actual = new ArrayList<>(); - for (Entity entity : response.getEntitiesList()) { - for (EntityMention mention : entity.getMentionsList()) { - actual.add(mention.getText().getBeginOffset()); - } - } - assertTrue(actual.contains(4)); - } - - @Test - public void analyzeSentimentFileWithReturnPositiveTest() { - Document doc = - Document.newBuilder() - .setGcsContentUri(String.format("gs://%s/language/sentiment-positive.txt", GCS_BUCKET)) - .setType(Type.PLAIN_TEXT) - .build(); - AnalyzeSentimentResponse response = client.analyzeSentiment(doc); - Sentiment actual = response.getDocumentSentiment(); - assertTrue(actual.getMagnitude() > 0.0F); - assertTrue(actual.getScore() > 0.0F); - } - - @Test - public void analyzeSentimentTextWithReturnPositiveTest() { - Document doc = - Document.newBuilder() - .setContent("Tom Cruise is one of the finest actors in hollywood and a great star!") - .setType(Type.PLAIN_TEXT) - .build(); - Sentiment sentiment = client.analyzeSentiment(doc).getDocumentSentiment(); - assertTrue(sentiment.getMagnitude() > 0.0F); - assertTrue(sentiment.getScore() > 0.0F); - } - - @Test - public void analyzeSentimentFileWithReturnNegativeTest() { - Document doc = - Document.newBuilder() - .setGcsContentUri(String.format("gs://%s/language/sentiment-negative.txt", GCS_BUCKET)) - .setType(Type.PLAIN_TEXT) - .build(); - Sentiment sentiment = client.analyzeSentiment(doc).getDocumentSentiment(); - assertTrue(sentiment.getMagnitude() > 0.0F); - assertTrue(sentiment.getScore() < 0.0F); - } - - @Test - public void analyzeSentimentTextWithReturnNegativeTest() { - Document doc = - Document.newBuilder() - .setContent("That was the worst performance I've seen in a while.") - .setType(Type.PLAIN_TEXT) - .build(); - Sentiment sentiment = client.analyzeSentiment(doc).getDocumentSentiment(); - assertTrue(sentiment.getMagnitude() > 0.0F); - assertTrue(sentiment.getScore() < 0.0F); - } - - @Test - public void analyzeSyntaxFileTest() { - Document doc = - Document.newBuilder() - .setGcsContentUri(String.format("gs://%s/language/syntax-sentence.txt", GCS_BUCKET)) - .setType(Type.PLAIN_TEXT) - .build(); - AnalyzeSyntaxRequest request = - AnalyzeSyntaxRequest.newBuilder() - .setDocument(doc) - .setEncodingType(EncodingType.UTF16) - .build(); - List tokens = client.analyzeSyntax(request).getTokensList(); - List expected = Arrays.asList(Tag.DET, Tag.VERB, Tag.DET, Tag.ADJ, Tag.NOUN, Tag.PUNCT); - List actual = new ArrayList<>(); - for (Token token : tokens) { - actual.add(token.getPartOfSpeech().getTag()); - } - assertEquals(expected, actual); - } - - @Test - public void analyzeSyntaxTextTest() { - Document doc = - Document.newBuilder() - .setContent("President Obama was elected for the second term") - .setType(Type.PLAIN_TEXT) - .build(); - AnalyzeSyntaxRequest request = - AnalyzeSyntaxRequest.newBuilder() - .setDocument(doc) - .setEncodingType(EncodingType.UTF16) - .build(); - List tokens = client.analyzeSyntax(request).getTokensList(); - List expected = - Arrays.asList(Tag.NOUN, Tag.NOUN, Tag.VERB, Tag.VERB, Tag.ADP, Tag.DET, Tag.ADJ, Tag.NOUN); - List actual = new ArrayList<>(); - for (Token token : tokens) { - actual.add(token.getPartOfSpeech().getTag()); - } - assertEquals(expected, actual); - } - - @Test - public void classifyFileTest() { - Document doc = - Document.newBuilder() - .setGcsContentUri(String.format("gs://%s/language/android.txt", GCS_BUCKET)) - .setType(Type.PLAIN_TEXT) - .build(); - ClassifyTextRequest request = ClassifyTextRequest.newBuilder().setDocument(doc).build(); - ClassifyTextResponse response = client.classifyText(request); - List expected = - Arrays.asList( - "/Computers & Electronics", - "/Internet & Telecom/Mobile & Wireless/Mobile Apps & Add-Ons"); - List actual = new ArrayList<>(); - for (ClassificationCategory category : response.getCategoriesList()) { - actual.add(category.getName()); - } - assertEquals(expected, actual); - } - - @Test - public void classifyTextTest() { - Document doc = Document.newBuilder().setContent(ANALYZE_TEXT).setType(Type.PLAIN_TEXT).build(); - ClassifyTextRequest request = ClassifyTextRequest.newBuilder().setDocument(doc).build(); - ClassifyTextResponse response = client.classifyText(request); - List expected = - Arrays.asList( - "/Computers & Electronics", - "/Internet & Telecom/Mobile & Wireless/Mobile Apps & Add-Ons"); - List actual = new ArrayList<>(); - for (ClassificationCategory category : response.getCategoriesList()) { - actual.add(category.getName()); - } - assertEquals(expected, actual); - } -} diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java index bf4919d2..7ccea4a9 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java @@ -40,10 +40,10 @@ @Generated("by gapic-generator-java") public class LanguageServiceClientTest { - private static MockServiceHelper mockServiceHelper; - private LanguageServiceClient client; private static MockLanguageService mockLanguageService; + private static MockServiceHelper mockServiceHelper; private LocalChannelProvider channelProvider; + private LanguageServiceClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java deleted file mode 100644 index 208f60cf..00000000 --- a/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2019 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 - * - * https://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. - */ -package com.google.cloud.language.v1; - -import com.google.common.base.Preconditions; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.junit.Test; - -@javax.annotation.Generated("by GAPIC") -public class LanguageServiceSmokeTest { - private static final String PROJECT_ENV_NAME = "GOOGLE_CLOUD_PROJECT"; - private static final String LEGACY_PROJECT_ENV_NAME = "GCLOUD_PROJECT"; - - @Test - public void run() { - main(null); - } - - public static void main(String args[]) { - Logger.getLogger("").setLevel(Level.WARNING); - try { - executeNoCatch(); - System.out.println("OK"); - } catch (Exception e) { - System.err.println("Failed with exception:"); - e.printStackTrace(System.err); - System.exit(1); - } - } - - public static void executeNoCatch() throws Exception { - try (LanguageServiceClient client = LanguageServiceClient.create()) { - String content = "Hello, world!"; - Document.Type type = Document.Type.PLAIN_TEXT; - Document document = Document.newBuilder().setContent(content).setType(type).build(); - - AnalyzeSentimentResponse response = client.analyzeSentiment(document); - } - } - - private static String getProjectId() { - String projectId = System.getProperty(PROJECT_ENV_NAME, System.getenv(PROJECT_ENV_NAME)); - if (projectId == null) { - projectId = - System.getProperty(LEGACY_PROJECT_ENV_NAME, System.getenv(LEGACY_PROJECT_ENV_NAME)); - } - Preconditions.checkArgument(projectId != null, "A project ID is required."); - return projectId; - } -} diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java index 50e18239..cba068cf 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java @@ -40,10 +40,10 @@ @Generated("by gapic-generator-java") public class LanguageServiceClientTest { - private static MockServiceHelper mockServiceHelper; - private LanguageServiceClient client; private static MockLanguageService mockLanguageService; + private static MockServiceHelper mockServiceHelper; private LocalChannelProvider channelProvider; + private LanguageServiceClient client; @BeforeClass public static void startStaticServer() { From 284bf21931b0bacb4f2305804e2644d0dc887f7b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 15 Jun 2021 18:04:08 +0000 Subject: [PATCH 09/16] chore: release gapic-generator-java v1.0.11 (#485) Committer: @miraleung PiperOrigin-RevId: 378266372 Source-Link: https://github.com/googleapis/googleapis/commit/9e3105549a35520f215359065c11e8dce15e18af Source-Link: https://github.com/googleapis/googleapis-gen/commit/14629f6b39dfee67009f79a96d2077d5bb17d1c3 From 46b7fd3a58b2b79535954a17824cc58bfb88babf Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 15 Jun 2021 19:28:09 +0000 Subject: [PATCH 10/16] chore: new owl bot post processor docker image (#488) Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:3796fe5c26bbf814f0a82a2eab2749b5710f87e7197dc011e5fa3c694e532462 --- .github/.OwlBot.lock.yaml | 2 +- .github/generated-files-bot.yml | 1 + .kokoro/build.sh | 4 ++-- .kokoro/dependencies.sh | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index eeb480bd..be22516e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:e09db16aef633f4cae68b6eb2771b40ea01464f8db08badcd1c5197b9c623457 image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:3796fe5c26bbf814f0a82a2eab2749b5710f87e7197dc011e5fa3c694e532462 diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 47c2ba13..c644a24e 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -9,3 +9,4 @@ ignoreAuthors: - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' +- 'gcf-owl-bot[bot]' diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 6ad0f29d..1ca4b28c 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 59d2aafc..a7e999d3 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -46,7 +46,7 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." @@ -70,7 +70,7 @@ function completenessCheck() { set +e error_count=0 -for path in $(find -name ".flattened-pom.xml") +for path in **/.flattened-pom.xml do # Check flattened pom in each dir that contains it for completeness dir=$(dirname "$path") From ff5dff0d3860c18998ea02f1efac3e7025479e43 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 22:02:11 +0000 Subject: [PATCH 11/16] chore: minimize noise from build scripts (#1091) (#489) This should limit the amount of scrolling client devs have to do when debugging a test failure Co-authored-by: Elliotte Rusty Harold Co-authored-by: Neenu Shaji Source-Link: https://github.com/googleapis/synthtool/commit/1c0c698705e668ccb3d68556ae7260f16ce63a6e Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:117d9f1bef3342ea256419068dfaf65e5b2d126534ef0773c25ce71b8474f346 --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/coerce_logs.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index be22516e..cd2e6d39 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:3796fe5c26bbf814f0a82a2eab2749b5710f87e7197dc011e5fa3c694e532462 + digest: sha256:117d9f1bef3342ea256419068dfaf65e5b2d126534ef0773c25ce71b8474f346 diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh index 5cf7ba49..46edbf7f 100755 --- a/.kokoro/coerce_logs.sh +++ b/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt From ea0040925d74e086d1fab26d90fb0db4cd2771a1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 23 Jun 2021 21:10:37 +0200 Subject: [PATCH 12/16] chore(deps): update dependency com.google.cloud:libraries-bom to v20.7.0 (#491) 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.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.6.0` -> `20.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/compatibility-slim/20.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.7.0/confidence-slim/20.6.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### 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 this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- 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-language). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 09b78695..bb59fb36 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.6.0 + 20.7.0 pom import From da057986d17dc15e9df6fba7e01e0cdaea049a7f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 23 Jun 2021 12:20:48 -0700 Subject: [PATCH 13/16] chore: regenerate README (#492) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-06-23 19:15:58,084 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-language/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-06-23 19:15:59,665 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/fd7dff4d-ff8e-48ad-988f-4cdce16330cc/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 6f552347..4563af89 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-language.git", - "sha": "365967ccf1aa3cf383d0ec59c12417a62eb1ae6a" + "sha": "ea0040925d74e086d1fab26d90fb0db4cd2771a1" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "740366bbb9a7e0f4b77fc75dc26be1d3a376c3e0" + "sha": "9763f20e4b7bb1091082462b2f7970e965d0d414" } } ] diff --git a/README.md b/README.md index 43375a55..4d4216e6 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.6.0 + 20.7.0 pom import @@ -45,7 +45,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.6.0') +implementation platform('com.google.cloud:libraries-bom:20.7.0') compile 'com.google.cloud:google-cloud-language' ``` From d6525dca8e2e5d6ea48580a4d6a9389560e4937f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 18:48:26 +0000 Subject: [PATCH 14/16] fix: Add `shopt -s nullglob` to dependencies script (#1130) (#490) This prevents processing the unexpanded glob "**/.flattened-pom.xml" in repos which do not flatten any POMs. Source-Link: https://github.com/googleapis/synthtool/commit/87254ac89a9559864c0a245d6b150406439ce3d8 Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:a9b83a276c82987d284b733713fe86a3c8a2cc457933767eeb2688b882e54c6a --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/dependencies.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index cd2e6d39..a86dc465 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:117d9f1bef3342ea256419068dfaf65e5b2d126534ef0773c25ce71b8474f346 + digest: sha256:a9b83a276c82987d284b733713fe86a3c8a2cc457933767eeb2688b882e54c6a diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index a7e999d3..9030ba8f 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) From 73d0c8ece375ce1ff09ced579652a8f13331f001 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 2 Jul 2021 01:22:48 +0200 Subject: [PATCH 15/16] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 (#494) 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.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `1.3.0` -> `1.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/compatibility-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/1.4.0/confidence-slim/1.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v1.4.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​140-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare130v140-2021-06-30) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v1.3.0...v1.4.0) ##### Features - add grpc-gcp to dependencyManagement ([#​389](https://www.github.com/googleapis/java-shared-dependencies/issues/389)) ([57fd2e6](https://www.github.com/googleapis/java-shared-dependencies/commit/57fd2e646e28e37e0b5e4e1b37425d4897a8776f)) ##### Bug Fixes - Add `shopt -s nullglob` to dependencies script ([#​392](https://www.github.com/googleapis/java-shared-dependencies/issues/392)) ([f8f29df](https://www.github.com/googleapis/java-shared-dependencies/commit/f8f29df1c9cc6eca517c99113fb9509fd611ac92)) - Add common httpclient and oauth dependencies ([#​391](https://www.github.com/googleapis/java-shared-dependencies/issues/391)) ([09660e1](https://www.github.com/googleapis/java-shared-dependencies/commit/09660e1e50c96dcd7df4e80d8ad357f8256eda6c)) - Update dependencies.sh to not break on mac ([#​384](https://www.github.com/googleapis/java-shared-dependencies/issues/384)) ([0ae2841](https://www.github.com/googleapis/java-shared-dependencies/commit/0ae2841d7ce2885d041795c58a38d2d3973c2e5a)) ##### Dependencies - update dependency com.google.api-client:google-api-client-bom to v1.32.1 ([#​390](https://www.github.com/googleapis/java-shared-dependencies/issues/390)) ([00288c1](https://www.github.com/googleapis/java-shared-dependencies/commit/00288c18d09616582c8bec961ecc5c00ef1d4288)) - update dependency com.google.api:api-common to v1.10.4 ([#​385](https://www.github.com/googleapis/java-shared-dependencies/issues/385)) ([5f2b39b](https://www.github.com/googleapis/java-shared-dependencies/commit/5f2b39b5bdc4cec9d5ab2f050e11000ed372d057)) - update dependency com.google.api:gax-grpc to v1.65.1 ([#​382](https://www.github.com/googleapis/java-shared-dependencies/issues/382)) ([a2a1547](https://www.github.com/googleapis/java-shared-dependencies/commit/a2a15471dee21207a0b97b3bc8f6f59d6a4a2d13)) - update dependency com.google.protobuf:protobuf-bom to v3.17.3 ([#​379](https://www.github.com/googleapis/java-shared-dependencies/issues/379)) ([6f43eb5](https://www.github.com/googleapis/java-shared-dependencies/commit/6f43eb553dca98140d343bee3f1003096d79ee6c)) - update dependency io.grpc:grpc-bom to v1.38.1 ([#​386](https://www.github.com/googleapis/java-shared-dependencies/issues/386)) ([7b1d4cf](https://www.github.com/googleapis/java-shared-dependencies/commit/7b1d4cf317fbd75b91d6a63f82b5fc2f46eaf3ca)) - update dependency io.grpc:grpc-bom to v1.39.0 ([#​394](https://www.github.com/googleapis/java-shared-dependencies/issues/394)) ([ebc8af6](https://www.github.com/googleapis/java-shared-dependencies/commit/ebc8af6b3f850b58b35d9720a7a0b1545d4616bd)) - update gax.version to v1.66.0 ([#​395](https://www.github.com/googleapis/java-shared-dependencies/issues/395)) ([c73f73e](https://www.github.com/googleapis/java-shared-dependencies/commit/c73f73e84740a8117be342a66e179eaf3e29c6fd)) - update google.core.version to v1.95.1 ([#​381](https://www.github.com/googleapis/java-shared-dependencies/issues/381)) ([4496153](https://www.github.com/googleapis/java-shared-dependencies/commit/44961532f621b0ab19e9e7feebb7d588aef5d423)) - update google.core.version to v1.95.2 ([#​383](https://www.github.com/googleapis/java-shared-dependencies/issues/383)) ([7216859](https://www.github.com/googleapis/java-shared-dependencies/commit/7216859bcd67fa1ce1119831c33c50a2d5b79324)) - update google.core.version to v1.95.3 ([#​388](https://www.github.com/googleapis/java-shared-dependencies/issues/388)) ([354e4e8](https://www.github.com/googleapis/java-shared-dependencies/commit/354e4e811f4ba886406681a4261ac0455a9eb2d2)) - update google.core.version to v1.95.4 ([#​393](https://www.github.com/googleapis/java-shared-dependencies/issues/393)) ([be78ad8](https://www.github.com/googleapis/java-shared-dependencies/commit/be78ad85e31d8876eabafee7aa8242712573cb46))
--- ### 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 this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- 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-language). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7316f718..1e355260 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.3.0 + 1.4.0 pom import From fb8c458ebcdffc0e7c48ae810b07b7e9d2a8d3ff Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 20:38:15 +0000 Subject: [PATCH 16/16] chore: release 1.103.2 (#493) :robot: I have created a release \*beep\* \*boop\* --- ### [1.103.2](https://www.github.com/googleapis/java-language/compare/v1.103.1...v1.103.2) (2021-07-01) ### Bug Fixes * Add `shopt -s nullglob` to dependencies script ([#1130](https://www.github.com/googleapis/java-language/issues/1130)) ([#490](https://www.github.com/googleapis/java-language/issues/490)) ([d6525dc](https://www.github.com/googleapis/java-language/commit/d6525dca8e2e5d6ea48580a4d6a9389560e4937f)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#494](https://www.github.com/googleapis/java-language/issues/494)) ([73d0c8e](https://www.github.com/googleapis/java-language/commit/73d0c8ece375ce1ff09ced579652a8f13331f001)) --- 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 | 12 ++++++++++++ google-cloud-language-bom/pom.xml | 12 ++++++------ google-cloud-language/pom.xml | 4 ++-- grpc-google-cloud-language-v1/pom.xml | 4 ++-- grpc-google-cloud-language-v1beta2/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-language-v1/pom.xml | 4 ++-- proto-google-cloud-language-v1beta2/pom.xml | 4 ++-- versions.txt | 10 +++++----- 9 files changed, 39 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32f53493..846f3094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [1.103.2](https://www.github.com/googleapis/java-language/compare/v1.103.1...v1.103.2) (2021-07-01) + + +### Bug Fixes + +* Add `shopt -s nullglob` to dependencies script ([#1130](https://www.github.com/googleapis/java-language/issues/1130)) ([#490](https://www.github.com/googleapis/java-language/issues/490)) ([d6525dc](https://www.github.com/googleapis/java-language/commit/d6525dca8e2e5d6ea48580a4d6a9389560e4937f)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#494](https://www.github.com/googleapis/java-language/issues/494)) ([73d0c8e](https://www.github.com/googleapis/java-language/commit/73d0c8ece375ce1ff09ced579652a8f13331f001)) + ### [1.103.1](https://www.github.com/googleapis/java-language/compare/v1.103.0...v1.103.1) (2021-06-04) diff --git a/google-cloud-language-bom/pom.xml b/google-cloud-language-bom/pom.xml index a46683bb..c413e11f 100644 --- a/google-cloud-language-bom/pom.xml +++ b/google-cloud-language-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-language-bom - 1.103.2-SNAPSHOT + 1.103.2 pom com.google.cloud @@ -63,27 +63,27 @@ com.google.cloud google-cloud-language - 1.103.2-SNAPSHOT + 1.103.2 com.google.api.grpc grpc-google-cloud-language-v1 - 1.85.2-SNAPSHOT + 1.85.2 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.86.2-SNAPSHOT + 0.86.2 com.google.api.grpc proto-google-cloud-language-v1 - 1.85.2-SNAPSHOT + 1.85.2 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.86.2-SNAPSHOT + 0.86.2 diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index e80dae7e..17450616 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-language - 1.103.2-SNAPSHOT + 1.103.2 jar Google Cloud Natural Language https://github.com/googleapis/java-language @@ -11,7 +11,7 @@ com.google.cloud google-cloud-language-parent - 1.103.2-SNAPSHOT + 1.103.2 google-cloud-language diff --git a/grpc-google-cloud-language-v1/pom.xml b/grpc-google-cloud-language-v1/pom.xml index dd54e98b..46058550 100644 --- a/grpc-google-cloud-language-v1/pom.xml +++ b/grpc-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1 - 1.85.2-SNAPSHOT + 1.85.2 grpc-google-cloud-language-v1 GRPC library for grpc-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 1.103.2-SNAPSHOT + 1.103.2 diff --git a/grpc-google-cloud-language-v1beta2/pom.xml b/grpc-google-cloud-language-v1beta2/pom.xml index 5a2e9e7e..d820a30d 100644 --- a/grpc-google-cloud-language-v1beta2/pom.xml +++ b/grpc-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.86.2-SNAPSHOT + 0.86.2 grpc-google-cloud-language-v1beta2 GRPC library for grpc-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 1.103.2-SNAPSHOT + 1.103.2 diff --git a/pom.xml b/pom.xml index 1e355260..2812a778 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-language-parent pom - 1.103.2-SNAPSHOT + 1.103.2 Google Cloud Natural Language Parent https://github.com/googleapis/java-language @@ -70,27 +70,27 @@ com.google.api.grpc proto-google-cloud-language-v1 - 1.85.2-SNAPSHOT + 1.85.2 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.86.2-SNAPSHOT + 0.86.2 com.google.api.grpc grpc-google-cloud-language-v1 - 1.85.2-SNAPSHOT + 1.85.2 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.86.2-SNAPSHOT + 0.86.2 com.google.cloud google-cloud-language - 1.103.2-SNAPSHOT + 1.103.2 diff --git a/proto-google-cloud-language-v1/pom.xml b/proto-google-cloud-language-v1/pom.xml index c60c33fe..0ce86686 100644 --- a/proto-google-cloud-language-v1/pom.xml +++ b/proto-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1 - 1.85.2-SNAPSHOT + 1.85.2 proto-google-cloud-language-v1 PROTO library for proto-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 1.103.2-SNAPSHOT + 1.103.2 diff --git a/proto-google-cloud-language-v1beta2/pom.xml b/proto-google-cloud-language-v1beta2/pom.xml index dd409c7e..9a8f9efe 100644 --- a/proto-google-cloud-language-v1beta2/pom.xml +++ b/proto-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.86.2-SNAPSHOT + 0.86.2 proto-google-cloud-language-v1beta2 PROTO library for proto-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 1.103.2-SNAPSHOT + 1.103.2 diff --git a/versions.txt b/versions.txt index 0172b49c..84d0fb38 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-language:1.103.1:1.103.2-SNAPSHOT -grpc-google-cloud-language-v1:1.85.1:1.85.2-SNAPSHOT -grpc-google-cloud-language-v1beta2:0.86.1:0.86.2-SNAPSHOT -proto-google-cloud-language-v1:1.85.1:1.85.2-SNAPSHOT -proto-google-cloud-language-v1beta2:0.86.1:0.86.2-SNAPSHOT +google-cloud-language:1.103.2:1.103.2 +grpc-google-cloud-language-v1:1.85.2:1.85.2 +grpc-google-cloud-language-v1beta2:0.86.2:0.86.2 +proto-google-cloud-language-v1:1.85.2:1.85.2 +proto-google-cloud-language-v1beta2:0.86.2:0.86.2