From 1faaacb92c35bcbbf047f251fcaf6383088cc611 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Tue, 6 Jun 2023 12:14:21 -0400 Subject: [PATCH 1/3] Update Google HTTP Signed-off-by: Stephen Crawford --- plugins/repository-gcs/build.gradle | 2 +- .../repository-gcs/licenses/google-http-client-1.42.0.jar.sha1 | 1 - .../repository-gcs/licenses/google-http-client-1.43.2.jar.sha1 | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/google-http-client-1.42.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-http-client-1.43.2.jar.sha1 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 0786e1c2c6151..a22f5e97597ee 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -58,7 +58,7 @@ dependencies { api 'com.google.cloud:google-cloud-core:2.5.10' runtimeOnly 'com.google.guava:guava:31.1-jre' api 'com.google.guava:failureaccess:1.0.1' - api 'com.google.http-client:google-http-client:1.42.0' + api 'com.google.http-client:google-http-client:1.43.2' api "commons-logging:commons-logging:${versions.commonslogging}" api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" api "commons-codec:commons-codec:${versions.commonscodec}" diff --git a/plugins/repository-gcs/licenses/google-http-client-1.42.0.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-1.42.0.jar.sha1 deleted file mode 100644 index 9c20d9f12d4b0..0000000000000 --- a/plugins/repository-gcs/licenses/google-http-client-1.42.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f319ce80ba6888d04a38234916c43d5486842a5 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-1.43.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-1.43.2.jar.sha1 new file mode 100644 index 0000000000000..a576a74c62542 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-1.43.2.jar.sha1 @@ -0,0 +1 @@ +2520469ebd8c0675f0d2aeafd2da665228320fcf \ No newline at end of file From 013aef213adaddfbf2e88fefa40e7042783d55f5 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Tue, 6 Jun 2023 12:17:55 -0400 Subject: [PATCH 2/3] Update Google HTTP Signed-off-by: Stephen Crawford --- plugins/repository-gcs/build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index a22f5e97597ee..0b13a2e09afbf 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -9,14 +9,12 @@ * GitHub history for details. */ -import java.nio.file.Files -import java.security.KeyPair -import java.security.KeyPairGenerator + import org.opensearch.gradle.MavenFilteringHack import org.opensearch.gradle.info.BuildParams +import org.opensearch.gradle.test.InternalClusterTestPlugin import org.opensearch.gradle.test.RestIntegTestTask import org.opensearch.gradle.test.rest.YamlRestTestPlugin -import org.opensearch.gradle.test.InternalClusterTestPlugin import java.nio.file.Files import java.security.KeyPair From f849e2c479753ae44e18c4e39f675ea61db34ede Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Tue, 6 Jun 2023 14:37:34 -0400 Subject: [PATCH 3/3] add changelog Signed-off-by: Stephen Crawford --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64274e86a4f74..d13864aac68fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Add `com.github.luben:zstd-jni` version 1.5.5-3 ([#2996](https://github.com/opensearch-project/OpenSearch/pull/2996)) - OpenJDK Update (April 2023 Patch releases) ([#7344](https://github.com/opensearch-project/OpenSearch/pull/7344) - Bump `com.amazonaws` 1.12.270 to `software.amazon.awssdk` 2.20.55 ([7372](https://github.com/opensearch-project/OpenSearch/pull/7372/)) +- Bump `com.google.http-client:google-http-client:1.43.2` from 1.42.0 to 1.43.2 ([7928](https://github.com/opensearch-project/OpenSearch/pull/7928))) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948))