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-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 8742cb9 minor fix to karaf wiring to fix build problem
8742cb9 is described below
commit 8742cb951081c354dcac273427d51cdb4db0150d
Author: Alex Heneveld <[email protected]>
AuthorDate: Mon Aug 10 12:25:05 2020 +0100
minor fix to karaf wiring to fix build problem
without this it complains karaf wants annotation-api 1.3.1 whereas we pull
in 1.3.2
---
ui-modules/features/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ui-modules/features/pom.xml b/ui-modules/features/pom.xml
index 0545017..ac37cc0 100644
--- a/ui-modules/features/pom.xml
+++ b/ui-modules/features/pom.xml
@@ -37,6 +37,13 @@
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<type>kar</type>
+ <exclusions>
+ <!-- pulled in below at our preferred version (more recent) -->
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
