Skip to content

Commit 74788c3

Browse files
authored
Bump com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in /plugins/repository-gcs (opensearch-project#8276)
* Bump com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in /plugins/repository-gcs Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Bump google-http-client and google-oauth-client Signed-off-by: Thomas <tsfarr@amazon.com> --------- Signed-off-by: Thomas Farr <tsfarr@amazon.com> Signed-off-by: Thomas <tsfarr@amazon.com>
1 parent b7cace5 commit 74788c3

12 files changed

+32
-23
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
122122
- Bump `io.projectreactor.netty:reactor-netty-http` from 1.1.7 to 1.1.8 (#8256)
123123
- [Upgrade] Lucene 9.7.0 release (#8272)
124124
- Bump `org.jboss.resteasy:resteasy-jackson2-provider` from 3.0.26.Final to 6.2.4.Final in /qa/wildfly ([#8209](https://github.com/opensearch-project/OpenSearch/pull/8209))
125+
- Bump `com.google.api-client:google-api-client` from 1.34.0 to 2.2.0 ([#8276](https://github.com/opensearch-project/OpenSearch/pull/8276))
125126

126127
### Changed
127128
- Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836))

plugins/repository-gcs/build.gradle

+26-18
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,43 @@ versions << [
5252
]
5353

5454
dependencies {
55-
api 'com.google.cloud:google-cloud-storage:1.113.1'
55+
api 'com.google.api:api-common:1.8.1'
56+
api 'com.google.api:gax:2.27.0'
57+
api 'com.google.api:gax-httpjson:0.103.1'
58+
59+
api 'com.google.apis:google-api-services-storage:v1-rev20230617-2.0.0'
60+
61+
api 'com.google.api-client:google-api-client:2.2.0'
62+
63+
api 'com.google.api.grpc:proto-google-common-protos:2.10.0'
64+
api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
65+
66+
api "com.google.auth:google-auth-library-credentials:${versions.google_auth}"
67+
api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}"
68+
5669
api 'com.google.cloud:google-cloud-core:2.5.10'
70+
api 'com.google.cloud:google-cloud-core-http:2.17.0'
71+
api 'com.google.cloud:google-cloud-storage:1.113.1'
72+
73+
api 'com.google.code.gson:gson:2.9.0'
74+
5775
runtimeOnly "com.google.guava:guava:${versions.guava}"
5876
api 'com.google.guava:failureaccess:1.0.1'
77+
5978
api 'com.google.http-client:google-http-client:1.43.2'
79+
api 'com.google.http-client:google-http-client-appengine:1.43.2'
80+
api 'com.google.http-client:google-http-client-gson:1.43.2'
81+
api 'com.google.http-client:google-http-client-jackson2:1.43.2'
82+
83+
api 'com.google.oauth-client:google-oauth-client:1.34.1'
84+
6085
api "commons-logging:commons-logging:${versions.commonslogging}"
6186
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
6287
api "commons-codec:commons-codec:${versions.commonscodec}"
63-
api 'com.google.api:api-common:1.8.1'
64-
api 'com.google.api:gax:2.27.0'
6588
api 'org.threeten:threetenbp:1.4.4'
66-
api 'com.google.code.gson:gson:2.9.0'
67-
api 'com.google.api.grpc:proto-google-common-protos:2.10.0'
68-
api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
69-
api 'com.google.cloud:google-cloud-core-http:2.17.0'
70-
api "com.google.auth:google-auth-library-credentials:${versions.google_auth}"
71-
api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}"
72-
api 'com.google.oauth-client:google-oauth-client:1.33.3'
73-
api 'com.google.api-client:google-api-client:1.34.0'
74-
api 'com.google.http-client:google-http-client-appengine:1.43.2'
75-
api 'com.google.http-client:google-http-client-jackson2:1.42.3'
76-
api 'com.google.http-client:google-http-client-gson:1.41.4'
77-
api 'com.google.api:gax-httpjson:0.103.1'
7889
api 'io.grpc:grpc-context:1.46.0'
7990
api 'io.opencensus:opencensus-api:0.31.1'
8091
api 'io.opencensus:opencensus-contrib-http-util:0.31.1'
81-
api 'com.google.apis:google-api-services-storage:v1-rev20220608-1.32.1'
8292

8393
testImplementation project(':test:fixtures:gcs-fixture')
8494
}
@@ -167,8 +177,6 @@ thirdPartyAudit {
167177
'org.apache.http.client.methods.HttpRequestBase',
168178
'org.apache.http.config.Registry',
169179
'org.apache.http.config.RegistryBuilder',
170-
'org.apache.http.config.SocketConfig',
171-
'org.apache.http.config.SocketConfig$Builder',
172180
'org.apache.http.conn.ClientConnectionManager',
173181
'org.apache.http.conn.ConnectionKeepAliveStrategy',
174182
'org.apache.http.conn.params.ConnManagerParams',

plugins/repository-gcs/licenses/google-api-client-1.34.0.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10e53fd4d987e37190432e896bdaa62e8ea2c628

plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20220608-1.32.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fc3f225b405303fe7cb760d578348b6b07e7ea8b

plugins/repository-gcs/licenses/google-http-client-gson-1.41.4.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b1c2e3e89804c113dba7b342aa8e0fc2cf3d9378

plugins/repository-gcs/licenses/google-http-client-jackson2-1.42.3.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5e52a9967ebd8246fc4cca64df5f03608db5ac6e

plugins/repository-gcs/licenses/google-oauth-client-1.33.3.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4a4f88c5e13143f882268c98239fb85c3b2c6cb2

0 commit comments

Comments
 (0)