You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2018/01/12 13:39:03 UTC
[cxf] branch master updated: Fix running on java9,
set the import version for javax.annotation
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 5786df8 Fix running on java9, set the import version for javax.annotation
5786df8 is described below
commit 5786df8619807edefc1b463c1820a70efd868cbd
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Jan 12 08:31:08 2018 -0500
Fix running on java9, set the import version for javax.annotation
---
rt/rs/microprofile-client/pom.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml
index 5a04a9e..b125470 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -33,7 +33,8 @@
<properties>
<cxf.osgi.import>
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
- org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
+ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+ javax.annotation;version="[1.2,2)"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
@@ -111,6 +112,12 @@
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-tck</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
@@ -119,7 +126,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].