Skip to content

Commit

Permalink
Bump com.google.api-client:google-api-client from 1.34.0 to 2.2.0 in …
Browse files Browse the repository at this point in the history
…/plugins/repository-gcs (#8276) (#8328)

* 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>
(cherry picked from commit 74788c3)
  • Loading branch information
Xtansia authored Jun 29, 2023
1 parent ebe6f2c commit 143fac8
Show file tree
Hide file tree
Showing 24 changed files with 46 additions and 35 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `io.projectreactor.netty:reactor-netty-http` from 1.1.7 to 1.1.8 (#8256)
- [Upgrade] Lucene 9.7.0 release (#8272)
- 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))
- 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))

### Changed
- Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836))
Expand Down
58 changes: 34 additions & 24 deletions plugins/repository-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,43 @@ versions << [
]

dependencies {
api 'com.google.cloud:google-cloud-storage:1.113.1'
api 'com.google.cloud:google-cloud-core:2.5.10'
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
api 'com.google.guava:failureaccess:1.0.1'
api 'com.google.http-client:google-http-client:1.35.0'
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}"
api 'com.google.api:api-common:1.8.1'
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:gax-httpjson:0.103.1'

api 'com.google.apis:google-api-services-storage:v1-rev20230617-2.0.0'

api 'com.google.api-client:google-api-client:2.2.0'

api 'com.google.api.grpc:proto-google-common-protos:2.10.0'
api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
api 'com.google.cloud:google-cloud-core-http:2.17.0'

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.oauth-client:google-oauth-client:1.33.3'
api 'com.google.api-client:google-api-client:1.34.0'
api 'com.google.http-client:google-http-client-appengine:1.41.8'
api 'com.google.http-client:google-http-client-jackson2:1.42.3'
api 'com.google.http-client:google-http-client-gson:1.41.4'
api 'com.google.api:gax-httpjson:0.62.0'
api 'io.grpc:grpc-context:1.45.1'
api 'io.opencensus:opencensus-api:0.18.0'
api 'io.opencensus:opencensus-contrib-http-util:0.18.0'
api 'com.google.apis:google-api-services-storage:v1-rev20200814-1.30.10'

api 'com.google.cloud:google-cloud-core:2.5.10'
api 'com.google.cloud:google-cloud-core-http:2.17.0'
api 'com.google.cloud:google-cloud-storage:1.113.1'

api 'com.google.code.gson:gson:2.9.0'

runtimeOnly "com.google.guava:guava:${versions.guava}"
api 'com.google.guava:failureaccess:1.0.1'

api 'com.google.http-client:google-http-client:1.43.2'
api 'com.google.http-client:google-http-client-appengine:1.43.2'
api 'com.google.http-client:google-http-client-gson:1.43.2'
api 'com.google.http-client:google-http-client-jackson2:1.43.2'

api 'com.google.oauth-client:google-oauth-client:1.34.1'

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}"
api 'org.threeten:threetenbp:1.4.4'
api 'io.grpc:grpc-context:1.46.0'
api 'io.opencensus:opencensus-api:0.31.1'
api 'io.opencensus:opencensus-contrib-http-util:0.31.1'

testImplementation project(':test:fixtures:gcs-fixture')
}
Expand Down Expand Up @@ -121,7 +131,6 @@ thirdPartyAudit {

ignoreMissingClasses(
'com.google.api.client.http.apache.v2.ApacheHttpTransport',
'com.google.api.gax.tracing.NoopApiTracer',
'com.google.appengine.api.datastore.Blob',
'com.google.appengine.api.datastore.DatastoreService',
'com.google.appengine.api.datastore.DatastoreServiceFactory',
Expand All @@ -141,6 +150,9 @@ thirdPartyAudit {
'com.google.appengine.api.urlfetch.HTTPResponse',
'com.google.appengine.api.urlfetch.URLFetchService',
'com.google.appengine.api.urlfetch.URLFetchServiceFactory',
'com.google.protobuf.util.JsonFormat',
'com.google.protobuf.util.JsonFormat$Parser',
'com.google.protobuf.util.JsonFormat$Printer',
'com.google.protobuf.util.Timestamps',
// commons-logging optional dependencies
'org.apache.avalon.framework.logger.Logger',
Expand All @@ -167,8 +179,6 @@ thirdPartyAudit {
'org.apache.http.client.methods.HttpRequestBase',
'org.apache.http.config.Registry',
'org.apache.http.config.RegistryBuilder',
'org.apache.http.config.SocketConfig',
'org.apache.http.config.SocketConfig$Builder',
'org.apache.http.conn.ClientConnectionManager',
'org.apache.http.conn.ConnectionKeepAliveStrategy',
'org.apache.http.conn.params.ConnManagerParams',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
041d99172fda933bc879bdfd8de9420c5c34107e

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
10e53fd4d987e37190432e896bdaa62e8ea2c628

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fc3f225b405303fe7cb760d578348b6b07e7ea8b

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2520469ebd8c0675f0d2aeafd2da665228320fcf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9fb548c5264227813fd83991b94a705b0841c15f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b1c2e3e89804c113dba7b342aa8e0fc2cf3d9378

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e52a9967ebd8246fc4cca64df5f03608db5ac6e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4a4f88c5e13143f882268c98239fb85c3b2c6cb2

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
621d765a459758cdcd9aa4b4795392a4353e3576

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
66a60c7201c2b8b20ce495f0295b32bb0ccbbc57

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c13fc5715231fadb16a9b74a44d9d59c460cfa8

0 comments on commit 143fac8

Please sign in to comment.