Update google dependencies in repository-gcs and discovery-gce

Signed-off-by: Craig Perkins <[email protected]>

buildSrc/version.properties

@@ -22,6 +22,7 @@ antlr4            = 4.13.1
 guava             = 32.1.1-jre
 protobuf          = 3.22.3
 jakarta_annotation = 1.3.5
+google_http_client = 1.44.1
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.13.0

plugins/discovery-gce/build.gradle

@@ -17,16 +17,12 @@ opensearchplugin {
   classname 'org.opensearch.plugin.discovery.gce.GceDiscoveryPlugin'
 }
 
-versions << [
-  'google': '1.23.0'
-]
-
 dependencies {
-  api "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}"
-  api "com.google.api-client:google-api-client:${versions.google}"
+  api "com.google.apis:google-api-services-compute:v1-rev235-1.25.0"
+  api "com.google.api-client:google-api-client:2.4.0"
   api "com.google.oauth-client:google-oauth-client:1.35.0"
-  api "com.google.http-client:google-http-client:${versions.google}"
-  api "com.google.http-client:google-http-client-jackson2:${versions.google}"
+  api "com.google.http-client:google-http-client:${versions.google_http_client}"
+  api "com.google.http-client:google-http-client-jackson2:${versions.google_http_client}"
   api 'com.google.code.findbugs:jsr305:3.0.2'
   api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
   api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
@@ -64,11 +60,22 @@ thirdPartyAudit.ignoreMissingClasses(
   'org.apache.log.Hierarchy',
   'org.apache.log.Logger',
   'com.google.api.client.json.gson.GsonFactory',
+  'com.google.api.client.http.apache.v2.ApacheHttpTransport',
+  'com.google.auth.Credentials',
+  'com.google.auth.http.HttpCredentialsAdapter',
+  'com.google.common.base.Ascii',
+  'com.google.common.base.Joiner',
+  'com.google.common.base.MoreObjects',
+  'com.google.common.base.Objects',
+  'com.google.common.base.StandardSystemProperty',
   'com.google.common.base.Preconditions',
   'com.google.common.base.Splitter',
+  'com.google.common.base.Strings',
+  'com.google.common.base.Throwables',
   'com.google.common.cache.CacheBuilder',
   'com.google.common.cache.CacheLoader',
   'com.google.common.cache.LoadingCache',
+  'com.google.common.collect.ImmutableList',
   'com.google.common.collect.ImmutableMap',
   'com.google.common.collect.ImmutableMap$Builder',
   'com.google.common.collect.ImmutableSet',
@@ -77,4 +84,24 @@ thirdPartyAudit.ignoreMissingClasses(
   'com.google.common.collect.SortedMultiset',
   'com.google.common.collect.TreeMultiset',
   'com.google.common.io.BaseEncoding',
+  'com.google.common.io.ByteStreams',
+  'com.google.common.util.concurrent.ThreadFactoryBuilder',
+  'io.opencensus.common.Scope',
+  'io.opencensus.contrib.http.util.HttpPropagationUtil',
+  'io.opencensus.trace.AttributeValue',
+  'io.opencensus.trace.BlankSpan',
+  'io.opencensus.trace.EndSpanOptions',
+  'io.opencensus.trace.EndSpanOptions$Builder',
+  'io.opencensus.trace.MessageEvent',
+  'io.opencensus.trace.MessageEvent$Builder',
+  'io.opencensus.trace.MessageEvent$Type',
+  'io.opencensus.trace.Span',
+  'io.opencensus.trace.SpanBuilder',
+  'io.opencensus.trace.Status',
+  'io.opencensus.trace.Tracer',
+  'io.opencensus.trace.Tracing',
+  'io.opencensus.trace.export.ExportComponent',
+  'io.opencensus.trace.export.SampledSpanStore',
+  'io.opencensus.trace.propagation.TextFormat',
+  'io.opencensus.trace.propagation.TextFormat$Setter'
 )

plugins/discovery-gce/licenses/google-api-client-2.4.0.jar.sha1

@@ -0,0 +1 @@
+1fc68ff50f1ffca280393854385e1197faf798eb

plugins/discovery-gce/licenses/google-api-services-compute-v1-rev235-1.25.0.jar.sha1

@@ -0,0 +1 @@
+67bf1ac84286b4f9ea996a90f6e91e36dc648aff

plugins/discovery-gce/licenses/google-http-client-1.44.1.jar.sha1

@@ -0,0 +1 @@
+d8956bacb8a4011365fa15a690482c49a70c78c5

plugins/discovery-gce/licenses/google-http-client-jackson2-1.44.1.jar.sha1

@@ -0,0 +1 @@
+3f1947de0fd9eb250af16abe6103c11e68d11635

plugins/repository-gcs/build.gradle

@@ -75,10 +75,10 @@ dependencies {
   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.3'
-  api 'com.google.http-client:google-http-client-appengine:1.43.3'
-  api 'com.google.http-client:google-http-client-gson:1.43.3'
-  api 'com.google.http-client:google-http-client-jackson2:1.44.1'
+  api "com.google.http-client:google-http-client:${versions.google_http_client}"
+  api "com.google.http-client:google-http-client-appengine:${versions.google_http_client}"
+  api "com.google.http-client:google-http-client-gson:${versions.google_http_client}"
+  api "com.google.http-client:google-http-client-jackson2:${versions.google_http_client}"
 
   api 'com.google.oauth-client:google-oauth-client:1.34.1'
 

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

@@ -0,0 +1 @@
+d8956bacb8a4011365fa15a690482c49a70c78c5

plugins/repository-gcs/licenses/google-http-client-appengine-1.44.1.jar.sha1

@@ -0,0 +1 @@
+da4f9f691edb7a9f00cd806157a4990cb7e07711

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

@@ -0,0 +1 @@
+f3b8967c6f7078da6380687859d0873105f84d39