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 e0cb4fcc116932c2461f62f5d97c2a183c718cb1
Author: Alex Heneveld <[email protected]>
AuthorDate: Tue Nov 9 13:51:27 2021 +0000

    exclude javax.annotation-api from jclouds, because we use a different 
version
---
 locations/jclouds/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 365d903..dbfbd84 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -107,6 +107,11 @@
                     <groupId>javax.ws.rs</groupId>
                     <artifactId>jsr311-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- jclouds uses 1.2; we use 1.3.2 or 1.3.5 -->
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

Reply via email to