From 291189cec8e9d166fb8df9d26a6381be9cbded9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Fri, 26 Jun 2020 01:47:52 +0200
Subject: [PATCH] deps: upgrade to latest bom and remove dependency exclusions
 (#168)

* deps: upgrade to latest bom + Spanner

* deps: spanner dependency first

* deps: remove ignored deps

* deps: libraries-bom-8
---
 pom.xml | 42 +-----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4657029c..de92a184 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,6 @@
   <properties>
     <site.installationModule>google-cloud-spanner-jdbc</site.installationModule>
     <junit.version>4.13</junit.version>
-    <spanner.test.version>1.53.0</spanner.test.version>
     <findbugs.version>3.0.2</findbugs.version>
     <threeten.version>1.4.4</threeten.version>
     <truth.version>1.0.1</truth.version>
@@ -72,7 +71,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>7.0.1</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -101,17 +100,6 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <!-- Excluded to prevent version conflicts -->
-      <exclusions>
-        <exclusion>
-          <groupId>io.grpc</groupId>
-          <artifactId>grpc-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.cloud</groupId>
-          <artifactId>google-cloud-core-grpc</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -166,33 +154,8 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>${spanner.test.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
-      <!-- TODO: remove when Spanner 1.55.2 is released -->
-      <exclusions>
-        <exclusion>
-          <groupId>io.opencensus</groupId>
-          <artifactId>opencensus-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.opencensus</groupId>
-          <artifactId>opencensus-contrib-grpc-util</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- TODO: remove when Spanner 1.55.2 is released -->
-    <dependency>
-      <groupId>io.opencensus</groupId>
-      <artifactId>opencensus-api</artifactId>
-      <version>0.24.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.opencensus</groupId>
-      <artifactId>opencensus-contrib-grpc-util</artifactId>
-      <version>0.24.0</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
@@ -352,9 +315,6 @@
               <ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredDependency>
               <ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1</ignoredDependency>
               <ignoredDependency>com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1</ignoredDependency>
-              <!-- TODO: remove when Spanner 1.55.2 is released -->
-              <ignoredDependency>io.opencensus:opencensus-api</ignoredDependency>
-              <ignoredDependency>io.opencensus:opencensus-contrib-grpc-util</ignoredDependency>
             </ignoredUnusedDeclaredDependencies>
           </configuration>
         </plugin>