From 57cddee445dec91a8bb96127ee7db947a1e13a7d Mon Sep 17 00:00:00 2001
From: kolea2 <45548808+kolea2@users.noreply.github.com>
Date: Fri, 6 Aug 2021 16:13:08 -0400
Subject: [PATCH] =?UTF-8?q?feat!:=20update=20java=20compile=20to=201.8=20(?=
 =?UTF-8?q?update=20google-cloud-shared-config=20=E2=80=A6=20(#939)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat!: update java compile to 1.8 (update google-cloud-shared-config to v1, google-cloud-shared-dependencies to v2)

* fix tests
---
 google-cloud-bigtable-deps-bom/pom.xml               |  2 +-
 google-cloud-bigtable/pom.xml                        | 12 ++++++++++++
 .../data/v2/BigtableDataClientFactoryTest.java       |  2 +-
 pom.xml                                              |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index 65960ce58..7c7d51f41 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -65,7 +65,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>1.4.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 5801bc1c7..6f58f5e3f 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -234,11 +234,23 @@
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.checkerframework</groupId>
+          <artifactId>checker-qual</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-proto-extension</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.checkerframework</groupId>
+          <artifactId>checker-qual</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactoryTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactoryTest.java
index 949f5139b..fd75bed95 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactoryTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactoryTest.java
@@ -129,7 +129,7 @@ public void transportTerminated(Attributes transportAttrs) {
         Mockito.mock(
             ExecutorProvider.class,
             new BuilderAnswer<>(
-                ExecutorProvider.class, builder.stubSettings().getExecutorProvider()));
+                ExecutorProvider.class, builder.stubSettings().getBackgroundExecutorProvider()));
 
     watchdogProvider =
         Mockito.mock(
diff --git a/pom.xml b/pom.xml
index 273c83c84..de1c398dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-config</artifactId>
-        <version>0.13.1</version>
+        <version>1.0.0</version>
     </parent>
 
     <developers>