diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dd5f88e369b1..9bd7b95779676 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `github/codeql-action` from 3 to 4 ([#19785](https://github.com/opensearch-project/OpenSearch/pull/19785)) - Bump `gradle/actions` from 4 to 5 ([#19781](https://github.com/opensearch-project/OpenSearch/pull/19781)) - Bump org.bouncycastle:bc-fips from 2.1.1 to 2.1.2 ([#19818](https://github.com/opensearch-project/OpenSearch/pull/19818)) +- Bump `com.google.http-client:google-http-client-gson` from 1.47.1 to 2.0.0 ([#19253](https://github.com/opensearch-project/OpenSearch/pull/19253)) ### Deprecated - Deprecated existing constructors in ThreadPoolStats.Stats in favor of the new Builder ([#19317](https://github.com/opensearch-project/OpenSearch/pull/19317)) diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 1796f7f9c123d..89de393ef43a6 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -78,10 +78,10 @@ dependencies { implementation "com.google.auth:google-auth-library-oauth2-http:1.38.0" runtimeOnly "com.google.oauth-client:google-oauth-client:1.39.0" // 1.39.0 in bom implementation "com.google.api-client:google-api-client:2.7.2" - implementation "com.google.http-client:google-http-client:1.47.1" - runtimeOnly "com.google.http-client:google-http-client-gson:1.47.1" - runtimeOnly "com.google.http-client:google-http-client-appengine:1.47.1" - runtimeOnly "com.google.http-client:google-http-client-jackson2:1.47.1" + implementation "com.google.http-client:google-http-client:2.0.2" + runtimeOnly "com.google.http-client:google-http-client-gson:2.0.2" + runtimeOnly "com.google.http-client:google-http-client-appengine:2.0.2" + runtimeOnly "com.google.http-client:google-http-client-jackson2:2.0.2" runtimeOnly "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" // 2.18.2 in bom runtimeOnly "io.opencensus:opencensus-api:0.31.1" runtimeOnly "io.opencensus:opencensus-contrib-http-util:0.31.1" diff --git a/plugins/repository-gcs/licenses/google-http-client-1.47.1.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-1.47.1.jar.sha1 deleted file mode 100644 index a6e55ecc00c5a..0000000000000 --- a/plugins/repository-gcs/licenses/google-http-client-1.47.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eabad78d440226732a453d6a300663a9770f5b7e \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-2.0.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-2.0.2.jar.sha1 new file mode 100644 index 0000000000000..158b6d74a3839 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-2.0.2.jar.sha1 @@ -0,0 +1 @@ +5605d66977094595cf4dde9db532596b1cc95459 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-appengine-1.47.1.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-appengine-1.47.1.jar.sha1 deleted file mode 100644 index 6a202a1f01ca7..0000000000000 --- a/plugins/repository-gcs/licenses/google-http-client-appengine-1.47.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -487e80e93247912e7f9e33dcd1f5cb6aa2fce107 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-appengine-2.0.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-appengine-2.0.2.jar.sha1 new file mode 100644 index 0000000000000..64ff12f8001e8 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-appengine-2.0.2.jar.sha1 @@ -0,0 +1 @@ +4ff7a32210c31616c911bf92a33678b7236e9e84 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-gson-1.47.1.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-gson-1.47.1.jar.sha1 deleted file mode 100644 index d27c4b919285a..0000000000000 --- a/plugins/repository-gcs/licenses/google-http-client-gson-1.47.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -04331c43544544d60df28055c295949e22ba60a4 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-gson-2.0.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-gson-2.0.2.jar.sha1 new file mode 100644 index 0000000000000..16c2496b93b35 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-gson-2.0.2.jar.sha1 @@ -0,0 +1 @@ +bed01c219e4e543a3a12885fc19f7dc994949b79 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.47.1.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.47.1.jar.sha1 deleted file mode 100644 index e9f5b4b75e272..0000000000000 --- a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.47.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47dc687cfe1a06bf1c9501e0d1b67d7dd6935c2d \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-2.0.2.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-2.0.2.jar.sha1 new file mode 100644 index 0000000000000..25a72009173a9 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-http-client-jackson2-2.0.2.jar.sha1 @@ -0,0 +1 @@ +2877664965c0c1e4f7488ac6401b058f47bc6efd \ No newline at end of file