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 14f6e3f [CXF-7900]follow up correction
14f6e3f is described below
commit 14f6e3f26c5dd3901f8029ef9e0045c5cdb39c1d
Author: Freeman Fang <[email protected]>
AuthorDate: Thu Nov 15 15:39:45 2018 +0800
[CXF-7900]follow up correction
---
parent/pom.xml | 2 +-
rt/bindings/soap/pom.xml | 2 +-
rt/frontend/jaxrs/pom.xml | 2 +-
rt/frontend/jaxws/pom.xml | 2 +-
rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 2 +-
rt/transports/http/pom.xml | 2 +-
rt/ws/security/pom.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 78fbf75..8299c88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -60,7 +60,7 @@
<cxf.osgi.spring.version>[3.1,5)</cxf.osgi.spring.version>
<cxf.osgi.spring.osgi.version>[1.2.0,2)</cxf.osgi.spring.osgi.version>
<cxf.osgi.slf4j.version>[1.5,2)</cxf.osgi.slf4j.version>
-
<cxf.osgi.javax.annotation.version>[0,2)</cxf.osgi.javax.annotation.version>
+
<cxf.osgi.javax.annotation.version>[1.2,2)</cxf.osgi.javax.annotation.version>
<cxf.osgi.javax.bind.version>[0,3)</cxf.osgi.javax.bind.version>
<cxf.osgi.javax.stream.version>[0,2)</cxf.osgi.javax.stream.version>
<cxf.osgi.javax.activation.version>[0,2)</cxf.osgi.javax.activation.version>
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index 39d88dc..4208520 100644
--- a/rt/bindings/soap/pom.xml
+++ b/rt/bindings/soap/pom.xml
@@ -34,7 +34,7 @@
<cxf.module.name>org.apache.cxf.binding.soap</cxf.module.name>
<cxf.osgi.import>
javax.xml.soap;version="${cxf.osgi.saaj.version}",
- javax.activation;version="${cxf.osgi.javax.annotation.version}",
+ javax.activation;version="${cxf.osgi.javax.activation.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}"
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index c0f52c7..c32b6e4 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -34,7 +34,7 @@
<cxf.module.name>org.apache.cxf.frontend.jaxrs</cxf.module.name>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
- javax.activation;version="${cxf.osgi.javax.annotation.version}",
+ javax.activation;version="${cxf.osgi.javax.activation.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
javax.validation*;resolution:=optional;version="${cxf.validation.api.package.version}",
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index 61ba09b..4e1fd0e 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -34,7 +34,7 @@
<cxf.module.name>org.apache.cxf.frontend.jaxws</cxf.module.name>
<cxf.osgi.import>
javax.xml.soap;version="${cxf.osgi.saaj.version}",
- javax.activation;version="${cxf.osgi.javax.annotation.version}",
+ javax.activation;version="${cxf.osgi.javax.activation.version}",
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
javax.xml.ws.spi.http;version="${cxf.osgi.javax.xml.ws.version}";resolution:="optional",
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
index fc1460a..80baff0 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
+++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
@@ -33,7 +33,7 @@
<properties>
<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.activation;version="${cxf.osgi.javax.activation.version}",
javax.annotation*;version="${cxf.osgi.javax.annotation.version}",
*
</cxf.osgi.import>
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 0ef9c10..656c2e2 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -40,7 +40,7 @@
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
org.osgi.service.http,
javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
- javax.activation;version="${cxf.osgi.javax.annotation.version}",
+ javax.activation;version="${cxf.osgi.javax.activation.version}",
com.sun.activation.registries;resolution:=optional
</cxf.osgi.import>
<cxf.osgi.export>
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 9685f52..c5828ef 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -34,7 +34,7 @@
<cxf.module.name>org.apache.cxf.ws.security</cxf.module.name>
<cxf.osgi.import>
javax.xml.soap;version="${cxf.osgi.saaj.version}",
- javax.activation;version="${cxf.osgi.javax.annotation.version}",
+ javax.activation;version="${cxf.osgi.javax.activation.version}",
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}",
