From db5ac751631dffcad56795d4a1afe2cb0b6aa6ff Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 23 May 2023 12:56:31 -0400 Subject: [PATCH 1/4] Bump com.google.api:gax from 2.17.0 to 2.27.0 in /plugins/repository-gcs Signed-off-by: Craig Perkins --- CHANGELOG.md | 3 ++- plugins/repository-gcs/build.gradle | 5 +---- plugins/repository-gcs/licenses/gax-2.17.0.jar.sha1 | 1 - plugins/repository-gcs/licenses/gax-2.27.0.jar.sha1 | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/gax-2.17.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/gax-2.27.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 549dc30e2184e..dda61627026dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,6 +120,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `net.minidev:json-smart` from 2.4.10 to 2.4.11 (#7660) - Bump `io.projectreactor.netty:reactor-netty-core` from 1.1.5 to 1.1.7 (#7657) - Bump `org.apache.maven:maven-model` from 3.9.1 to 3.9.2 (#7655) +- Bump `com.google.api:gax` from 2.17.0 to 2.27.0 (#7659) ### Changed - Enable `./gradlew build` on MacOS by disabling bcw tests ([#7303](https://github.com/opensearch-project/OpenSearch/pull/7303)) @@ -140,4 +141,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Security [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD -[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.7...2.x \ No newline at end of file +[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.7...2.x diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 33934d0369f48..97556eacd1552 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -63,7 +63,7 @@ dependencies { api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" api "commons-codec:commons-codec:${versions.commonscodec}" api 'com.google.api:api-common:1.8.1' - api 'com.google.api:gax:2.17.0' + api 'com.google.api:gax:2.27.0' api 'org.threeten:threetenbp:1.4.4' api 'com.google.code.gson:gson:2.9.0' api 'com.google.api.grpc:proto-google-common-protos:2.10.0' @@ -141,7 +141,6 @@ thirdPartyAudit { 'com.google.appengine.api.urlfetch.HTTPResponse', 'com.google.appengine.api.urlfetch.URLFetchService', 'com.google.appengine.api.urlfetch.URLFetchServiceFactory', - 'com.oracle.svm.core.configure.ResourcesRegistry', 'com.google.protobuf.util.JsonFormat', 'com.google.protobuf.util.JsonFormat$Parser', 'com.google.protobuf.util.JsonFormat$Printer', @@ -193,13 +192,11 @@ thirdPartyAudit { 'org.apache.http.protocol.HttpContext', 'org.apache.http.protocol.HttpProcessor', 'org.apache.http.protocol.HttpRequestExecutor', - 'org.graalvm.nativeimage.ImageSingletons', 'org.graalvm.nativeimage.hosted.Feature', 'org.graalvm.nativeimage.hosted.Feature$BeforeAnalysisAccess', 'org.graalvm.nativeimage.hosted.Feature$DuringAnalysisAccess', 'org.graalvm.nativeimage.hosted.Feature$FeatureAccess', 'org.graalvm.nativeimage.hosted.RuntimeReflection', - 'org.graalvm.nativeimage.impl.ConfigurationCondition', // commons-logging provided dependencies 'javax.jms.Message', 'javax.servlet.ServletContextEvent', diff --git a/plugins/repository-gcs/licenses/gax-2.17.0.jar.sha1 b/plugins/repository-gcs/licenses/gax-2.17.0.jar.sha1 deleted file mode 100644 index 37b5e6adf8ad7..0000000000000 --- a/plugins/repository-gcs/licenses/gax-2.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f78b89e5c00c7a88c8d874a257f752094ea16321 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/gax-2.27.0.jar.sha1 b/plugins/repository-gcs/licenses/gax-2.27.0.jar.sha1 new file mode 100644 index 0000000000000..1813a3aa94404 --- /dev/null +++ b/plugins/repository-gcs/licenses/gax-2.27.0.jar.sha1 @@ -0,0 +1 @@ +04a27757c9240da71f896be39f47aaa6e23ef989 \ No newline at end of file From ca19fcbff9aa21298ec6c03363e9c05a50039a4d Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 23 May 2023 12:58:13 -0400 Subject: [PATCH 2/4] Update PR number in CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dda61627026dc..5231f328ecd74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,7 +120,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `net.minidev:json-smart` from 2.4.10 to 2.4.11 (#7660) - Bump `io.projectreactor.netty:reactor-netty-core` from 1.1.5 to 1.1.7 (#7657) - Bump `org.apache.maven:maven-model` from 3.9.1 to 3.9.2 (#7655) -- Bump `com.google.api:gax` from 2.17.0 to 2.27.0 (#7659) +- Bump `com.google.api:gax` from 2.17.0 to 2.27.0 (#7697) ### Changed - Enable `./gradlew build` on MacOS by disabling bcw tests ([#7303](https://github.com/opensearch-project/OpenSearch/pull/7303)) From 96748dc3356c0672746cb8bf7759a1da873cbdbc Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 23 May 2023 14:26:28 -0400 Subject: [PATCH 3/4] Re-run CI Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5231f328ecd74..d827e9b05b495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,7 +120,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `net.minidev:json-smart` from 2.4.10 to 2.4.11 (#7660) - Bump `io.projectreactor.netty:reactor-netty-core` from 1.1.5 to 1.1.7 (#7657) - Bump `org.apache.maven:maven-model` from 3.9.1 to 3.9.2 (#7655) -- Bump `com.google.api:gax` from 2.17.0 to 2.27.0 (#7697) +- Bump `com.google.api:gax` from 2.17.0 to 2.27.0 ([#7697](https://github.com/opensearch-project/OpenSearch/pull/7697)) ### Changed - Enable `./gradlew build` on MacOS by disabling bcw tests ([#7303](https://github.com/opensearch-project/OpenSearch/pull/7303)) From 7c0fd596dbdd30e67bf653c5621a79aa4c134271 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 23 May 2023 14:48:34 -0400 Subject: [PATCH 4/4] Re-run CI Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d827e9b05b495..5231f328ecd74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,7 +120,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `net.minidev:json-smart` from 2.4.10 to 2.4.11 (#7660) - Bump `io.projectreactor.netty:reactor-netty-core` from 1.1.5 to 1.1.7 (#7657) - Bump `org.apache.maven:maven-model` from 3.9.1 to 3.9.2 (#7655) -- Bump `com.google.api:gax` from 2.17.0 to 2.27.0 ([#7697](https://github.com/opensearch-project/OpenSearch/pull/7697)) +- Bump `com.google.api:gax` from 2.17.0 to 2.27.0 (#7697) ### Changed - Enable `./gradlew build` on MacOS by disabling bcw tests ([#7303](https://github.com/opensearch-project/OpenSearch/pull/7303))