Skip to content
Permalink
Browse files
deps: fix UpperBoundsDep check for checker-qual (#941)
#939 switch guava from -android to -jre, which replaced the transitive dep checker-compat-qual with checker-qual. This introduced a version conflict between guava's transitive deps and truth's: gauva depends on version 3.8.0 while truth depends on 3.13.0. #939 tried to workaround the conflict by excluding the transitive dep from truth, but it didnt do it all places. This finishes the workaround.

I'm not convinced that this is the correct way to resolve the dependency conflict, but for now this PR just makes it consistent
  • Loading branch information
igorbernstein2 committed Aug 9, 2021
1 parent 57cddee commit 1d7c224bd46f8ab576645e5d722ac595ab875406
Showing with 12 additions and 0 deletions.
  1. +8 −0 google-cloud-bigtable-emulator/pom.xml
  2. +4 −0 google-cloud-bigtable/pom.xml
@@ -150,6 +150,14 @@
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
<exclusions>
<!-- TODO: consider a different approach -->
<!-- exclude to resolve conflict with guava -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
@@ -235,6 +235,8 @@
<artifactId>truth</artifactId>
<scope>test</scope>
<exclusions>
<!-- TODO: consider a different approach -->
<!-- exclude to resolve conflict with guava -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
@@ -246,6 +248,8 @@
<artifactId>truth-proto-extension</artifactId>
<scope>test</scope>
<exclusions>
<!-- TODO: consider a different approach -->
<!-- exclude to resolve conflict with guava -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>

0 comments on commit 1d7c224

Please sign in to comment.