From a57524f8ea320fc076354aa430b5e02a5f36ac79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:17:24 +0000 Subject: [PATCH 1/4] Bump com.google.api-client:google-api-client in /plugins/discovery-gce Bumps [com.google.api-client:google-api-client](https://github.com/googleapis/google-api-java-client) from 1.35.2 to 2.7.1. - [Release notes](https://github.com/googleapis/google-api-java-client/releases) - [Changelog](https://github.com/googleapis/google-api-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-api-java-client/compare/v1.35.2...v2.7.1) --- updated-dependencies: - dependency-name: com.google.api-client:google-api-client dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- plugins/discovery-gce/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle index 3214db2074198..ee364e3a8fe80 100644 --- a/plugins/discovery-gce/build.gradle +++ b/plugins/discovery-gce/build.gradle @@ -19,7 +19,7 @@ opensearchplugin { dependencies { api "com.google.apis:google-api-services-compute:v1-rev20241105-2.0.0" - api "com.google.api-client:google-api-client:1.35.2" + api "com.google.api-client:google-api-client:2.7.1" api "com.google.oauth-client:google-oauth-client:1.36.0" api "com.google.http-client:google-http-client:${versions.google_http_client}" api "com.google.http-client:google-http-client-gson:${versions.google_http_client}" From 068fd5dc9b7f4a6c8a96ff6798c71f4e329edfd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 16 Dec 2024 13:19:42 +0000 Subject: [PATCH 2/4] Updating SHAs Signed-off-by: dependabot[bot] --- plugins/discovery-gce/licenses/google-api-client-1.35.2.jar.sha1 | 1 - plugins/discovery-gce/licenses/google-api-client-2.7.1.jar.sha1 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 plugins/discovery-gce/licenses/google-api-client-1.35.2.jar.sha1 create mode 100644 plugins/discovery-gce/licenses/google-api-client-2.7.1.jar.sha1 diff --git a/plugins/discovery-gce/licenses/google-api-client-1.35.2.jar.sha1 b/plugins/discovery-gce/licenses/google-api-client-1.35.2.jar.sha1 deleted file mode 100644 index 47245f9429e7d..0000000000000 --- a/plugins/discovery-gce/licenses/google-api-client-1.35.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2d737980e34c674da4ff0ae124b80caefdc7198a \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/google-api-client-2.7.1.jar.sha1 b/plugins/discovery-gce/licenses/google-api-client-2.7.1.jar.sha1 new file mode 100644 index 0000000000000..291056963ee11 --- /dev/null +++ b/plugins/discovery-gce/licenses/google-api-client-2.7.1.jar.sha1 @@ -0,0 +1 @@ +fe358e991f5d8bc44faa5137ba19fc6cde911e9e \ No newline at end of file From e3afe834cc226c3b6f3f88341cb916ddac3dd0c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 16 Dec 2024 13:20:29 +0000 Subject: [PATCH 3/4] Update changelog Signed-off-by: dependabot[bot] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f439e48ecab7..00a34385b4210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `com.gradle.develocity` from 3.18.2 to 3.19 ([#16855](https://github.com/opensearch-project/OpenSearch/pull/16855)) - Bump `org.jline:jline` from 3.27.1 to 3.28.0 ([#16857](https://github.com/opensearch-project/OpenSearch/pull/16857)) - Bump `com.azure:azure-core` from 1.51.0 to 1.54.1 ([#16856](https://github.com/opensearch-project/OpenSearch/pull/16856)) +- Bump `com.google.api-client:google-api-client` from 1.35.2 to 2.7.1 ([#16853](https://github.com/opensearch-project/OpenSearch/pull/16853)) ### Changed - Indexed IP field supports `terms_query` with more than 1025 IP masks [#16391](https://github.com/opensearch-project/OpenSearch/pull/16391) From bec8ea99d5e196f7308271fe84c7adf93291621a Mon Sep 17 00:00:00 2001 From: Andrew Ross Date: Thu, 19 Dec 2024 22:46:29 +0000 Subject: [PATCH 4/4] Add google_auth dependencies Signed-off-by: Andrew Ross --- gradle/libs.versions.toml | 2 +- plugins/discovery-gce/build.gradle | 2 ++ .../licenses/google-auth-library-credentials-1.30.1.jar.sha1 | 1 + .../licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 | 1 + .../licenses/google-auth-library-credentials-1.29.0.jar.sha1 | 1 - .../licenses/google-auth-library-credentials-1.30.1.jar.sha1 | 1 + .../licenses/google-auth-library-oauth2-http-1.29.0.jar.sha1 | 1 - .../licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 | 1 + 8 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 plugins/discovery-gce/licenses/google-auth-library-credentials-1.30.1.jar.sha1 create mode 100644 plugins/discovery-gce/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-auth-library-credentials-1.29.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-auth-library-credentials-1.30.1.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.29.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ff0920f9d6057..386d4fb2f8f42 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ guava = "33.2.1-jre" protobuf = "3.25.5" jakarta_annotation = "1.3.5" google_http_client = "1.44.1" -google_auth = "1.29.0" +google_auth = "1.30.1" tdigest = "3.3" hdrhistogram = "2.2.2" grpc = "1.68.0" diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle index ee364e3a8fe80..cbc5b6b62c914 100644 --- a/plugins/discovery-gce/build.gradle +++ b/plugins/discovery-gce/build.gradle @@ -18,6 +18,8 @@ opensearchplugin { } dependencies { + api "com.google.auth:google-auth-library-credentials:${versions.google_auth}" + api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}" api "com.google.apis:google-api-services-compute:v1-rev20241105-2.0.0" api "com.google.api-client:google-api-client:2.7.1" api "com.google.oauth-client:google-oauth-client:1.36.0" diff --git a/plugins/discovery-gce/licenses/google-auth-library-credentials-1.30.1.jar.sha1 b/plugins/discovery-gce/licenses/google-auth-library-credentials-1.30.1.jar.sha1 new file mode 100644 index 0000000000000..ebdb0ad84fd0b --- /dev/null +++ b/plugins/discovery-gce/licenses/google-auth-library-credentials-1.30.1.jar.sha1 @@ -0,0 +1 @@ +eaa05c7362ad2d209fb767a92e0035f6114f3242 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 b/plugins/discovery-gce/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 new file mode 100644 index 0000000000000..6b31afb15e1ba --- /dev/null +++ b/plugins/discovery-gce/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 @@ -0,0 +1 @@ +b04a439df08167f25bbdd1fab697b16401678217 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.29.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.29.0.jar.sha1 deleted file mode 100644 index e2f931a1e876f..0000000000000 --- a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.29.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19af4907301816d9328c1eb1fcc6dd05c8a0b544 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.30.1.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.30.1.jar.sha1 new file mode 100644 index 0000000000000..ebdb0ad84fd0b --- /dev/null +++ b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.30.1.jar.sha1 @@ -0,0 +1 @@ +eaa05c7362ad2d209fb767a92e0035f6114f3242 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.29.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.29.0.jar.sha1 deleted file mode 100644 index 98d0d1beda43d..0000000000000 --- a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.29.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2a42aead6cdc5d2cd22cdda1b9d7922e6135240f \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 new file mode 100644 index 0000000000000..6b31afb15e1ba --- /dev/null +++ b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.30.1.jar.sha1 @@ -0,0 +1 @@ +b04a439df08167f25bbdd1fab697b16401678217 \ No newline at end of file