diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-21 11:34:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 11:34:31 +0200 |
| commit | 82c3efe6a1939bca286db9e77b6ac427e2c4b03c (patch) | |
| tree | d5831d0cbe0b3e0db352cf3a2bd2b2db014417f6 | |
| parent | c0c7d649f1340adc8e614db8f7156e89b7f95314 (diff) | |
| parent | 7eb1b35fcf873cff108be7f62f4e69aec4508cc0 (diff) | |
Merge pull request #23181 from vespa-engine/jonmv/exclude-guava-from-airlift
Exclude guava from airlift in container-test, so we get the one from …
| -rw-r--r-- | container-test/pom.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/container-test/pom.xml b/container-test/pom.xml index a938329dd72..ab5a2dc3612 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -61,6 +61,11 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>annotations</artifactId> </exclusion> + <exclusion> + <!-- We want the declaration from our parent, not the one in airlift --> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |