elastic · original-brownbear · Jun 17, 2022 · Jun 17, 2022 · Jun 17, 2022 · Jun 17, 2022
diff --git a/docs/changelog/87800.yaml b/docs/changelog/87800.yaml
@@ -0,0 +1,5 @@
+pr: 87800
+summary: Upgrade GCS Plugin to 1.118.1
+area: Snapshot/Restore
+type: upgrade
+issues: []
diff --git a/modules/repository-gcs/build.gradle b/modules/repository-gcs/build.gradle
@@ -26,36 +26,36 @@ esplugin {
 }
 
 dependencies {
-  api 'com.google.cloud:google-cloud-storage:1.117.1'
-  api 'com.google.cloud:google-cloud-core:1.95.4'
-  api 'com.google.cloud:google-cloud-core-http:1.95.4'
+  api 'com.google.cloud:google-cloud-storage:1.118.1'
+  api 'com.google.cloud:google-cloud-core:2.0.2'
+  api 'com.google.cloud:google-cloud-core-http:2.0.2'
   runtimeOnly 'com.google.guava:guava:30.1.1-jre'
   runtimeOnly 'com.google.guava:failureaccess:1.0.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 'com.google.api:api-common:1.10.4'
-  api 'com.google.api:gax:1.66.0'
+  api 'com.google.api:api-common:2.2.1'
+  api 'com.google.api:gax:2.0.0'
   api 'org.threeten:threetenbp:1.5.1'
   api 'com.google.protobuf:protobuf-java-util:3.17.3'
-  api 'com.google.protobuf:protobuf-java:3.17.3'
-  api 'com.google.code.gson:gson:2.8.7'
+  api 'com.google.protobuf:protobuf-java:3.21.1'
+  api 'com.google.code.gson:gson:2.8.9'
   api 'com.google.api.grpc:proto-google-common-protos:2.3.2'
   api 'com.google.api.grpc:proto-google-iam-v1:1.0.14'
-  api 'com.google.auth:google-auth-library-credentials:0.26.0'
-  api 'com.google.auth:google-auth-library-oauth2-http:0.26.0'
-  api 'com.google.oauth-client:google-oauth-client:1.31.5'
-  api 'com.google.api-client:google-api-client:1.32.1'
+  api 'com.google.auth:google-auth-library-credentials:1.0.0'
+  api 'com.google.auth:google-auth-library-oauth2-http:1.0.0'
+  api 'com.google.oauth-client:google-oauth-client:1.34.1'
+  api 'com.google.api-client:google-api-client:1.35.1'
   api 'com.google.http-client:google-http-client:1.39.2'
   api 'com.google.http-client:google-http-client-gson:1.39.2'
   api 'com.google.http-client:google-http-client-appengine:1.39.2'
   api 'com.google.http-client:google-http-client-jackson2:1.39.2'
   api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
-  api 'com.google.api:gax-httpjson:0.83.0'
+  api 'com.google.api:gax-httpjson:0.85.0'
   api 'io.grpc:grpc-context:1.39.0'
   api 'io.opencensus:opencensus-api:0.28.0'
   api 'io.opencensus:opencensus-contrib-http-util:0.28.0'
-  api 'com.google.apis:google-api-services-storage:v1-rev20210127-1.31.5'
+  api 'com.google.apis:google-api-services-storage:v1-rev20210127-1.32.1'
 
   testImplementation project(':test:fixtures:gcs-fixture')
 }
@@ -160,8 +160,6 @@ tasks.named("thirdPartyAudit").configure {
     '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',

diff --git a/modules/repository-gcs/licenses/api-common-1.10.4.jar.sha1 b/modules/repository-gcs/licenses/api-common-1.10.4.jar.sha1
diff --git a/modules/repository-gcs/licenses/api-common-2.2.1.jar.sha1 b/modules/repository-gcs/licenses/api-common-2.2.1.jar.sha1
@@ -0,0 +1 @@
+9eb62c522f96befccfbd8c92bafc952eed4417a8
diff --git a/modules/repository-gcs/licenses/gax-1.66.0.jar.sha1 b/modules/repository-gcs/licenses/gax-1.66.0.jar.sha1
diff --git a/modules/repository-gcs/licenses/gax-2.0.0.jar.sha1 b/modules/repository-gcs/licenses/gax-2.0.0.jar.sha1
@@ -0,0 +1 @@
+8bd7a226230bd3f657eb76c5dbbe5a6110988b2d
diff --git a/modules/repository-gcs/licenses/gax-httpjson-0.83.0.jar.sha1 b/modules/repository-gcs/licenses/gax-httpjson-0.83.0.jar.sha1
diff --git a/modules/repository-gcs/licenses/gax-httpjson-0.85.0.jar.sha1 b/modules/repository-gcs/licenses/gax-httpjson-0.85.0.jar.sha1
@@ -0,0 +1 @@
+e830eaeb3897329c002bcb0791ce83ed5a2f674e
diff --git a/modules/repository-gcs/licenses/google-api-client-1.32.1.jar.sha1 b/modules/repository-gcs/licenses/google-api-client-1.32.1.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-api-client-1.35.1.jar.sha1 b/modules/repository-gcs/licenses/google-api-client-1.35.1.jar.sha1
@@ -0,0 +1 @@
+df81628b335b7e554cdc50a7da6e554651a1ff2e
diff --git a/modules/repository-gcs/licenses/google-api-services-storage-v1-rev20210127-1.31.5.jar.sha1 b/modules/repository-gcs/licenses/google-api-services-storage-v1-rev20210127-1.31.5.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-api-services-storage-v1-rev20210127-1.32.1.jar.sha1 b/modules/repository-gcs/licenses/google-api-services-storage-v1-rev20210127-1.32.1.jar.sha1
@@ -0,0 +1 @@
+7aa955565b2021860bae99c38f203cdac70531dd
diff --git a/modules/repository-gcs/licenses/google-auth-library-credentials-0.26.0.jar.sha1 b/modules/repository-gcs/licenses/google-auth-library-credentials-0.26.0.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-auth-library-credentials-1.0.0.jar.sha1 b/modules/repository-gcs/licenses/google-auth-library-credentials-1.0.0.jar.sha1
@@ -0,0 +1 @@
+8490d3c271942021b4ddb8642089a8372e9a7cc7
diff --git a/modules/repository-gcs/licenses/google-auth-library-oauth2-http-0.26.0.jar.sha1 b/modules/repository-gcs/licenses/google-auth-library-oauth2-http-0.26.0.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-auth-library-oauth2-http-1.0.0.jar.sha1 b/modules/repository-gcs/licenses/google-auth-library-oauth2-http-1.0.0.jar.sha1
@@ -0,0 +1 @@
+f8710934be366e9ecf19ad3f9ca0582a309be0e9
diff --git a/modules/repository-gcs/licenses/google-cloud-core-1.95.4.jar.sha1 b/modules/repository-gcs/licenses/google-cloud-core-1.95.4.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-cloud-core-2.0.2.jar.sha1 b/modules/repository-gcs/licenses/google-cloud-core-2.0.2.jar.sha1
@@ -0,0 +1 @@
+f877327228fa58875541bc55bc2fc434c0c3f520
diff --git a/modules/repository-gcs/licenses/google-cloud-core-http-1.95.4.jar.sha1 b/modules/repository-gcs/licenses/google-cloud-core-http-1.95.4.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-cloud-core-http-2.0.2.jar.sha1 b/modules/repository-gcs/licenses/google-cloud-core-http-2.0.2.jar.sha1
@@ -0,0 +1 @@
+b504ce662a6ff5a875492b49f770daaec64b4247
diff --git a/modules/repository-gcs/licenses/google-cloud-storage-1.117.1.jar.sha1 b/modules/repository-gcs/licenses/google-cloud-storage-1.117.1.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-cloud-storage-1.118.1.jar.sha1 b/modules/repository-gcs/licenses/google-cloud-storage-1.118.1.jar.sha1
@@ -0,0 +1 @@
+6e3dec53b3d7b2d560dc3f62dd3f711e0d7b4d44
diff --git a/modules/repository-gcs/licenses/google-oauth-client-1.31.5.jar.sha1 b/modules/repository-gcs/licenses/google-oauth-client-1.31.5.jar.sha1
diff --git a/modules/repository-gcs/licenses/google-oauth-client-1.34.1.jar.sha1 b/modules/repository-gcs/licenses/google-oauth-client-1.34.1.jar.sha1
@@ -0,0 +1 @@
+4a4f88c5e13143f882268c98239fb85c3b2c6cb2
diff --git a/modules/repository-gcs/licenses/gson-2.8.7.jar.sha1 b/modules/repository-gcs/licenses/gson-2.8.7.jar.sha1
diff --git a/modules/repository-gcs/licenses/gson-2.8.9.jar.sha1 b/modules/repository-gcs/licenses/gson-2.8.9.jar.sha1
@@ -0,0 +1 @@
+8a432c1d6825781e21a02db2e2c33c5fde2833b9
diff --git a/modules/repository-gcs/licenses/protobuf-java-3.17.3.jar.sha1 b/modules/repository-gcs/licenses/protobuf-java-3.17.3.jar.sha1
diff --git a/modules/repository-gcs/licenses/protobuf-java-3.21.1.jar.sha1 b/modules/repository-gcs/licenses/protobuf-java-3.21.1.jar.sha1
@@ -0,0 +1 @@
+2e396173a5b6ab549d790eba21c1d125bfe92912