Skip to content

Commit 21ea0b6

Browse files
test: fix dependency conflict in integration tests (#4429)
bigtable-hbase-*-integration-tests declare a dependency on truth assertion library. truth has a transitive dependency on guava-*-android. Because of maven's dependency resolution, this dependency overrides the guava version that bigtable-hbase & java-bigtable need which is the jre version of guava. To mitigate the conflict, this change excludes truth's transitive dep on guava Change-Id: Iea16d837f71d2b4f8f037fa870fa871dcc2fb64b
1 parent f244ff9 commit 21ea0b6

File tree

3 files changed

+24
-0
lines changed
  • bigtable-client-core-parent/bigtable-hbase-integration-tests-common
  • bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests
  • bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests

3 files changed

+24
-0
lines changed

bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ limitations under the License.
9999
<artifactId>truth</artifactId>
100100
<version>${truth.version}</version>
101101
<scope>test</scope>
102+
<exclusions>
103+
<!-- truth depends on -android variant of guava, which conflicts with the guava version that
104+
we use in the client -->
105+
<exclusion>
106+
<groupId>com.google.guava</groupId>
107+
<artifactId>guava</artifactId>
108+
</exclusion>
109+
</exclusions>
102110
</dependency>
103111
</dependencies>
104112

bigtable-hbase-1.x-parent/bigtable-hbase-1.x-integration-tests/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,14 @@ limitations under the License.
522522
<artifactId>truth</artifactId>
523523
<version>${truth.version}</version>
524524
<scope>test</scope>
525+
<exclusions>
526+
<!-- truth depends on -android variant of guava, which conflicts with the guava version that
527+
we use in the client -->
528+
<exclusion>
529+
<groupId>com.google.guava</groupId>
530+
<artifactId>guava</artifactId>
531+
</exclusion>
532+
</exclusions>
525533
</dependency>
526534
</dependencies>
527535

bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,14 @@ limitations under the License.
493493
<artifactId>truth</artifactId>
494494
<version>${truth.version}</version>
495495
<scope>test</scope>
496+
<exclusions>
497+
<!-- truth depends on -android variant of guava, which conflicts with the guava version that
498+
we use in the client -->
499+
<exclusion>
500+
<groupId>com.google.guava</groupId>
501+
<artifactId>guava</artifactId>
502+
</exclusion>
503+
</exclusions>
496504
</dependency>
497505
</dependencies>
498506

0 commit comments

Comments
 (0)