Use apache client in GCS repository

Author: nicktindall

gradle/verification-metadata.xml

@@ -699,6 +699,11 @@
             <sha256 value="e395dd1765e3e6bceb0c610706bcf4128de84bd6e65cf1d4adbf998b4114161c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.http-client" name="google-http-client-apache-v2" version="1.42.3">
+         <artifact name="google-http-client-apache-v2-1.42.3.jar">
+            <sha256 value="86d112c6f7e55c8f6d1bfbd47a02d25afd072c60a80dea8ef616fba278637600" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.http-client" name="google-http-client-appengine" version="1.42.3">
          <artifact name="google-http-client-appengine-1.42.3.jar">
             <sha256 value="3a876b1f704ac6d8500b8430b288dbce78c52dc18c43c008a587a7377bb81e2e" origin="Generated by Gradle"/>

modules/repository-gcs/build.gradle

@@ -52,9 +52,9 @@ dependencies {
   api 'io.opencensus:opencensus-api:0.31.1'
   api 'io.opencensus:opencensus-contrib-http-util:0.31.1'
   api 'com.google.apis:google-api-services-storage:v1-rev20220705-2.0.0'
-
-  testImplementation "org.apache.httpcomponents:httpclient:${versions.httpclient}"
-  testImplementation "org.apache.httpcomponents:httpcore:${versions.httpcore}"
+  api 'com.google.http-client:google-http-client-apache-v2:1.42.3'
+  api "org.apache.httpcomponents:httpclient:${versions.httpclient}"
+  api "org.apache.httpcomponents:httpcore:${versions.httpcore}"
 
   testImplementation project(':test:fixtures:gcs-fixture')
   yamlRestTestImplementation project(':test:fixtures:gcs-fixture')
@@ -103,7 +103,6 @@ tasks.named("thirdPartyAudit").configure {
   )
 
   ignoreMissingClasses(
-    'com.google.api.client.http.apache.v2.ApacheHttpTransport',
     'com.google.appengine.api.datastore.Blob',
     'com.google.appengine.api.datastore.DatastoreService',
     'com.google.appengine.api.datastore.DatastoreServiceFactory',
@@ -129,48 +128,6 @@ tasks.named("thirdPartyAudit").configure {
     'org.apache.log.Logger',
     'javax.jms.Message',
 
-    // optional apache http client dependencies
-    'org.apache.http.ConnectionReuseStrategy',
-    'org.apache.http.Header',
-    'org.apache.http.HttpEntity',
-    'org.apache.http.HttpEntityEnclosingRequest',
-    'org.apache.http.HttpHost',
-    'org.apache.http.HttpRequest',
-    'org.apache.http.HttpResponse',
-    'org.apache.http.HttpVersion',
-    'org.apache.http.RequestLine',
-    'org.apache.http.StatusLine',
-    'org.apache.http.client.AuthenticationHandler',
-    'org.apache.http.client.HttpClient',
-    'org.apache.http.client.HttpRequestRetryHandler',
-    'org.apache.http.client.RedirectHandler',
-    'org.apache.http.client.RequestDirector',
-    'org.apache.http.client.UserTokenHandler',
-    'org.apache.http.client.methods.HttpEntityEnclosingRequestBase',
-    'org.apache.http.client.methods.HttpRequestBase',
-    'org.apache.http.config.Registry',
-    'org.apache.http.config.RegistryBuilder',
-    'org.apache.http.conn.ClientConnectionManager',
-    'org.apache.http.conn.ConnectionKeepAliveStrategy',
-    'org.apache.http.conn.params.ConnManagerParams',
-    'org.apache.http.conn.params.ConnRouteParams',
-    'org.apache.http.conn.routing.HttpRoutePlanner',
-    'org.apache.http.conn.scheme.PlainSocketFactory',
-    'org.apache.http.conn.scheme.SchemeRegistry',
-    'org.apache.http.conn.socket.PlainConnectionSocketFactory',
-    'org.apache.http.conn.ssl.SSLSocketFactory',
-    'org.apache.http.conn.ssl.X509HostnameVerifier',
-    'org.apache.http.entity.AbstractHttpEntity',
-    'org.apache.http.impl.client.DefaultHttpClient',
-    'org.apache.http.impl.client.HttpClientBuilder',
-    'org.apache.http.impl.conn.PoolingHttpClientConnectionManager',
-    'org.apache.http.params.HttpConnectionParams',
-    'org.apache.http.params.HttpParams',
-    'org.apache.http.params.HttpProtocolParams',
-    'org.apache.http.protocol.HttpContext',
-    'org.apache.http.protocol.HttpProcessor',
-    'org.apache.http.protocol.HttpRequestExecutor',
-
     // commons-logging provided dependencies
     'javax.servlet.ServletContextEvent',
     'javax.servlet.ServletContextListener'