[brooklyn-server] branch master updated: exclude a weird source of Nullable and NonNull annotations pulled in by guava

[heneveld]

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


The following commit(s) were added to refs/heads/master by this push:
     new fd18cd98dd exclude a weird source of Nullable and NonNull annotations 
pulled in by guava
fd18cd98dd is described below

commit fd18cd98dd5f56e3dd1b3e38b326d2df6daa8356
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Fri Jun 2 14:04:30 2023 +0100

    exclude a weird source of Nullable and NonNull annotations pulled in by 
guava
---
 .../brooklyn/util/core/xstream/TransformedMapConverterTest.java   | 3 ++-
 pom.xml                                                           | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java
 
b/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java
index d6617c116e..4c0df82692 100644
--- 
a/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java
+++ 
b/core/src/test/java/org/apache/brooklyn/util/core/xstream/TransformedMapConverterTest.java
@@ -27,9 +27,10 @@ import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.collections.MutableList;
 import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.collections.MutableSet;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.testng.annotations.Test;
 
+import javax.annotation.Nullable;
+
 public class TransformedMapConverterTest extends ConverterTestFixture {
 
     @Override
diff --git a/pom.xml b/pom.xml
index bbb86ad9d2..773d82a318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,6 +357,14 @@
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- we use javax annotations instead, so don't pull 
this in;
+                             it only has design time annotations so isn't 
needed for running -->
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>