Skip to content

Commit

Permalink
feat!: update java compile to 1.8 (update google-cloud-shared-config … (
Browse files Browse the repository at this point in the history
#939)

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

* fix tests
  • Loading branch information
kolea2 authored Aug 6, 2021
1 parent 3ec05d4 commit 57cddee
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion google-cloud-bigtable-deps-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 12 additions & 0 deletions google-cloud-bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 57cddee

Please sign in to comment.