Skip to content

Commit 673b14e

Browse files
dep: fix UpperBoundsDep check for checker-qual
googleapis#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. googleapis#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
1 parent 57cddee commit 673b14e

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

google-cloud-bigtable-emulator/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,14 @@
150150
<groupId>com.google.truth</groupId>
151151
<artifactId>truth</artifactId>
152152
<scope>test</scope>
153+
<exclusions>
154+
<!-- TODO: consider a different approach -->
155+
<!-- exclude to resolve conflict with guava -->
156+
<exclusion>
157+
<groupId>org.checkerframework</groupId>
158+
<artifactId>checker-qual</artifactId>
159+
</exclusion>
160+
</exclusions>
153161
</dependency>
154162

155163
<dependency>

google-cloud-bigtable/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@
235235
<artifactId>truth</artifactId>
236236
<scope>test</scope>
237237
<exclusions>
238+
<!-- TODO: consider a different approach -->
239+
<!-- exclude to resolve conflict with guava -->
238240
<exclusion>
239241
<groupId>org.checkerframework</groupId>
240242
<artifactId>checker-qual</artifactId>
@@ -246,6 +248,8 @@
246248
<artifactId>truth-proto-extension</artifactId>
247249
<scope>test</scope>
248250
<exclusions>
251+
<!-- TODO: consider a different approach -->
252+
<!-- exclude to resolve conflict with guava -->
249253
<exclusion>
250254
<groupId>org.checkerframework</groupId>
251255
<artifactId>checker-qual</artifactId>

0 commit comments

Comments
 (0)