You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2018/10/16 04:25:40 UTC
[cxf] branch master updated: [CXF-7872]more clean up
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 bbd28b4 [CXF-7872]more clean up
new a97a7c3 Merge branch 'master' of github.com:apache/cxf
bbd28b4 is described below
commit bbd28b4e7e38ac27d4ea941b703d5a253ceb4e48
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Oct 16 12:24:26 2018 +0800
[CXF-7872]more clean up
---
parent/pom.xml | 14 +++++++-------
rt/bindings/soap/pom.xml | 4 +++-
rt/bindings/xml/pom.xml | 3 +++
rt/frontend/jaxrs/pom.xml | 2 ++
rt/frontend/jaxws/pom.xml | 4 +++-
rt/frontend/simple/pom.xml | 3 ++-
rt/management/pom.xml | 3 +++
rt/rs/description/pom.xml | 1 +
rt/rs/extensions/providers/pom.xml | 1 +
rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 4 ++++
rt/rs/security/oauth-parent/oauth/pom.xml | 1 +
rt/rs/security/oauth-parent/oauth2/pom.xml | 3 ++-
rt/rs/security/sso/saml/pom.xml | 1 +
rt/transports/http-jetty/pom.xml | 3 ++-
rt/transports/http-netty/netty-server/pom.xml | 3 ++-
rt/transports/http-undertow/pom.xml | 3 ++-
rt/transports/http/pom.xml | 7 +++++--
rt/transports/jms/pom.xml | 5 ++++-
rt/ws/addr/pom.xml | 1 +
rt/ws/eventing/pom.xml | 1 +
rt/ws/mex/pom.xml | 1 +
rt/ws/policy/pom.xml | 3 ++-
rt/ws/rm/pom.xml | 3 ++-
rt/ws/security/pom.xml | 4 +++-
rt/wsdl/pom.xml | 3 +++
services/sts/sts-core/pom.xml | 1 +
services/ws-discovery/ws-discovery-api/pom.xml | 1 +
.../org/apache/cxf/xkms/itests/BasicIntegrationTest.java | 9 ++++++++-
testutils/pom.xml | 1 +
tools/common/pom.xml | 3 +++
tools/corba/pom.xml | 3 +++
tools/javato/ws/pom.xml | 1 +
tools/wsdlto/core/pom.xml | 3 +++
tools/wsdlto/frontend/jaxws/pom.xml | 1 +
34 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5c51b88..f78db53 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -60,13 +60,13 @@
<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.0,2)</cxf.osgi.javax.annotation.version>
- <cxf.osgi.javax.bind.version>[0.0,3)</cxf.osgi.javax.bind.version>
- <cxf.osgi.javax.stream.version>[0.0,2)</cxf.osgi.javax.stream.version>
- <cxf.osgi.javax.activation.version>[0.0,2)</cxf.osgi.javax.activation.version>
- <cxf.osgi.javax.mail.version>[0.0,2)</cxf.osgi.javax.mail.version>
- <cxf.osgi.javax.servlet.version>[0.0,4.1)</cxf.osgi.javax.servlet.version>
- <cxf.osgi.javax.xml.ws.version>[0.0,3)</cxf.osgi.javax.xml.ws.version>
+ <cxf.osgi.javax.annotation.version>[0,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>
+ <cxf.osgi.javax.mail.version>[0,2)</cxf.osgi.javax.mail.version>
+ <cxf.osgi.javax.servlet.version>[0,4.1)</cxf.osgi.javax.servlet.version>
+ <cxf.osgi.javax.xml.ws.version>[0,3)</cxf.osgi.javax.xml.ws.version>
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1.3</cxf.abdera.version>
<cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index 7d4335e..39d88dc 100644
--- a/rt/bindings/soap/pom.xml
+++ b/rt/bindings/soap/pom.xml
@@ -34,8 +34,10 @@
<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}",
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.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<cxf.bundle.activator>org.apache.cxf.binding.soap.blueprint.Activator</cxf.bundle.activator>
<!-- keep in sync with services exported in activator -->
diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml
index a409d56..b8224b7 100644
--- a/rt/bindings/xml/pom.xml
+++ b/rt/bindings/xml/pom.xml
@@ -32,6 +32,9 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.binding.xml</cxf.module.name>
+ <cxf.osgi.import>
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index d0fd505..ed4ffe8 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -34,11 +34,13 @@
<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}",
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}",
javax.ws.rs.client;version="[2.0,3)",
javax.ws.rs*;version="[1.0,3)",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.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 46667a9..768aea7 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -34,11 +34,13 @@
<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.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",
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
- org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
+ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml
index 0f8a401..4ca6711 100644
--- a/rt/frontend/simple/pom.xml
+++ b/rt/frontend/simple/pom.xml
@@ -35,7 +35,8 @@
<cxf.osgi.import>
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
com.sun.tools*;resolution:=optional,
- org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
+ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.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 efc056e..70cd4b2 100644
--- a/rt/management/pom.xml
+++ b/rt/management/pom.xml
@@ -32,6 +32,9 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.management</cxf.module.name>
+ <cxf.osgi.import>
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml
index 1225e76..9529f45 100644
--- a/rt/rs/description/pom.xml
+++ b/rt/rs/description/pom.xml
@@ -34,6 +34,7 @@
<cxf.module.name>org.apache.cxf.rs.wadl</cxf.module.name>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml
index 411b538..6596c8c 100644
--- a/rt/rs/extensions/providers/pom.xml
+++ b/rt/rs/extensions/providers/pom.xml
@@ -34,6 +34,7 @@
<cxf.module.name>org.apache.cxf.rs.providers</cxf.module.name>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<dom4j.version>1.6.1</dom4j.version>
</properties>
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
index 833bb16..e062092 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
+++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml
@@ -32,6 +32,10 @@
</parent>
<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}",
+ *
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml b/rt/rs/security/oauth-parent/oauth/pom.xml
index 34c751e..dc53367 100644
--- a/rt/rs/security/oauth-parent/oauth/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth/pom.xml
@@ -34,6 +34,7 @@
<cxf.module.name>org.apache.cxf.rs.security.oauth</cxf.module.name>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index c8681d8..13dc4a3 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -34,7 +34,8 @@
<cxf.module.name>org.apache.cxf.rs.security.oauth2</cxf.module.name>
<cxf.osgi.import>
net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
- javax.servlet*;version="${cxf.osgi.javax.servlet.version}"
+ javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<compilerArguments>-Aopenjpa.source=7 -Aopenjpa.metamodel=true</compilerArguments>
</properties>
diff --git a/rt/rs/security/sso/saml/pom.xml b/rt/rs/security/sso/saml/pom.xml
index 3dc6395..d18ae0a 100644
--- a/rt/rs/security/sso/saml/pom.xml
+++ b/rt/rs/security/sso/saml/pom.xml
@@ -36,6 +36,7 @@
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}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml
index 11d3453..08d352c 100644
--- a/rt/transports/http-jetty/pom.xml
+++ b/rt/transports/http-jetty/pom.xml
@@ -38,7 +38,8 @@
org.eclipse.jetty*;version="${cxf.jetty.osgi.version}",
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}"
+ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<cxf.osgi.dynamic.import>
org.eclipse.jetty.jmx
diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml
index 3cf7e93..74c96ec 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -39,7 +39,8 @@
javax.annotation;version="${cxf.osgi.javax.annotation.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.osgi.service.blueprint*;resolution:=optional,
- org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
+ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<cxf.osgi.export>
org.apache.cxf.*,
diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml
index 3032c3b..cb9fb80 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -38,7 +38,8 @@
io.undertow*;version="${cxf.undertow.osgi.version}",
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}"
+ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index d7e34f4..0ef9c10 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -38,13 +38,16 @@
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- org.osgi.service.http
+ org.osgi.service.http,
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
+ javax.activation;version="${cxf.osgi.javax.annotation.version}",
+ com.sun.activation.registries;resolution:=optional
</cxf.osgi.import>
<cxf.osgi.export>
org.apache.cxf.transports.http*,
org.apache.cxf.transport.http.*,
org.apache.cxf.transport.https.*,
- org.apache.cxf.transport.servlet.*,
+ org.apache.cxf.transport.servlet.*
</cxf.osgi.export>
<!-- keep in sync with services exported in activator -->
<cxf.export.service>
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index 89cf62c..7977c02 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -24,7 +24,10 @@
</parent>
<properties>
<cxf.spi-dir>spi-2.1</cxf.spi-dir>
- <cxf.osgi.import>javax.jms;version="[1.1,3)"</cxf.osgi.import>
+ <cxf.osgi.import>
+ javax.jms;version="[1.1,3)",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ </cxf.osgi.import>
<cxf.module.name>org.apache.cxf.transport.jms</cxf.module.name>
</properties>
<dependencies>
diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml
index a806f55..5821559 100644
--- a/rt/ws/addr/pom.xml
+++ b/rt/ws/addr/pom.xml
@@ -37,6 +37,7 @@
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.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 696273a..6debe01 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -17,6 +17,7 @@
<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}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index 1b99a86..7c64be6 100644
--- a/rt/ws/mex/pom.xml
+++ b/rt/ws/mex/pom.xml
@@ -34,6 +34,7 @@
<cxf.module.name>org.apache.cxf.ws.mex</cxf.module.name>
<cxf.osgi.import>
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml
index 4596b4e..1e700f1 100644
--- a/rt/ws/policy/pom.xml
+++ b/rt/ws/policy/pom.xml
@@ -35,7 +35,8 @@
<cxf.bundle.activator>org.apache.cxf.ws.policy.blueprint.Activator</cxf.bundle.activator>
<cxf.osgi.import>
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
- org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional
+ org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.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 9f89bf6..e929985 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -36,7 +36,8 @@
<cxf.osgi.import>
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}"
+ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.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 7bb6215..d9212f3 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -34,9 +34,11 @@
<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}",
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.ws*;version="${cxf.osgi.javax.xml.ws.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml
index 6591ffc..3498892 100644
--- a/rt/wsdl/pom.xml
+++ b/rt/wsdl/pom.xml
@@ -32,6 +32,9 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.wsdl</cxf.module.name>
+ <cxf.osgi.import>
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 8044885..34bbecf 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -168,6 +168,7 @@
org.springframework.ldap*;resolution:=optional,
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}",
*
</Import-Package>
<Bundle-SymbolicName>org.apache.cxf.services.sts.core</Bundle-SymbolicName>
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml
index 3aa2af9..57b428c 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -39,6 +39,7 @@
</cxf.osgi.export>
<cxf.osgi.import>
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index 3bfd05c..1062bfe 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -65,7 +65,7 @@ public class BasicIntegrationTest {
System.setProperty("BasicIntegrationTest.PORT", port);
String xkmsEndpoint = "http://localhost:" + port + "/cxf/XKMS";
- String karafVersion = System.getProperty("karaf.version", "4.2.1");
+ String karafVersion = System.getProperty("karaf.version", "4.2.2-SNAPSHOT");
String localRepository = System.getProperty("localRepository");
MavenArtifactUrlReference karafUrl = maven() //
.groupId("org.apache.karaf") //
@@ -113,6 +113,13 @@ public class BasicIntegrationTest {
+ "cxf-xkms-service,cxf-xkms-client,"
+ "cxf-xkms-ldap,exam,test-dependencies"),
configureConsole().ignoreLocalConsole(),
+ new VMOption("--add-reads=java.xml=java.logging"),
+ new VMOption("--add-exports=java.base/"
+ + "org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
+ new VMOption("--patch-module"),
+ new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
+ + System.getProperty("karaf.version", "4.2.2-SNAPSHOT")
+ + ".jar"),
new VMOption("--patch-module"),
new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-"
+ System.getProperty("karaf.version", "4.2.2-SNAPSHOT")
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 97a73fa..d8ec6a7 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -35,6 +35,7 @@
<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}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/tools/common/pom.xml b/tools/common/pom.xml
index d444bc1..dffdf4f 100644
--- a/tools/common/pom.xml
+++ b/tools/common/pom.xml
@@ -32,6 +32,9 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.tools.common</cxf.module.name>
+ <cxf.osgi.import>
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/tools/corba/pom.xml b/tools/corba/pom.xml
index d0ee088..646794d 100644
--- a/tools/corba/pom.xml
+++ b/tools/corba/pom.xml
@@ -32,6 +32,9 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.tools.corba</cxf.module.name>
+ <cxf.osgi.import>
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index b5f82f9..1658de3 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -34,6 +34,7 @@
<cxf.module.name>org.apache.cxf.tools.java2ws</cxf.module.name>
<cxf.osgi.import>
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
</properties>
<dependencies>
diff --git a/tools/wsdlto/core/pom.xml b/tools/wsdlto/core/pom.xml
index d073848..9f73b8e 100644
--- a/tools/wsdlto/core/pom.xml
+++ b/tools/wsdlto/core/pom.xml
@@ -32,6 +32,9 @@
</parent>
<properties>
<cxf.module.name>org.apache.cxf.tools.wsdl.core</cxf.module.name>
+ <cxf.osgi.import>
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
+ </cxf.osgi.import>
</properties>
<dependencies>
<dependency>
diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml
index 8601b19..6929162 100644
--- a/tools/wsdlto/frontend/jaxws/pom.xml
+++ b/tools/wsdlto/frontend/jaxws/pom.xml
@@ -34,6 +34,7 @@
<cxf.module.name>org.apache.cxf.tools.wsdl.jaxws</cxf.module.name>
<cxf.osgi.import>
javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
+ javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
</properties>
<dependencies>