This is an automated email from the ASF dual-hosted git repository.
ffang 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 2c7d90e [CXF-7900]explicitly specify Import-Package javax.annotation
version range
2c7d90e is described below
commit 2c7d90e86e29000111b5551d21400f71f8383105
Author: Freeman Fang <[email protected]>
AuthorDate: Thu Nov 15 12:01:30 2018 +0800
[CXF-7900]explicitly specify Import-Package javax.annotation version range
---
rt/bindings/corba/pom.xml | 3 ++-
rt/frontend/jaxrs/pom.xml | 3 ++-
rt/frontend/jaxws/pom.xml | 3 ++-
rt/management/pom.xml | 3 ++-
rt/rs/client/pom.xml | 3 ++-
rt/rs/description-swagger-ui/pom.xml | 4 ++++
rt/rs/microprofile-client/pom.xml | 2 +-
rt/rs/security/cors/pom.xml | 4 ++++
rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 1 +
rt/rs/security/oauth-parent/oauth2/pom.xml | 3 ++-
rt/rs/security/sso/oidc/pom.xml | 4 ++++
rt/rs/security/sso/saml/pom.xml | 3 ++-
rt/transports/http-jetty/pom.xml | 3 ++-
rt/transports/http-undertow/pom.xml | 3 ++-
rt/ws/eventing/pom.xml | 3 ++-
rt/ws/policy/pom.xml | 3 ++-
rt/ws/rm/pom.xml | 3 ++-
rt/ws/security/pom.xml | 3 ++-
rt/wsdl/pom.xml | 3 ++-
testutils/pom.xml | 3 ++-
20 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml
index f9a226a..4788f32 100644
--- a/rt/bindings/corba/pom.xml
+++ b/rt/bindings/corba/pom.xml
@@ -35,7 +35,8 @@
<cxf.checkstyle.extension>-corba</cxf.checkstyle.extension>
<cxf.osgi.import>
org.objectweb.asm*;version="${cxf.osgi.asm.version}",
- javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}"
+ javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index ed4ffe8..c0f52c7 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -40,7 +40,8 @@
javax.validation*;resolution:=optional;version="${cxf.validation.api.package.version}",
javax.ws.rs.client;version="[2.0,3)",
javax.ws.rs*;version="[1.0,3)",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<cxf.osgi.export>
org.apache.cxf.jaxrs*
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index 768aea7..61ba09b 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -40,7 +40,8 @@
javax.xml.ws.spi.http;version="${cxf.osgi.javax.xml.ws.version}";resolution:="optional",
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/management/pom.xml b/rt/management/pom.xml
index 70cd4b2..fd71799 100644
--- a/rt/management/pom.xml
+++ b/rt/management/pom.xml
@@ -33,7 +33,8 @@
<properties>
<cxf.module.name>org.apache.cxf.management</cxf.module.name>
<cxf.osgi.import>
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index 4708ccc..8131e95 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -34,7 +34,8 @@
<cxf.module.name>org.apache.cxf.rs.client</cxf.module.name>
<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="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/rs/description-swagger-ui/pom.xml
b/rt/rs/description-swagger-ui/pom.xml
index 5502224..6f1d40a 100644
--- a/rt/rs/description-swagger-ui/pom.xml
+++ b/rt/rs/description-swagger-ui/pom.xml
@@ -32,6 +32,10 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.rs.swagger.ui</cxf.module.name>
+ <cxf.osgi.import>
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
+ *
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/rt/rs/microprofile-client/pom.xml
b/rt/rs/microprofile-client/pom.xml
index d057d91..c072b6f 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -35,7 +35,7 @@
<cxf.osgi.import>
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- javax.annotation;version="[1.2,2)"
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/rs/security/cors/pom.xml b/rt/rs/security/cors/pom.xml
index a2e1204..efef8da 100644
--- a/rt/rs/security/cors/pom.xml
+++ b/rt/rs/security/cors/pom.xml
@@ -32,6 +32,10 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.rs.security.cors</cxf.module.name>
+ <cxf.osgi.import>
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
+ *
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
index e062092..fc1460a 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
+++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
@@ -34,6 +34,7 @@
<cxf.module.name>org.apache.cxf.rs.security.jose.jaxrs</cxf.module.name>
<cxf.osgi.import>
javax.activation;version="${cxf.osgi.javax.annotation.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
*
</cxf.osgi.import>
</properties>
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 13dc4a3..706eb68 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -35,7 +35,8 @@
<cxf.osgi.import>
net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<compilerArguments>-Aopenjpa.source=7
-Aopenjpa.metamodel=true</compilerArguments>
</properties>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index 137656d..3c11c82 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -33,6 +33,10 @@
<properties>
<compilerArguments>-Aopenjpa.source=7
-Aopenjpa.metamodel=true</compilerArguments>
<cxf.module.name>org.apache.cxf.rs.security.sso.oidc</cxf.module.name>
+ <cxf.osgi.import>
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
+ *
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/rt/rs/security/sso/saml/pom.xml b/rt/rs/security/sso/saml/pom.xml
index d18ae0a..d9ae6a6 100644
--- a/rt/rs/security/sso/saml/pom.xml
+++ b/rt/rs/security/sso/saml/pom.xml
@@ -36,7 +36,8 @@
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml
index 08d352c..12dc65f 100644
--- a/rt/transports/http-jetty/pom.xml
+++ b/rt/transports/http-jetty/pom.xml
@@ -39,7 +39,8 @@
org.osgi.service.blueprint*;resolution:=optional,
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<cxf.osgi.dynamic.import>
org.eclipse.jetty.jmx
diff --git a/rt/transports/http-undertow/pom.xml
b/rt/transports/http-undertow/pom.xml
index cb9fb80..6558134 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -39,7 +39,8 @@
org.osgi.service.blueprint*;resolution:=optional,
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index 6debe01..96372c2 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -17,7 +17,8 @@
<cxf.osgi.import>
javax.xml.soap;version="${cxf.osgi.saaj.version}",
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index 1e700f1..99f6f51 100644
--- a/rt/ws/policy/pom.xml
+++ b/rt/ws/policy/pom.xml
@@ -36,7 +36,8 @@
<cxf.osgi.import>
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index e929985..eb4078f 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -37,7 +37,8 @@
javax.xml.soap;version="${cxf.osgi.saaj.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index d9212f3..9685f52 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -38,7 +38,8 @@
net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml
index 3498892..eb966eb 100644
--- a/rt/wsdl/pom.xml
+++ b/rt/wsdl/pom.xml
@@ -33,7 +33,8 @@
<properties>
<cxf.module.name>org.apache.cxf.wsdl</cxf.module.name>
<cxf.osgi.import>
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/testutils/pom.xml b/testutils/pom.xml
index d8ec6a7..f00034d 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -35,7 +35,8 @@
<cxf.osgi.import>
javax.xml.soap;version="${cxf.osgi.saaj.version}",
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.annotation*;version="${cxf.osgi.javax.annotation.version}"
</cxf.osgi.import>
</properties>
<dependencies>
