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 7e82f0a39aecf3bd8f0e86bc309cf90ad7917e91 Author: Alex Heneveld <[email protected]> AuthorDate: Mon Jun 1 11:23:22 2020 +0100 fix exclusion of dev-only findbugs --- core/pom.xml | 10 ---------- parent/pom.xml | 26 ++++++++++++++++++++++++-- server-cli/pom.xml | 7 ------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 78141d8..dc83e2e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -107,16 +107,6 @@ <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index cddae43..ff53114 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -412,8 +412,18 @@ <version>${reflections.version}</version> <exclusions> <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> + <!-- different version, and LGPL, and only needed to compile --> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + <exclusion> + <!-- different version --> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> </exclusion> </exclusions> </dependency> @@ -436,6 +446,18 @@ <groupId>io.airlift</groupId> <artifactId>airline</artifactId> <version>${airline.version}</version> + <exclusions> + <exclusion> + <!-- LGPL, and only needed to compile --> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + <exclusion> + <!-- we use different version --> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.whirr</groupId> diff --git a/server-cli/pom.xml b/server-cli/pom.xml index f645250..78981fb 100644 --- a/server-cli/pom.xml +++ b/server-cli/pom.xml @@ -58,13 +58,6 @@ <dependency> <groupId>io.airlift</groupId> <artifactId>airline</artifactId> - <version>${airline.version}</version> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.guava</groupId>
