[brooklyn-server] branch master updated: BROOKLYN-608: fix karaf start (javax.annotation-api version)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

duncangrant 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 415dc72  BROOKLYN-608: fix karaf start (javax.annotation-api version)
     new 0aed8ba  Merge pull request #1031 from aledsage/fix-karaf-startup
415dc72 is described below

commit 415dc7274b874ec6d45fe9cac54bb5ac122a9fae
Author: Aled Sage <al...@gmail.com>
AuthorDate: Fri Jan 25 12:56:52 2019 +0000

    BROOKLYN-608: fix karaf start (javax.annotation-api version)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b2c22ca..d70f617 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
         <commons-beanutils.version>1.9.3</commons-beanutils.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <javax.mail.version>1.4.4</javax.mail.version>
-        <cxf.javax.annotation-api.version>1.2</cxf.javax.annotation-api.version>
+        <cxf.javax.annotation-api.version>1.3</cxf.javax.annotation-api.version> <!-- cxf-specs feature v3.2.7 declares v1.3 (as does org.apache.cxf:cxf-rt-frontend-jaxrs), but karaf 4.2.2 has 1.2 -->
         <plantuml.version>6121</plantuml.version>
 
         <!-- Test dependencies -->