This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 4220a780937e2e442f0d0ec0740dc88b554a0200 Author: Alex Heneveld <[email protected]> AuthorDate: Tue Nov 9 13:08:59 2021 +0000 adjust "animal-sniffer" conflicting version between guava and felix --- pom.xml | 1 + utils/rt-felix/pom.xml | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index bcbeb0a..7a9c223 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,7 @@ For example jclouds is sensitive, as might be jackson-datatype-guava (might want 16-20?). --> <guava-swagger.version>${guava.version}</guava-swagger.version> + <animal-sniffer.version>1.17</animal-sniffer.version> <!-- guava version; overridden when pulling in felix --> <failureaccess.version>1.0.1</failureaccess.version> <!-- xstream --> diff --git a/utils/rt-felix/pom.xml b/utils/rt-felix/pom.xml index 6c81d27..a791d6d 100644 --- a/utils/rt-felix/pom.xml +++ b/utils/rt-felix/pom.xml @@ -36,6 +36,18 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> <version>${felix.framework.version}</version> + <exclusions> + <exclusion> + <!-- different version pulled in by guava, and below --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + <version>${animal-sniffer.version}</version> </dependency> <dependency> <groupId>org.apache.brooklyn</groupId>
