Update google-auth-library to 0.16.1 and import using new bom (#5413)

chingor13 · web-flow · commit 23347a7be4c2 · 2019-06-07T12:57:46.000-07:00
* Update google-auth-library to 0.16.0 and import using new bom

* Use the right project properties

* Update google-http-client version and pin objc2-annotations

Necessary for dependency conversion.

* Remove dependency on apache httpclient.

We were only using it for an HTTP status code constant.

* Use google-auth-library 0.16.1
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -31,11 +31,6 @@
       <artifactId>google-api-services-storage</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${apache.httpclient.version}</version>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -81,14 +81,16 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import org.apache.http.HttpStatus;
 
 public class HttpStorageRpc implements StorageRpc {
   public static final String DEFAULT_PROJECTION = "full";
   public static final String NO_ACL_PROJECTION = "noAcl";
   private static final String ENCRYPTION_KEY_PREFIX = "x-goog-encryption-";
   private static final String SOURCE_ENCRYPTION_KEY_PREFIX = "x-goog-copy-source-encryption-";
 
+  // declare this HttpStatus code here as it's not included in java.net.HttpURLConnection
+  private static final int SC_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+
   private final StorageOptions options;
   private final Storage storage;
   private final Tracer tracer = Tracing.getTracer();
@@ -688,7 +690,7 @@ public Tuple<String, byte[]> read(
     } catch (IOException ex) {
       span.setStatus(Status.UNKNOWN.withDescription(ex.getMessage()));
       StorageException serviceException = translate(ex);
-      if (serviceException.getCode() == HttpStatus.SC_REQUESTED_RANGE_NOT_SATISFIABLE) {
+      if (serviceException.getCode() == SC_REQUESTED_RANGE_NOT_SATISFIABLE) {
         return Tuple.of(null, new byte[0]);
       }
       throw serviceException;
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
@@ -158,12 +158,12 @@
     <!-- make sure to keep gax version in sync with google-cloud-bom -->
     <gax.version>1.45.0</gax.version>
     <api.common.java.version>1.8.1</api.common.java.version>
-    <google.auth.version>0.15.0</google.auth.version>
+    <google.auth.version>0.16.1</google.auth.version>
     <grpc.version>1.21.0</grpc.version>
     <!-- We are currently using the *-android version to support JDK7. -->
     <guava.version>27.1-android</guava.version>
-    <http-client-bom.version>1.29.2</http-client-bom.version>
-    <oauth-client.version>1.29.2</oauth-client.version>
+    <http-client-bom.version>1.30.1</http-client-bom.version>
+    <oauth-client.version>1.30.1</oauth-client.version>
     <protobuf.version>3.7.1</protobuf.version>
     <!-- make sure to keep opencensus version in sync with grpc -->
     <opencensus.version>0.21.0</opencensus.version>
@@ -212,6 +212,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.auth</groupId>
+        <artifactId>google-auth-library-bom</artifactId>
+        <version>${google.auth.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.apis</groupId>
         <artifactId>google-api-services-bigquery</artifactId>
@@ -233,6 +240,13 @@
         <version>v1-rev20190418-1.28.0</version>
       </dependency>
 
+      <!-- TODO(chingor): Remove this when http-client and guava converge -->
+      <dependency>
+        <groupId>com.google.j2objc</groupId>
+        <artifactId>j2objc-annotations</artifactId>
+        <version>1.3</version>
+      </dependency>
+
       <!-- TODO(chingor): Remove this when grpc and guava converge -->
       <dependency>
         <groupId>org.codehaus.mojo</groupId>
@@ -337,16 +351,6 @@
         <artifactId>auto-value</artifactId>
         <version>1.4</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.auth</groupId>
-        <artifactId>google-auth-library-credentials</artifactId>
-        <version>${google.auth.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.auth</groupId>
-        <artifactId>google-auth-library-oauth2-http</artifactId>
-        <version>${google.auth.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-api</artifactId>
