[cxf] branch CXF-7910_jakarta_jaxws-api updated (db537e1 -> 60234cc)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch CXF-7910_jakarta_jaxws-api updated (db537e1 -> 60234cc)

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

deki pushed a change to branch CXF-7910_jakarta_jaxws-api
in repository https://gitbox.apache.org/repos/asf/cxf.git.


 discard db537e1  [CXF-7910] Change JAX-WS javax to jakarta artifact dependencies
     add c8683be  Simplify FileUtils.readLines
     add 33c46b8  Refactor FileUtils to use a suffix instead of a reg ex
     add 57025af  Make StringUtils.getFirstFound more efficient
     add 6d072ee  cxf-systests-databinding: run tests without internet connection
     add 461b064  upgrade to jaxb 2.3.2
     add f781f77  [CXF-7907] exclude jaxb-core
     add 505563a  Refactored Spring bean files to make the header more readable
     add 82080f2  CXF-7940 - FileUtils.delete dramatically slowdown WildFly server shutdown
     new 60234cc  [CXF-7910] Change JAX-WS javax to jakarta artifact dependencies

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (db537e1)
            \
             N -- N -- N   refs/heads/CXF-7910_jakarta_jaxws-api (60234cc)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/resources/etc/https-cfg-client.xml    | 13 +++-
 .../src/main/resources/etc/https-cfg-service.xml   | 13 +++-
 .../src/main/resources/etc/policy-asym.xml         | 11 +++-
 .../src/main/resources/etc/policy-sym.xml          | 11 +++-
 .../src/main/resources/etc/policy-symsc.xml        | 11 +++-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  8 ++-
 core/pom.xml                                       | 11 +---
 .../org/apache/cxf/common/util/StringUtils.java    | 22 ++-----
 .../java/org/apache/cxf/helpers/FileUtils.java     | 70 +++++++++-------------
 core/src/main/resources/META-INF/cxf/cxf.xml       |  7 ++-
 .../test/java/org/apache/cxf/bus/spring/bus.xml    |  7 ++-
 .../java/org/apache/cxf/bus/spring/customerBus.xml |  7 ++-
 .../org/apache/cxf/bus/spring/customerBus2.xml     |  7 ++-
 .../test/java/org/apache/cxf/bus/spring/init.xml   |  7 ++-
 .../java/org/apache/cxf/bus/spring/lazyInitBus.xml |  7 ++-
 .../cxf/bus/spring/resources/bus-overwrite.xml     |  7 ++-
 .../test/java/org/apache/cxf/bus/spring/test.xml   |  6 +-
 .../java/org/apache/cxf/bus/spring/testjsr250.xml  |  6 +-
 .../apache/cxf/common/util/StringUtilsTest.java    |  8 +--
 .../apache/cxf/configuration/spring/test-beans.xml |  6 +-
 .../cxf/configuration/spring/test-jaxb-beans.xml   |  7 ++-
 .../java/org/apache/cxf/helpers/FileUtilsTest.java | 40 ++++++++++++-
 distribution/javadoc/pom.xml                       | 10 +---
 .../src/main/resources/client-beans.xml            |  7 ++-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  8 ++-
 .../release/samples/in_jvm_transport/coloc.xml     |  9 ++-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  8 ++-
 .../src/main/resources/client-beans.xml            |  7 ++-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  7 ++-
 .../src/main/resources/ClientConfig.xml            |  9 ++-
 .../src/main/resources/ServerConfig.xml            |  9 ++-
 .../src/main/webapp/WEB-INF/beans.xml              |  9 ++-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  7 ++-
 .../src/main/resources/cxf.xml                     |  9 ++-
 .../src/main/resources/cxf.xml                     |  9 ++-
 .../src/main/webapp/WEB-INF/spring-servlet.xml     |  8 ++-
 .../server/src/main/webapp/WEB-INF/oauth-beans.xml | 11 +++-
 .../src/main/webapp/WEB-INF/spring-servlet.xml     |  8 ++-
 distribution/src/main/release/samples/pom.xml      | 13 ++--
 .../src/main/resources/client-beans.xml            |  7 ++-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  8 ++-
 .../sts/src/main/resources/wssec-client-stax.xml   | 10 +++-
 .../sts/src/main/resources/wssec-client.xml        | 10 +++-
 .../sts/src/main/resources/wssec-server-stax.xml   | 11 +++-
 .../sts/src/main/resources/wssec-server.xml        | 11 +++-
 .../sts/src/main/resources/wssec-sts-stax.xml      | 10 +++-
 .../samples/sts/src/main/resources/wssec-sts.xml   | 10 +++-
 .../ws_addressing/src/main/resources/client.xml    |  9 ++-
 .../ws_addressing/src/main/resources/server.xml    |  8 ++-
 .../ws_eventing/src/main/webapp/WEB-INF/beans.xml  |  8 ++-
 .../ws_policy/src/main/resources/client.xml        |  9 ++-
 .../ws_policy/src/main/resources/server.xml        |  8 ++-
 .../samples/ws_rm/src/main/resources/client.xml    | 11 +++-
 .../samples/ws_rm/src/main/resources/server.xml    | 11 +++-
 .../src/main/java/demo/wssec/client/wssec.xml      | 11 +++-
 .../src/main/java/demo/wssec/server/wssec.xml      | 11 +++-
 .../src/main/resources/ClientConfig.xml            | 10 +++-
 .../src/main/resources/ClientConfigStax.xml        | 10 +++-
 .../src/main/resources/ServiceConfig.xml           | 11 +++-
 .../src/main/resources/ServiceConfigStax.xml       | 11 +++-
 .../ws_security/ut/src/main/resources/wssec.xml    | 11 +++-
 .../ut_policy/src/main/resources/ClientConfig.xml  | 10 +++-
 .../src/main/resources/ClientConfigStax.xml        | 10 +++-
 .../ut_policy/src/main/resources/ServiceConfig.xml | 11 +++-
 .../src/main/resources/ServiceConfigStax.xml       | 11 +++-
 .../main/resources/client-applicationContext.xml   |  9 ++-
 .../samples/wsdl_first/src/main/resources/cxf.xml  |  8 ++-
 .../main/resources/server-applicationContext.xml   |  8 ++-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        |  8 ++-
 .../src/main/resources/server-beans.xml            |  7 ++-
 .../src/main/resources/InsecureClient.xml          |  7 ++-
 .../src/main/resources/SecureClient.xml            |  8 ++-
 .../src/main/resources/ServerConfig.xml            |  9 ++-
 .../src/main/webapp/WEB-INF/beans.xml              |  8 ++-
 maven-plugins/codegen-plugin/pom.xml               |  2 +-
 osgi/itests/pom.xml                                |  6 ++
 osgi/karaf/features/pom.xml                        | 43 +------------
 parent/pom.xml                                     | 66 +++-----------------
 pom.xml                                            |  1 +
 rt/bindings/soap/pom.xml                           |  2 +-
 .../main/resources/META-INF/cxf/java2wsbeans.xml   |  6 +-
 .../cxf/aegis/type/aegisOptionsTestBeans.xml       |  8 ++-
 .../main/resources/META-INF/cxf/java2wsbeans.xml   |  6 +-
 .../java/org/apache/cxf/jaxrs/spring/servers.xml   |  7 ++-
 .../java/org/apache/cxf/jaxrs/spring/servers2.xml  |  7 ++-
 .../resources/META-INF/cxf/cxf-extension-jaxws.xml |  7 ++-
 .../org/apache/cxf/jaxws/configured-endpoints.xml  |  8 ++-
 .../org/apache/cxf/jaxws/dispatch/bus-dispatch.xml |  7 ++-
 .../test/java/org/apache/cxf/jaxws/schemaFirst.xml |  8 ++-
 .../schemavalidationtype-configured-endpoints.xml  |  8 ++-
 .../org/apache/cxf/jaxws/soapServiceConfig.xml     |  7 ++-
 .../java/org/apache/cxf/jaxws/spring/child.xml     |  8 ++-
 .../java/org/apache/cxf/jaxws/spring/clients.xml   | 10 +++-
 .../java/org/apache/cxf/jaxws/spring/cxf3959a.xml  |  7 ++-
 .../java/org/apache/cxf/jaxws/spring/cxf3959b.xml  |  7 ++-
 .../java/org/apache/cxf/jaxws/spring/cxf3959c.xml  |  8 ++-
 .../java/org/apache/cxf/jaxws/spring/endpoints.xml |  8 ++-
 .../org/apache/cxf/jaxws/spring/endpoints2.xml     |  8 ++-
 .../org/apache/cxf/jaxws/spring/endpoints3.xml     |  8 ++-
 .../java/org/apache/cxf/jaxws/spring/servers.xml   |  8 ++-
 .../test/java/org/apache/cxf/jaxws/ws/server.xml   | 11 +++-
 rt/frontend/simple/pom.xml                         |  2 +-
 .../cxf/endpoint/dynamic/DynamicClientFactory.java |  2 +-
 .../org/apache/cxf/frontend/spring/clients.xml     |  8 ++-
 .../org/apache/cxf/frontend/spring/rountrip.xml    |  8 ++-
 .../org/apache/cxf/frontend/spring/servers.xml     |  8 ++-
 .../src/test/resources/AegisBeans.xml              |  8 ++-
 .../src/test/resources/AnyBeans.xml                |  7 ++-
 .../test/resources/DocLitBareClientTestBeans.xml   |  7 ++-
 .../resources/DocLitWrappedClientTestBeans.xml     |  8 ++-
 .../src/test/resources/GreeterClientTestBeans.xml  |  7 ++-
 .../src/test/resources/HelloWorldDocLitBeans.xml   |  7 ++-
 .../src/test/resources/HelloWorldGreeterBeans.xml  |  7 ++-
 .../src/test/resources/MtoMBeans.xml               |  7 ++-
 .../src/test/resources/RPCClientTestBeans.xml      |  7 ++-
 .../src/test/resources/XMLHttpRequestTestBeans.xml | 10 +++-
 .../src/test/resources/attributeTestBeans.xml      |  8 ++-
 .../src/test/resources/serializationTestBeans.xml  |  8 ++-
 .../src/test/resources/managed-spring-twobuses.xml |  8 ++-
 .../test/resources/managed-spring-twobuses2.xml    |  8 ++-
 .../src/test/resources/managed-spring.xml          |  8 ++-
 .../src/test/resources/managed-spring2.xml         |  8 ++-
 .../src/test/resources/managed-spring3.xml         |  8 ++-
 .../src/test/resources/no-connector-spring.xml     |  7 ++-
 .../org/apache/cxf/jaxrs/client/spring/clients.xml |  8 ++-
 .../org/apache/cxf/jaxrs/provider/atom/servers.xml |  7 ++-
 rt/rs/extensions/search/pom.xml                    |  4 ++
 .../cxf/transport/http_jetty/invalid-engines.xml   | 10 +++-
 .../server-engine-factory-jetty9-connector.xml     |  9 ++-
 .../transport/http_jetty/server-engine-factory.xml |  9 ++-
 .../transport/http_jetty/spring/beans-props.xml    | 10 +++-
 .../cxf/transport/http_jetty/spring/beans.xml      | 10 +++-
 .../transport/http_jetty/spring/invalid-beans.xml  |  8 ++-
 .../http/netty/client/integration/ServerConfig.xml |  9 ++-
 .../server/integration/ApplicationContext.xml      | 11 +++-
 .../http/netty/server/integration/ServerConfig.xml |  9 ++-
 .../http/netty/server/spring/beans-props.xml       | 10 +++-
 .../transport/http/netty/server/spring/beans.xml   | 10 +++-
 .../http/netty/server/spring/invalid-beans.xml     |  8 ++-
 .../transport/http_undertow/invalid-engines.xml    | 10 +++-
 .../http_undertow/server-engine-factory.xml        |  9 ++-
 .../transport/http_undertow/spring/beans-props.xml | 10 +++-
 .../cxf/transport/http_undertow/spring/beans.xml   | 10 +++-
 .../http_undertow/spring/invalid-beans.xml         |  8 ++-
 .../main/resources/META-INF/cxf/cxf-servlet.xml    |  7 ++-
 .../cxf/transport/http/spring/conduit-bean.xml     |  9 ++-
 .../transport/http/spring/conduit-tlsrefs-bean.xml |  9 ++-
 .../apache/cxf/ws/policy/disable-policy-bus.xml    |  8 ++-
 .../org/apache/cxf/ws/policy/ignorable-policy.xml  | 10 +++-
 .../org/apache/cxf/ws/policy/ignorable-policy2.xml | 10 +++-
 .../java/org/apache/cxf/ws/policy/policy-bus.xml   |  9 ++-
 .../java/org/apache/cxf/ws/policy/spring/beans.xml | 10 +++-
 .../java/org/apache/cxf/ws/rm/custom-rmmanager.xml |  9 ++-
 .../java/org/apache/cxf/ws/rm/exactly-once.xml     |  9 ++-
 .../src/test/java/org/apache/cxf/ws/rm/feature.xml |  9 ++-
 .../org/apache/cxf/ws/rm/managed-manager-bean.xml  |  9 ++-
 .../java/org/apache/cxf/ws/rm/manager-bean.xml     |  9 ++-
 .../test/java/org/apache/cxf/ws/rm/rmmanager.xml   |  6 +-
 .../cxf/systest/sts/asymmetric_encr/cxf-client.xml | 10 +++-
 .../cxf/systest/sts/asymmetric_encr/cxf-sts.xml    | 10 +++-
 .../systest/sts/asymmetric_encr/stax-cxf-sts.xml   | 10 +++-
 .../cxf/systest/sts/basic_auth/cxf-bad-client.xml  | 10 +++-
 .../cxf/systest/sts/basic_auth/cxf-client.xml      | 10 +++-
 .../cxf/systest/sts/basic_auth/cxf-service.xml     | 12 +++-
 .../systest/sts/basic_auth/stax-cxf-service.xml    | 12 +++-
 .../cxf/systest/sts/batch/cxf-client-unit.xml      | 10 +++-
 .../org/apache/cxf/systest/sts/batch/cxf-sts.xml   | 12 +++-
 .../apache/cxf/systest/sts/batch/stax-cxf-sts.xml  | 12 +++-
 .../sts/binarysecuritytoken/cxf-bad-client.xml     | 10 +++-
 .../systest/sts/binarysecuritytoken/cxf-client.xml | 10 +++-
 .../sts/binarysecuritytoken/cxf-service.xml        | 11 +++-
 .../sts/binarysecuritytoken/stax-cxf-service.xml   | 11 +++-
 .../systest/sts/caching/cxf-caching-service.xml    | 11 +++-
 .../apache/cxf/systest/sts/caching/cxf-client.xml  | 10 +++-
 .../apache/cxf/systest/sts/caching/cxf-service.xml | 11 +++-
 .../cxf/systest/sts/claims/cxf-bad-client.xml      | 10 +++-
 .../systest/sts/claims/cxf-client-cbhandler.xml    | 10 +++-
 .../apache/cxf/systest/sts/claims/cxf-client.xml   | 10 +++-
 .../apache/cxf/systest/sts/claims/cxf-service.xml  | 11 +++-
 .../cxf/systest/sts/claims/stax-cxf-service.xml    | 11 +++-
 .../cxf/systest/sts/cross_domain/cxf-client.xml    | 10 +++-
 .../cxf/systest/sts/cross_domain/cxf-service.xml   | 11 +++-
 .../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 12 +++-
 .../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 12 +++-
 .../apache/cxf/systest/sts/custom/cxf-client.xml   | 10 +++-
 .../apache/cxf/systest/sts/custom/cxf-service.xml  | 11 +++-
 .../cxf/systest/sts/custom/cxf-sts-common.xml      | 12 +++-
 .../org/apache/cxf/systest/sts/custom/cxf-sts.xml  | 13 +++-
 .../systest/sts/custom_onbehalfof/cxf-client.xml   | 10 +++-
 .../systest/sts/custom_onbehalfof/cxf-service.xml  | 11 +++-
 .../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml  | 12 +++-
 .../sts/defaultstsprovider/cxf-client-unit.xml     | 10 +++-
 .../sts/defaultstsprovider/cxf-sts-common.xml      | 12 +++-
 .../cxf/systest/sts/defaultstsprovider/cxf-sts.xml | 12 +++-
 .../cxf/systest/sts/deployment/cxf-sts-common.xml  | 12 +++-
 .../apache/cxf/systest/sts/deployment/cxf-sts.xml  | 12 +++-
 .../cxf/systest/sts/deployment/stax-cxf-sts.xml    | 12 +++-
 .../systest/sts/distributed_caching/cxf-client.xml | 10 +++-
 .../sts/distributed_caching/cxf-service.xml        | 11 +++-
 .../systest/sts/distributed_caching/cxf-sts-1.xml  | 13 +++-
 .../systest/sts/distributed_caching/cxf-sts-2.xml  | 13 +++-
 .../org/apache/cxf/systest/sts/jwt/cxf-client.xml  | 10 +++-
 .../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 12 +++-
 .../sts/kerberos/cxf-intermediary-client.xml       | 10 +++-
 .../sts/kerberos/cxf-intermediary-jaxrs-client.xml | 10 +++-
 .../cxf/systest/sts/kerberos/cxf-intermediary.xml  | 12 +++-
 .../cxf/systest/sts/kerberos/cxf-service.xml       | 11 +++-
 .../apache/cxf/systest/sts/realms/cxf-client.xml   | 10 +++-
 .../apache/cxf/systest/sts/realms/cxf-service.xml  | 11 +++-
 .../cxf/systest/sts/realms/cxf-sts-saml1.xml       | 12 +++-
 .../cxf/systest/sts/realms/cxf-sts-saml2.xml       | 12 +++-
 .../cxf/systest/sts/renew/cxf-client-unit.xml      | 10 +++-
 .../apache/cxf/systest/sts/renew/cxf-client.xml    | 10 +++-
 .../apache/cxf/systest/sts/renew/cxf-service.xml   | 11 +++-
 .../apache/cxf/systest/sts/renew/cxf-sts-pop.xml   | 12 +++-
 .../org/apache/cxf/systest/sts/renew/cxf-sts.xml   | 12 +++-
 .../apache/cxf/systest/sts/renew/stax-cxf-sts.xml  | 12 +++-
 .../cxf/systest/sts/secure_conv/cxf-client.xml     | 10 +++-
 .../cxf/systest/sts/secure_conv/cxf-service.xml    | 11 +++-
 .../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 12 +++-
 .../cxf/systest/sts/secure_conv/stax-cxf-sts.xml   | 12 +++-
 .../apache/cxf/systest/sts/soap12/cxf-client.xml   | 10 +++-
 .../apache/cxf/systest/sts/soap12/cxf-service.xml  | 11 +++-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml    | 11 +++-
 .../systest/sts/sts_sender_vouches/cxf-client.xml  | 10 +++-
 .../systest/sts/sts_sender_vouches/cxf-service.xml | 11 +++-
 .../cxf/systest/sts/sts_sender_vouches/cxf-sts.xml | 10 +++-
 .../sts/sts_sender_vouches/stax-cxf-sts.xml        | 10 +++-
 .../cxf/systest/sts/transformation/cxf-client.xml  | 10 +++-
 .../cxf/systest/sts/transformation/cxf-service.xml | 11 +++-
 .../systest/sts/usernametoken/cxf-bad-client.xml   | 10 +++-
 .../cxf/systest/sts/usernametoken/cxf-client.xml   | 10 +++-
 .../cxf/systest/sts/usernametoken/cxf-service.xml  | 11 +++-
 .../systest/sts/usernametoken/stax-cxf-service.xml | 11 +++-
 .../cxf/systest/sts/asymmetric/cxf-client.xml      | 10 +++-
 .../cxf/systest/sts/asymmetric/cxf-service.xml     | 11 +++-
 .../systest/sts/asymmetric/cxf-stax-service.xml    | 11 +++-
 .../apache/cxf/systest/sts/bearer/cxf-client.xml   | 10 +++-
 .../apache/cxf/systest/sts/bearer/cxf-service.xml  | 11 +++-
 .../cxf/systest/sts/bearer/cxf-stax-service.xml    | 11 +++-
 .../cxf/systest/sts/bearer/cxf-unsigned-client.xml | 10 +++-
 .../cxf/systest/sts/delegation/cxf-client.xml      | 10 +++-
 .../systest/sts/delegation/cxf-sts-transport.xml   | 12 +++-
 .../cxf/systest/sts/deployment/cxf-transport.xml   | 12 +++-
 .../systest/sts/deployment/cxf-ut-encrypted.xml    | 10 +++-
 .../apache/cxf/systest/sts/deployment/cxf-ut.xml   | 10 +++-
 .../apache/cxf/systest/sts/deployment/cxf-x509.xml | 10 +++-
 .../systest/sts/deployment/stax-cxf-transport.xml  | 12 +++-
 .../sts/deployment/stax-cxf-ut-encrypted.xml       | 10 +++-
 .../cxf/systest/sts/deployment/stax-cxf-ut.xml     | 10 +++-
 .../cxf/systest/sts/deployment/stax-cxf-x509.xml   | 10 +++-
 .../cxf/systest/sts/deployment/sts/cxf-sts.xml     | 12 +++-
 .../cxf/systest/sts/deployment/sts/realms.xml      | 12 +++-
 .../intermediary_transformation/cxf-bad-client.xml | 10 +++-
 .../sts/intermediary_transformation/cxf-client.xml | 10 +++-
 .../cxf-intermediary-caching.xml                   | 11 +++-
 .../cxf-intermediary.xml                           | 11 +++-
 .../intermediary_transformation/cxf-service.xml    | 11 +++-
 .../apache/cxf/systest/sts/issuer/cxf-client.xml   | 10 +++-
 .../sts/issuer/cxf-issuer-sts-transport.xml        | 12 +++-
 .../apache/cxf/systest/sts/issuer/cxf-service.xml  | 11 +++-
 .../cxf/systest/sts/issueunit/cxf-client.xml       | 10 +++-
 .../org/apache/cxf/systest/sts/jaas/cxf-client.xml | 10 +++-
 .../apache/cxf/systest/sts/jaas/cxf-service.xml    | 12 +++-
 .../apache/cxf/systest/sts/jaas/cxf-service2.xml   | 12 +++-
 .../apache/cxf/systest/sts/jaas/cxf-sts-client.xml | 12 +++-
 .../org/apache/cxf/systest/sts/rest/cxf-client.xml | 10 +++-
 .../apache/cxf/systest/sts/rest/cxf-rest-sts.xml   | 13 +++-
 .../cxf/systest/sts/sendervouches/cxf-client.xml   | 10 +++-
 .../systest/sts/sendervouches/cxf-intermediary.xml | 11 +++-
 .../cxf/systest/sts/sendervouches/cxf-service.xml  | 11 +++-
 .../sts/sendervouches/cxf-stax-intermediary.xml    | 11 +++-
 .../systest/sts/sendervouches/cxf-stax-service.xml | 11 +++-
 .../cxf/systest/sts/stsclient/cxf-client-name.xml  | 10 +++-
 .../systest/sts/stsclient/cxf-default-client.xml   | 10 +++-
 .../cxf/systest/sts/stsclient/cxf-service.xml      | 11 +++-
 .../cxf/systest/sts/symmetric/cxf-client.xml       | 10 +++-
 .../cxf/systest/sts/symmetric/cxf-service.xml      | 11 +++-
 .../cxf/systest/sts/symmetric/cxf-stax-service.xml | 11 +++-
 .../apache/cxf/systest/sts/template/cxf-client.xml | 10 +++-
 .../cxf/systest/sts/template/cxf-service.xml       | 11 +++-
 .../cxf/systest/sts/template/cxf-stax-service.xml  | 11 +++-
 .../cxf/systest/sts/transport/cxf-bad-client.xml   | 10 +++-
 .../cxf/systest/sts/transport/cxf-client.xml       | 10 +++-
 .../cxf/systest/sts/transport/cxf-service.xml      | 11 +++-
 .../cxf/systest/sts/transport/cxf-stax-service.xml | 11 +++-
 .../cxf/systest/sts/username_actas/cxf-client.xml  | 10 +++-
 .../cxf/systest/sts/username_actas/cxf-service.xml | 11 +++-
 .../systest/sts/username_actas/cxf-service2.xml    | 11 +++-
 .../systest/sts/username_onbehalfof/cxf-client.xml | 10 +++-
 .../sts/username_onbehalfof/cxf-service.xml        | 11 +++-
 .../sts/username_onbehalfof/cxf-service2.xml       | 11 +++-
 .../systest/sts/x509/cxf-asymmetric-service.xml    | 11 +++-
 .../org/apache/cxf/systest/sts/x509/cxf-client.xml | 10 +++-
 .../apache/cxf/systest/sts/x509/cxf-service.xml    | 11 +++-
 .../cxf/systest/sts/x509/cxf-stax-service.xml      | 11 +++-
 .../resources/OSGI-INF/blueprint/blueprint.xml     |  5 +-
 services/wsn/wsn-core/pom.xml                      | 21 +++----
 services/xkms/xkms-itests/pom.xml                  |  6 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml        | 10 +++-
 .../src/main/webapp/WEB-INF/xkms-endpoint.xml      | 10 +++-
 .../src/main/webapp/WEB-INF/xkms-key-handlers.xml  | 10 +++-
 src/site/site.xml                                  |  2 +-
 .../webapp/src/main/webapp/WEB-INF/beans.xml       |  7 ++-
 .../cxf/systest/aegis/AegisClientServerTest.java   |  3 -
 .../org/apache/cxf/systest/aegis/AegisServer.java  | 21 ++-----
 .../java/org/apache/cxf/systest/source/cxf.xml     |  8 ++-
 .../src/test/resources/aegisJaxWsBeans.xml         |  9 ++-
 .../src/test/resources/aegisSportsServiceBeans.xml |  9 ++-
 .../src/test/resources/aegisWSDLNSBeans.xml        |  9 ++-
 .../src/test/resources/extrajaxbclass.xml          |  8 ++-
 .../src/test/resources/mtomTestBeans.xml           |  9 ++-
 .../src/test/resources/webapp/WEB-INF/beans.xml    |  6 +-
 .../src/test/resources/webapp/WEB-INF/web.xml      |  5 +-
 systests/jaxrs/pom.xml                             |  4 ++
 .../systest/http/resources/BethalClientBeans.xml   | 10 +++-
 .../cxf/systest/http/resources/SessionServer.xml   |  9 ++-
 .../http/resources/SessionServer_Windows.xml       |  9 ++-
 .../cxf/systest/http/resources/jaxws-publish.xml   | 10 +++-
 .../cxf/systest/http/resources/jaxws-server.xml    | 10 +++-
 .../apache/cxf/systest/http/resources/pkcs12.xml   | 10 +++-
 .../http/resources/resource-key-spec-url.xml       | 10 +++-
 .../systest/http/resources/resource-key-spec.xml   | 10 +++-
 .../cxf/systest/jaxrs/jms/jms_server_config.xml    |  9 ++-
 .../systest/jaxrs/security/jaxrs-https-client1.xml |  9 ++-
 .../systest/jaxrs/security/jaxrs-https-client2.xml |  9 ++-
 .../systest/jaxrs/security/jaxrs-https-client3.xml | 10 +++-
 .../systest/jaxrs/security/jaxrs-https-client4.xml | 10 +++-
 .../systest/jaxrs/security/jaxrs-https-client5.xml | 10 +++-
 .../jaxrs/security/jaxrs-https-client_old.xml      |  4 +-
 .../systest/jaxrs/security/jaxrs-https-server.xml  |  9 ++-
 .../src/test/resources/jaxrs/WEB-INF/beans.xml     |  7 ++-
 .../test/resources/jaxrs_atom/WEB-INF/beans.xml    | 10 +++-
 .../test/resources/jaxrs_cors/WEB-INF/beans.xml    |  8 ++-
 .../resources/jaxrs_databinding/WEB-INF/beans.xml  | 11 +++-
 .../resources/jaxrs_dispatch/WEB-INF/beans.xml     | 11 +++-
 .../jaxrs_dispatch_simple/WEB-INF/beans.xml        | 11 +++-
 .../jaxrs_jaas_security/WEB-INF/beans.xml          |  8 ++-
 .../jaxrs_many_destinations/WEB-INF/beans.xml      | 11 +++-
 .../test/resources/jaxrs_proxy/WEB-INF/beans.xml   | 10 +++-
 .../resources/jaxrs_security/WEB-INF/beans.xml     |  9 +--
 .../resources/jaxrs_soap_rest/WEB-INF/beans.xml    | 10 +++-
 .../test/resources/jaxrs_spring/WEB-INF/beans.xml  |  7 ++-
 .../jaxrs_spring_providers/WEB-INF/beans.xml       |  7 ++-
 .../resources/servlet_as_filter/WEB-INF/beans.xml  |  7 ++-
 .../apache/cxf/systest/dispatch/client-config.xml  |  7 ++-
 .../java/org/apache/cxf/systest/handlers/beans.xml |  8 ++-
 .../handlers/beans_autoRewriteSoapAddress.xml      |  8 ++-
 .../handlers/beans_no_autoRewriteSoapAddress.xml   |  8 ++-
 .../cxf/systest/handlers/soap_fault_beans.xml      |  8 ++-
 .../apache/cxf/systest/jaxws/fault-stack-trace.xml |  6 +-
 .../apache/cxf/systest/jaxws/springWebService.xml  |  8 ++-
 .../kerberos/jaxrs/kerberos/kerberosClient.xml     |  9 ++-
 .../cxf/systest/kerberos/wssec/kerberos/client.xml | 11 +++-
 .../cxf/systest/kerberos/wssec/kerberos/server.xml | 14 ++++-
 .../kerberos/wssec/kerberos/stax-server.xml        | 13 +++-
 .../systest/kerberos/wssec/kerberos/sts-client.xml | 10 +++-
 .../cxf/systest/kerberos/wssec/spnego/client.xml   | 11 +++-
 .../cxf/systest/kerberos/wssec/spnego/server.xml   | 13 +++-
 .../systest/kerberos/wssec/spnego/stax-server.xml  | 13 +++-
 .../cxf/systest/kerberos/wssec/sts/cxf-sts.xml     | 12 +++-
 .../systest/kerberos/wssec/sts/stax-cxf-sts.xml    | 12 +++-
 systests/ldap/src/test/resources/ldap-jaxrs.xml    |  7 ++-
 systests/ldap/src/test/resources/ldap.xml          |  7 ++-
 .../systest/http/resources/BethalClientBeans.xml   | 10 +++-
 .../cxf/systest/http/resources/SessionServer.xml   |  9 ++-
 .../http/resources/SessionServer_Windows.xml       |  9 ++-
 .../cxf/systest/http/resources/jaxws-publish.xml   | 10 +++-
 .../cxf/systest/http/resources/jaxws-server.xml    | 10 +++-
 .../apache/cxf/systest/http/resources/pkcs12.xml   | 10 +++-
 .../http/resources/resource-key-spec-url.xml       | 10 +++-
 .../systest/http/resources/resource-key-spec.xml   | 10 +++-
 .../jaxrs/oauth/server/WEB-INF/oauth-beans.xml     |  7 ++-
 .../cxf/systest/jaxrs/security/jcs/client.xml      | 11 +++-
 .../cxf/systest/jaxrs/security/jcs/jcs-server.xml  | 11 +++-
 .../security/jose/jwejws/algorithms-server.xml     | 11 +++-
 .../systest/jaxrs/security/jose/jwejws/client.xml  | 11 +++-
 .../security/jose/jwejws/reference-server.xml      | 11 +++-
 .../systest/jaxrs/security/jose/jwejws/server.xml  | 11 +++-
 .../jaxrs/security/jose/jwejws/serverJweJson.xml   | 11 +++-
 .../jaxrs/security/jose/jwejws/serverJwsJson.xml   | 11 +++-
 .../jaxrs/security/jose/jwejws/serverMultipart.xml | 11 +++-
 .../jaxrs/security/jose/jwt/algorithms-server.xml  | 11 +++-
 .../jaxrs/security/jose/jwt/authn-authz-server.xml | 11 +++-
 .../cxf/systest/jaxrs/security/jose/jwt/client.xml | 11 +++-
 .../jaxrs/security/jose/jwt/properties-server.xml  | 11 +++-
 .../jaxrs/security/oauth2/filters/client.xml       | 11 +++-
 .../jaxrs/security/oauth2/grants/client.xml        | 11 +++-
 .../systest/jaxrs/security/oauth2/tls/client.xml   | 11 +++-
 .../systest/jaxrs/security/oauth2/tls/client2.xml  | 11 +++-
 .../cxf/systest/jaxrs/security/oidc/client.xml     | 11 +++-
 .../systest/jaxrs/security/oidc/filters/client.xml | 11 +++-
 .../cxf/systest/jaxrs/security/saml/client.xml     | 11 +++-
 .../systest/jaxrs/security/saml/secureServer.xml   | 12 +++-
 .../cxf/systest/jaxrs/security/saml/server.xml     | 11 +++-
 .../cxf/systest/jaxrs/security/samlsso/client.xml  | 11 +++-
 .../jaxrs/security/samlsso/metadata-server.xml     | 12 +++-
 .../cxf/systest/jaxrs/security/xml/client.xml      | 11 +++-
 .../cxf/systest/jaxrs/security/xml/server.xml      | 12 +++-
 .../cxf/systest/jaxrs/security/xml/stax-server.xml | 12 +++-
 .../java/org/apache/cxf/systest/jms/JMSClients.xml |  7 ++-
 .../systest/jms/continuations/jms_test_config.xml  |  9 ++-
 .../java/org/apache/cxf/systest/jms/gzipBus.xml    |  8 ++-
 .../java/org/apache/cxf/systest/jms/soap12Bus.xml  |  8 ++-
 .../cxf/systest/http_undertow/SessionServer.xml    | 10 +++-
 .../systest/http_undertow/continuations/cxf.xml    |  8 ++-
 .../http_undertow/continuations/cxf_https.xml      |  9 ++-
 .../http_undertow/continuations/jaxws-server.xml   |  9 ++-
 .../org/apache/cxf/systest/http_undertow/cxf.xml   |  7 ++-
 .../http_undertow/server-lifecycle-beans.xml       |  9 ++-
 .../apache/cxf/systest/http_undertow/server.xml    |  7 ++-
 .../cxf/systest/http_undertow/undertow-engine.xml  |  9 ++-
 .../http_undertow/undertowBasicAuthServer.xml      |  7 ++-
 .../systest/http_undertow/undertowDigestServer.xml |  7 ++-
 .../apache/cxf/https/ssl3/sslv3-client-allow.xml   | 11 +++-
 .../org/apache/cxf/https/ssl3/sslv3-client.xml     | 11 +++-
 .../org/apache/cxf/https/ssl3/sslv3-server.xml     | 12 +++-
 .../org/apache/cxf/systest/http/SessionServer.xml  | 10 +++-
 .../cxf/systest/http_jetty/continuations/cxf.xml   |  8 ++-
 .../systest/http_jetty/continuations/cxf_https.xml |  9 ++-
 .../http_jetty/continuations/jaxws-server.xml      |  9 ++-
 .../http_jetty/continuations/jetty-engine.xml      |  7 ++-
 .../org/apache/cxf/systest/http_jetty/cxf.xml      |  7 ++-
 .../apache/cxf/systest/http_jetty/jetty-engine.xml |  9 ++-
 .../systest/http_jetty/jettyBasicAuthServer.xml    |  7 ++-
 .../cxf/systest/http_jetty/jettyDigestServer.xml   |  7 ++-
 .../systest/http_jetty/server-lifecycle-beans.xml  |  9 ++-
 .../org/apache/cxf/systest/http_jetty/server.xml   |  7 ++-
 .../ciphersuites-client-expired-cert.xml           | 11 +++-
 .../ciphersuites/ciphersuites-client-noconfig.xml  | 11 +++-
 .../ciphersuites/ciphersuites-client-tlsv12.xml    | 11 +++-
 .../ciphersuites/ciphersuites-client-tlsv13.xml    | 11 +++-
 .../https/ciphersuites/ciphersuites-client.xml     | 11 +++-
 .../https/ciphersuites/ciphersuites-dhe-client.xml | 11 +++-
 .../ciphersuites/ciphersuites-explicit-client.xml  | 11 +++-
 .../https/ciphersuites/ciphersuites-server.xml     | 12 +++-
 .../systest/https/clientauth/client-auth-chain.xml | 11 +++-
 .../https/clientauth/client-auth-invalid.xml       | 11 +++-
 .../https/clientauth/client-auth-invalid2.xml      | 11 +++-
 .../https/clientauth/client-auth-server.xml        | 12 +++-
 .../cxf/systest/https/clientauth/client-auth.xml   | 11 +++-
 .../systest/https/clientauth/client-no-auth.xml    | 11 +++-
 .../systest/https/conduit/BethalClientBeans.xml    | 10 +++-
 .../https/conduit/jaxws-publish-callback.xml       | 10 +++-
 .../cxf/systest/https/conduit/jaxws-publish.xml    | 10 +++-
 .../cxf/systest/https/conduit/jaxws-server.xml     | 10 +++-
 .../https/conduit/jaxws-tlsrefs-publish.xml        | 10 +++-
 .../apache/cxf/systest/https/conduit/pkcs12.xml    | 10 +++-
 .../https/conduit/resource-key-spec-url.xml        | 11 +++-
 .../systest/https/conduit/resource-key-spec.xml    | 10 +++-
 .../https/constraints/jaxws-server-constraints.xml | 10 +++-
 .../https/hostname/hostname-client-disablecn.xml   | 11 +++-
 .../https/hostname/hostname-client-usedefault.xml  | 11 +++-
 .../cxf/systest/https/hostname/hostname-client.xml | 11 +++-
 .../https/hostname/hostname-server-deprecated.xml  | 12 +++-
 .../cxf/systest/https/hostname/hostname-server.xml | 12 +++-
 .../systest/https/trust/client-trust-config.xml    | 11 +++-
 .../https/trust/client-trust-empty-config.xml      | 11 +++-
 .../cxf/systest/https/trust/client-trust.xml       | 11 +++-
 .../cxf/systest/https/trust/trust-server.xml       | 12 +++-
 .../org/apache/cxf/systest/servlet/cxf-jaxrs.xml   |  8 ++-
 .../org/apache/cxf/systest/servlet/cxf-servlet.xml |  7 ++-
 .../cxf/systest/servlet/spring-auto-launch.xml     |  7 ++-
 .../apache/cxf/systest/servlet/spring-error.xml    |  7 ++-
 .../org/apache/cxf/systest/servlet/spring-js.xml   |  6 +-
 .../org/apache/cxf/systest/servlet/spring.xml      |  7 ++-
 .../src/test/resources/resolver/WEB-INF/beans.xml  |  2 +-
 .../src/test/java/org/apache/cxf/cxf1226/beans.xml |  8 ++-
 .../src/test/java/org/apache/cxf/cxf1332/beans.xml |  8 ++-
 .../cxf/systest/beanincreationexception/beans.xml  |  8 ++-
 .../test/java/org/apache/cxf/systest/bus/basic.xml |  8 ++-
 .../java/org/apache/cxf/systest/bus/servlet.xml    |  7 ++-
 .../clustering/circuit_breaker_failover.xml        |  8 ++-
 .../org/apache/cxf/systest/clustering/failover.xml |  9 ++-
 .../clustering/failover_address_override.xml       | 10 +++-
 .../cxf/systest/clustering/load_distributor.xml    |  9 ++-
 .../load_distributor_address_override.xml          | 10 +++-
 .../org/apache/cxf/systest/clustering/targets.xml  |  8 ++-
 .../org/apache/cxf/systest/coloc/coloc_rpc.xml     | 10 +++-
 .../test/java/org/apache/cxf/systest/coloc/cxf.xml |  2 +-
 .../corba/corba_binding_factory_configurer.xml     |  9 ++-
 .../cxf/systest/corba/hello_world_client.xml       |  8 ++-
 .../cxf/systest/corba/hello_world_server.xml       |  8 ++-
 .../org/apache/cxf/systest/cxf6319/handler.xml     |  2 +-
 .../org/apache/cxf/systest/factory_pattern/cxf.xml |  6 +-
 .../cxf/systest/factory_pattern/cxf_multiplex.xml  |  9 ++-
 .../org/apache/cxf/systest/interceptor/addr.xml    |  7 ++-
 .../org/apache/cxf/systest/interceptor/no-addr.xml |  7 ++-
 .../java/org/apache/cxf/systest/lifecycle/cxf.xml  |  8 ++-
 .../cxf/systest/management/counter-spring.xml      |  6 +-
 .../apache/cxf/systest/management/managed-bus.xml  |  6 +-
 .../cxf/systest/management/managed-spring.xml      |  6 +-
 .../cxf/systest/management/persistent-id.xml       |  6 +-
 .../apache/cxf/systest/outofband/header/cxf.xml    |  8 ++-
 .../org/apache/cxf/systest/soapfault/handlers.xml  |  5 +-
 .../type_test/databinding-schema-validation.xml    |  6 +-
 .../src/test/resources/crossSchemaBeans.xml        |  8 ++-
 .../org/apache/cxf/systest/soap/client.xml         | 11 +++-
 .../org/apache/cxf/systest/soap/server.xml         |  2 +-
 .../apache/cxf/systest/soap/transform-server.xml   |  2 +-
 .../org/apache/cxf/systest/soap/xslt-server.xml    |  2 +-
 .../cxf/systest/ws/rm/atleastonce-inorder.xml      |  9 ++-
 .../org/apache/cxf/systest/ws/rm/atleastonce.xml   |  8 ++-
 .../cxf/systest/ws/rm/atmostonce-inorder.xml       |  8 ++-
 .../org/apache/cxf/systest/ws/rm/atmostonce.xml    |  8 ++-
 .../org/apache/cxf/systest/ws/rm/decoupled.xml     |  8 ++-
 .../apache/cxf/systest/ws/rm/decoupled_bare.xml    |  8 ++-
 .../java/org/apache/cxf/systest/ws/rm/deferred.xml |  8 ++-
 .../ws/rm/exactlyonce-inorder-decoupled.xml        | 10 +++-
 .../cxf/systest/ws/rm/exactlyonce-inorder.xml      |  8 ++-
 .../org/apache/cxf/systest/ws/rm/exactlyonce.xml   |  8 ++-
 .../apache/cxf/systest/ws/rm/expire-fast-seq.xml   |  8 ++-
 .../org/apache/cxf/systest/ws/rm/gzip-enabled.xml  | 11 +++-
 .../cxf/systest/ws/rm/inactivity-timeout.xml       |  8 ++-
 .../java/org/apache/cxf/systest/ws/rm/inorder.xml  |  8 ++-
 .../org/apache/cxf/systest/ws/rm/limit-seqs.xml    |  8 ++-
 .../apache/cxf/systest/ws/rm/managed-client.xml    | 11 +++-
 .../apache/cxf/systest/ws/rm/managed-server.xml    | 11 +++-
 .../cxf/systest/ws/rm/message-loss-server.xml      | 10 +++-
 .../org/apache/cxf/systest/ws/rm/message-loss.xml  |  9 ++-
 .../java/org/apache/cxf/systest/ws/rm/no-offer.xml |  8 ++-
 .../ws/rm/persistent-message-loss-server.xml       | 11 +++-
 .../org/apache/cxf/systest/ws/rm/persistent.xml    |  9 ++-
 .../apache/cxf/systest/ws/rm/rminterceptors.xml    |  7 ++-
 .../cxf/systest/ws/rm/rminterceptors_provider.xml  |  7 ++-
 .../org/apache/cxf/systest/ws/rm/seqlength1.xml    |  7 ++-
 .../org/apache/cxf/systest/ws/rm/seqlength10.xml   |  8 ++-
 .../java/org/apache/cxf/systest/ws/rm/simple.xml   |  9 ++-
 .../org/apache/cxf/systest/ws/rm/suppressed.xml    |  8 ++-
 .../systest/ws/rm/sync-ack-atmostonce-server.xml   | 11 +++-
 .../systest/ws/rm/sync-ack-persistent-server.xml   | 11 +++-
 .../apache/cxf/systest/ws/rm/sync-ack-server.xml   | 11 +++-
 .../cxf/systest/ws/rm/terminate-on-shutdown.xml    |  8 ++-
 .../cxf/systest/ws/rm/twoway-endpoint-specific.xml |  6 +-
 .../cxf/systest/ws/rm/wsrm-policy-resolve.xml      |  9 ++-
 .../cxf/systest/wssec/examples/saml/client.xml     | 11 +++-
 .../cxf/systest/wssec/examples/saml/server.xml     | 12 +++-
 .../systest/wssec/examples/saml/stax-server.xml    | 12 +++-
 .../cxf/systest/wssec/examples/secconv/client.xml  | 11 +++-
 .../cxf/systest/wssec/examples/secconv/server.xml  | 12 +++-
 .../systest/wssec/examples/secconv/stax-server.xml | 12 +++-
 .../systest/wssec/examples/sts/cxf-symmetric.xml   | 10 +++-
 .../cxf/systest/wssec/examples/ut/client.xml       | 11 +++-
 .../cxf/systest/wssec/examples/ut/server.xml       | 12 +++-
 .../cxf/systest/wssec/examples/ut/stax-server.xml  | 12 +++-
 .../cxf/systest/wssec/examples/x509/client.xml     | 11 +++-
 .../cxf/systest/wssec/examples/x509/server.xml     | 12 +++-
 .../systest/wssec/examples/x509/stax-server.xml    | 12 +++-
 .../org/apache/cxf/systest/ws/action/client.xml    | 11 +++-
 .../org/apache/cxf/systest/ws/action/server.xml    | 13 +++-
 .../cxf/systest/ws/action/signature-server.xml     | 13 +++-
 .../systest/ws/action/signature-stax-server.xml    | 13 +++-
 .../org/apache/cxf/systest/ws/algsuite/client.xml  | 11 +++-
 .../org/apache/cxf/systest/ws/algsuite/server.xml  | 12 +++-
 .../apache/cxf/systest/ws/algsuite/stax-server.xml | 12 +++-
 .../org/apache/cxf/systest/ws/basicauth/client.xml | 11 +++-
 .../systest/ws/basicauth/server-continuation.xml   | 12 +++-
 .../org/apache/cxf/systest/ws/basicauth/server.xml | 12 +++-
 .../org/apache/cxf/systest/ws/bindings/client.xml  | 11 +++-
 .../org/apache/cxf/systest/ws/bindings/server.xml  | 12 +++-
 .../apache/cxf/systest/ws/bindings/stax-server.xml | 12 +++-
 .../org/apache/cxf/systest/ws/cache/client.xml     | 11 +++-
 .../org/apache/cxf/systest/ws/cache/server.xml     | 13 +++-
 .../cxf/systest/ws/coverage_checker/client.xml     | 11 +++-
 .../cxf/systest/ws/coverage_checker/server.xml     | 12 +++-
 .../systest/ws/coverage_checker/stax-server.xml    | 12 +++-
 .../cxf/systest/ws/fault/client-untrusted.xml      | 11 +++-
 .../org/apache/cxf/systest/ws/fault/client.xml     | 11 +++-
 .../cxf/systest/ws/fault/modified-server.xml       | 12 +++-
 .../org/apache/cxf/systest/ws/fault/server.xml     | 12 +++-
 .../org/apache/cxf/systest/ws/gcm/client.xml       | 11 +++-
 .../org/apache/cxf/systest/ws/gcm/mgf-client.xml   | 11 +++-
 .../org/apache/cxf/systest/ws/gcm/mgf-server.xml   | 12 +++-
 .../apache/cxf/systest/ws/gcm/mgf-stax-server.xml  | 12 +++-
 .../org/apache/cxf/systest/ws/gcm/server.xml       | 12 +++-
 .../org/apache/cxf/systest/ws/gcm/stax-server.xml  | 12 +++-
 .../org/apache/cxf/systest/ws/httpget/client.xml   | 11 +++-
 .../org/apache/cxf/systest/ws/httpget/server.xml   | 12 +++-
 .../org/apache/cxf/systest/ws/https/client.xml     | 11 +++-
 .../org/apache/cxf/systest/ws/https/server.xml     | 12 +++-
 .../apache/cxf/systest/ws/https/stax-server.xml    | 12 +++-
 .../org/apache/cxf/systest/ws/mtom/client.xml      | 11 +++-
 .../org/apache/cxf/systest/ws/mtom/server.xml      | 13 +++-
 .../org/apache/cxf/systest/ws/mtom/stax-server.xml | 13 +++-
 .../org/apache/cxf/systest/ws/parts/client.xml     | 11 +++-
 .../org/apache/cxf/systest/ws/parts/server.xml     | 12 +++-
 .../apache/cxf/systest/ws/parts/stax-server.xml    | 12 +++-
 .../apache/cxf/systest/ws/policy/client-bus.xml    | 11 +++-
 .../org/apache/cxf/systest/ws/policy/client.xml    | 11 +++-
 .../cxf/systest/ws/policy/javafirstclient.xml      | 11 +++-
 .../cxf/systest/ws/policy/javafirstserver.xml      | 12 +++-
 .../org/apache/cxf/systest/ws/policy/server.xml    | 12 +++-
 .../apache/cxf/systest/ws/policy/sslcertclient.xml | 11 +++-
 .../cxf/systest/ws/policy/sslnocertclient.xml      | 11 +++-
 .../org/apache/cxf/systest/ws/saml/client.xml      | 11 +++-
 .../org/apache/cxf/systest/ws/saml/server.xml      | 13 +++-
 .../org/apache/cxf/systest/ws/saml/stax-server.xml | 13 +++-
 .../systest/ws/saml/subjectconf/client-auth.xml    | 11 +++-
 .../systest/ws/saml/subjectconf/client-noauth.xml  | 11 +++-
 .../cxf/systest/ws/saml/subjectconf/server.xml     | 13 +++-
 .../systest/ws/saml/subjectconf/stax-server.xml    | 13 +++-
 .../org/apache/cxf/systest/ws/security/client.xml  |  7 ++-
 .../cxf/systest/ws/security/handler/client.xml     | 14 ++++-
 .../cxf/systest/ws/security/handler/server.xml     |  8 ++-
 .../cxf/systest/ws/security/https_config.xml       | 10 +++-
 .../systest/ws/security/https_config_client.xml    | 10 +++-
 .../org/apache/cxf/systest/ws/security/server.xml  | 10 +++-
 .../apache/cxf/systest/ws/security/stax-server.xml | 10 +++-
 .../org/apache/cxf/systest/ws/swa/client.xml       | 11 +++-
 .../apache/cxf/systest/ws/swa/policy-client.xml    | 11 +++-
 .../apache/cxf/systest/ws/swa/policy-server.xml    | 13 +++-
 .../org/apache/cxf/systest/ws/swa/server.xml       | 13 +++-
 .../cxf/systest/ws/swa/stax-policy-server.xml      | 13 +++-
 .../apache/cxf/systest/ws/tokens/bst-server.xml    | 12 +++-
 .../org/apache/cxf/systest/ws/tokens/client.xml    | 11 +++-
 .../cxf/systest/ws/tokens/endorsing-client.xml     | 11 +++-
 .../cxf/systest/ws/tokens/endorsing-server.xml     | 12 +++-
 .../org/apache/cxf/systest/ws/tokens/server.xml    | 12 +++-
 .../systest/ws/tokens/stax-endorsing-server.xml    | 12 +++-
 .../apache/cxf/systest/ws/tokens/stax-server.xml   | 12 +++-
 .../apache/cxf/systest/ws/tokens/tls-client.xml    | 11 +++-
 .../apache/cxf/systest/ws/tokens/tls-server.xml    | 12 +++-
 .../cxf/systest/ws/tokens/tls-stax-server.xml      | 12 +++-
 .../apache/cxf/systest/ws/ut/client-derived.xml    | 11 +++-
 .../org/apache/cxf/systest/ws/ut/client.xml        | 11 +++-
 .../org/apache/cxf/systest/ws/ut/policy-client.xml | 11 +++-
 .../org/apache/cxf/systest/ws/ut/policy-server.xml | 12 +++-
 .../apache/cxf/systest/ws/ut/server-derived.xml    | 12 +++-
 .../org/apache/cxf/systest/ws/ut/server.xml        | 12 +++-
 .../cxf/systest/ws/ut/stax-policy-server.xml       | 12 +++-
 .../org/apache/cxf/systest/ws/ut/stax-server.xml   | 12 +++-
 .../org/apache/cxf/systest/ws/wssc/client.xml      | 11 +++-
 .../org/apache/cxf/systest/ws/wssc/server.xml      | 12 +++-
 .../org/apache/cxf/systest/ws/wssc/unit-server.xml | 12 +++-
 .../org/apache/cxf/systest/ws/wssec10/client.xml   | 11 +++-
 .../cxf/systest/ws/wssec10/client_restricted.xml   | 11 +++-
 .../cxf/systest/ws/wssec10/client_unauthorized.xml | 11 +++-
 .../org/apache/cxf/systest/ws/wssec10/server.xml   | 13 +++-
 .../cxf/systest/ws/wssec10/server_authorized.xml   | 13 +++-
 .../cxf/systest/ws/wssec10/server_authorized_2.xml | 13 +++-
 .../cxf/systest/ws/wssec10/server_restricted.xml   | 13 +++-
 .../apache/cxf/systest/ws/wssec10/stax-server.xml  | 13 +++-
 .../systest/ws/wssec10/stax-server_restricted.xml  | 13 +++-
 .../org/apache/cxf/systest/ws/wssec11/client.xml   | 11 +++-
 .../cxf/systest/ws/wssec11/client_restricted.xml   | 11 +++-
 .../org/apache/cxf/systest/ws/wssec11/server.xml   | 11 +++-
 .../org/apache/cxf/systest/ws/x509/client.xml      | 12 +++-
 .../cxf/systest/ws/x509/intermediary-client.xml    | 11 +++-
 .../apache/cxf/systest/ws/x509/intermediary.xml    | 11 +++-
 .../apache/cxf/systest/ws/x509/jaxws-client.xml    | 11 +++-
 .../org/apache/cxf/systest/ws/x509/server.xml      | 13 +++-
 .../org/apache/cxf/systest/ws/x509/stax-server.xml | 13 +++-
 .../org/apache/cxf/systest/ws/xkms/client.xml      | 12 +++-
 .../org/apache/cxf/systest/ws/xkms/server.xml      | 13 +++-
 .../org/apache/cxf/systest/ws/xkms/stax-server.xml | 13 +++-
 .../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 13 +++-
 .../cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml    | 13 +++-
 .../apache/cxf/systest/ws/addressing/cxf-hpux.xml  |  7 ++-
 .../org/apache/cxf/systest/ws/addressing/cxf.xml   |  7 ++-
 .../cxf/systest/ws/addressing/jms_decoupled.xml    |  7 ++-
 .../apache/cxf/systest/ws/addressing/server.xml    |  6 +-
 .../cxf/systest/ws/addressing/spring/spring.xml    |  9 ++-
 .../cxf/systest/ws/addressing/wsa_interceptors.xml |  9 ++-
 .../cxf/systest/ws/policy/addr-anon-client.xml     |  9 ++-
 .../cxf/systest/ws/policy/addr-anon-server.xml     |  9 ++-
 .../systest/ws/policy/addr-inline-policy-old.xml   | 12 +++-
 .../cxf/systest/ws/policy/addr-inline-policy.xml   | 12 +++-
 .../apache/cxf/systest/ws/policy/addr-optional.xml |  9 ++-
 .../apache/cxf/systest/ws/policy/addr-wsdl11.xml   |  9 ++-
 .../java/org/apache/cxf/systest/ws/policy/addr.xml |  9 ++-
 .../org/apache/cxf/systest/ws/policy/addr0705.xml  |  9 ++-
 .../cxf/systest/ws/policy/http-addr-server.xml     |  7 ++-
 .../apache/cxf/systest/ws/policy/http-server.xml   |  7 ++-
 .../java/org/apache/cxf/systest/ws/policy/http.xml |  7 ++-
 .../ws/policy/http_client_policy_feature.xml       | 12 +++-
 .../java/org/apache/cxf/systest/ws/policy/rm.xml   |  8 ++-
 .../cxf/systest/ws/policy/rm10wsdl_server.xml      | 12 +++-
 .../cxf/systest/ws/policy/rm12wsdl_server.xml      | 11 +++-
 .../org/apache/cxf/systest/ws/policy/rmwsdl.xml    |  7 ++-
 .../wsdl_maven/codegen/src/it/cxf-4004/pom.xml     |  6 ++
 .../java2ws/src/main/webapp/WEB-INF/beans.xml      |  7 ++-
 tools/common/pom.xml                               | 10 +---
 .../org/apache/cxf/tools/common/ClassUtils.java    |  6 +-
 tools/javato/ws/pom.xml                            | 10 +---
 tools/validator/pom.xml                            | 10 +---
 .../cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 50 ++++++++--------
 .../cxf/tools/wadlto/jaxrs/WADLToJavaTest.java     |  2 +-
 tools/wsdlto/core/pom.xml                          | 10 +---
 tools/wsdlto/databinding/jaxb/pom.xml              | 10 +---
 tools/wsdlto/misc/pom.xml                          | 10 +---
 tools/wsdlto/test/pom.xml                          |  9 +--
 691 files changed, 5331 insertions(+), 1623 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/01: [CXF-7910] Change JAX-WS javax to jakarta artifact dependencies

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

deki pushed a commit to branch CXF-7910_jakarta_jaxws-api
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 60234cc84c2bfd2ab53504390685b64f37367464
Author: Dennis Kieselhorst <[hidden email]>
AuthorDate: Thu Jan 10 12:52:23 2019 +0100

    [CXF-7910] Change JAX-WS javax to jakarta artifact dependencies
---
 .../src/main/release/samples/jax_rs/minimal_osgi/pom.xml     |  4 ++--
 distribution/src/main/release/samples/pom.xml                |  6 +++---
 .../codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml     |  6 +++---
 maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml   |  8 ++++----
 .../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml   |  8 ++++----
 parent/pom.xml                                               | 12 +++---------
 pom.xml                                                      |  1 +
 services/wsn/wsn-core/pom.xml                                |  2 +-
 tools/javato/ws/pom.xml                                      |  4 ++--
 9 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 945642b..0848ecc 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -85,8 +85,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
-            <version>2.9.0</version>
+            <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
+            <version>2.3_1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 04eec01..f33410d 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -240,9 +240,9 @@
                     <version>1.3.1</version>
                 </dependency>
                 <dependency>
-                    <groupId>javax.xml.ws</groupId>
-                    <artifactId>jaxws-api</artifactId>
-                    <version>2.3.0</version>
+                    <groupId>jakarta.xml.ws</groupId>
+                    <artifactId>jakarta.xml.ws-api</artifactId>
+                    <version>2.3.2</version>
                 </dependency>
                 <dependency>
                     <groupId>javax.activation</groupId>
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index 82d4685..ec96ff2 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -155,9 +155,9 @@
             <version>1.3.1</version>
           </dependency>
           <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.2.9</version>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
+            <version>2.3.2</version>
           </dependency>
           <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
index 3649a8b..c4e5b23 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -84,10 +84,10 @@
                     <version>1.3.1</version>
                 </dependency>
                 <dependency>
-                    <groupId>javax.xml.ws</groupId>
-                    <artifactId>jaxws-api</artifactId>
-                    <version>2.3.0</version>
-                    </dependency>
+                    <groupId>jakarta.xml.ws</groupId>
+                    <artifactId>jakarta.xml.ws-api</artifactId>
+                    <version>2.3.2</version>
+                </dependency>
                 <dependency>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
diff --git a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
index f45a3cb..eb8e7a2 100644
--- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
@@ -86,10 +86,10 @@
                     <version>1.3.1</version>
                 </dependency>
                 <dependency>
-                    <groupId>javax.xml.ws</groupId>
-                    <artifactId>jaxws-api</artifactId>
-                    <version>2.3.0</version>
-                    </dependency>
+                    <groupId>jakarta.xml.ws</groupId>
+                    <artifactId>jakarta.xml.ws-api</artifactId>
+                    <version>2.3.2</version>
+                </dependency>
                 <dependency>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index df39c3c..32b4e63 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2819,15 +2819,9 @@
                     <version>1.3.1</version>
                 </dependency>
                 <dependency>
-                    <groupId>javax.xml.ws</groupId>
-                    <artifactId>jaxws-api</artifactId>
-                    <version>2.3.0</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.xml.bind</groupId>
-                            <artifactId>jaxb-api</artifactId>
-                        </exclusion>
-                    </exclusions>
+                    <groupId>jakarta.xml.ws</groupId>
+                    <artifactId>jakarta.xml.ws-api</artifactId>
+                    <version>2.3.2</version>
                 </dependency>
                 <dependency>
                     <groupId>com.sun.activation</groupId>
diff --git a/pom.xml b/pom.xml
index 906237c..c2f49e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -688,6 +688,7 @@
                                     <exclude>javax.ws.rs:javax.ws.rs-api</exclude>
                                     <exclude>javax.xml.bind:jaxb-api</exclude>
                                     <exclude>com.sun.xml.bind:jaxb-core</exclude>
+                                    <exclude>javax.xml.ws:jaxws-api</exclude>
                                 </excludes>
                             </bannedDependencies>
                         </rules>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index bbc05dd..38d5310 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
-            <version>2.2.10</version>
+            <version>2.3.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index bc2dfad..4986b6b 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -229,8 +229,8 @@
                                             <outputDirectory>${project.basedir}/target/java9</outputDirectory>
                                         </artifactItem>
                                         <artifactItem>
-                                            <groupId>javax.xml.ws</groupId>
-                                            <artifactId>jaxws-api</artifactId>
+                                            <groupId>jakarta.xml.ws</groupId>
+                                            <artifactId>jakarta.xml.ws-api</artifactId>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>
                                             <outputDirectory>${project.basedir}/target/java9</outputDirectory>