You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/05/08 20:57:05 UTC
[cxf] branch saaj-impl updated (7986c7d -> e038fb3)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch saaj-impl
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 7986c7d remove unused property
add 707e237 remove obsolete exclusion
add e757560 Update to maven-invoker-plugin 3.2.1
add df0e67e CXF-8207: SseEventSource loses lastEventId on the 2nd reconnect attempt
add 74f8ead [CXF-7996] added a testcase, currently failing
add 92a00fc Update Velocity version to 2.2
add 2cde96f CXF-8164: Upgrade to Spring Reactor 3.3.x
add fa49de6 cxf-systests-transports: remove deprecated PropertyPlaceholderConfigurer
add 84f9bb7 cxf-rt-ws-security: use DOMUtils.getDomElement
add 33c01f3 CXF-8209 - Add a way of configuring the RMI environment in InstrumentationManagerImpl
add d17a51c Updating to Spring Security 5.2.2
add a2296f2 CXF-7959: WebClient invocation builder header(name, value) method is not implemented according to interface specification
add 0b75808 cxf-core: fix checkstyle
add 79466c5 Incompatibility with recent Brave versions causes NullPointerException and hides root cause (#639)
add a3b2ca9 Updating Brave OSGi sample README file
add a5aeebd cxf-rt-rs-security-oauth2: process data with streams
add ce50414 [CXF-8194] Update MP RestClient to 1.4.0
add 12b0c59 cxf-systests-rs-security: use OAuthClientUtils.getAccessToken
add a44960c cxf-systests-rs-security: add testAuthorizationCodeFlowWithPKCE
add f965e49 remove redunant plugins
add de494a4 Update to jakarta el-api 3.0.3
add 4bae9be Update to jboss weld 3.1.3.Final
add 7934eff Log error in the AllowAllHostnameVerifier
add 2a6b732 Cxf 8208 - Handle exceptions when looking up swagger ui resources (#637)
add aa403a0 Removing spring3.0 profile
add 543de65 Prevent RMI registry rebind (#641)
add 0bd7ffe Update to lastest asm
add 63bf9f4 [CXF-8219] upgrade to netty 4.1.45.Final
add 224fa74 CXF-8149 Reduce synchronization in AbstractJXBProvider (#597)
add fca1472 use DefaultBasicAuthSupplier.getBasicAuthHeader
add 88c383e Update to maven-enforcer-plugin 3.0.0-M3
add 68d2120 CXF-7910 switch to jakarta.json; update to geronimo.json 1.3
add 73f1f1c codegen-plugin: skip maven-invoker-plugin when maven.test.skip.exec set
add 8dc92f1 codegen-plugin: revert back toolchain activation
add c7dff86 fix compilation on Java 13+ (#641)
add f2208f2 fix compilation on Java 8 after Java 13+ fix (#641)
add 1ce8d47 skip maven-invoker-plugin when maven.test.skip.exec set
add 6c36865 cxf-systests-rs-security: configure client HTTPS from code
add cbc0fde cxf-rt-rs-security-sso-oidc: allow to override userInfoEndpointAddress
add 07a8053 cxf-rt-rs-security-oauth2: clone List
add 024fcd0 [CXF-8223]Be able to read empty entity from a Response with 202
add 0b1c413 cxf-core: ensure that StringUtils.toHexString result is multiple of two
add 67643a4 CXF-8220: The tag http.status_code is always 200 in server side tracing span, no matter what situation
add c598ecf cxf-rt-rs-security-oauth: use MessageDigestUtils
add 49a3be1 cxf-rt-transports-jms: update JMSUtil.createCorrelationId
add 540e471 avoid null assignment
add 972a275 Update to tomcat 8.5.51
add c4aefe5 CXF-8215: SSE breaks Pipeline Processing (#643)
add 7ed31b3 CXF-8215: SSE breaks Pipeline Processing. Adding proper headers propagation.
add 513f29f Fixed JDK8 tooling, mark build as unstable (instead of failed) when tests are run but some failed
add a7169e5 Updating Jetty
add 88871e7 OAuth 2.0 Dynamic Client Registration: include grant_types to response
add f2da164 Updating Spring + Spring Boot
add ce329cb [CXF-8225] Structure send method of Slf4jEventSender (#644)
add 3ba61d2 cxf-systests-rs-security: add test with JwsVerifier from jwks
add b70a391 Updating Jackson
add 80b32bb Update to Hibernate 5.4.12.Final
add 44a9307 cxf-rt-rs-json-basic: update JsonMapObject
add 3332e74 [CXF-8202] Update to OSGi Core 6.0.0 (#633)
add 92ff50f CXF-8231 - JAX-RS JOSE can't decrypt ECDHAESKeywrap
add de81796 Bumps to latest brave (#647)
add a8ae6bc cxf-rt-rs-json-basic: minor improvements
add b62c25d cxf-rt-rs-security-jose: minor improvements
add 1bd3463 back itests-felix
add cdf7685 cxf-systests-rs-security: include key id
add 169be66 CXF-8229 OAuth 2.0 Dynamic Client Registration: Client Update Request (#646)
add 6e828d6 CXF-8222 OIDC Refresh Response: ID Token iat Claim MUST represent the time that the new ID Token is issued (#645)
add 2c661c9 Updating Apache DS to 2.0.0.AM26
add f87a83b Updating HTTP Client to 4.5.12
add b9380e9 Configure sendServerVersion for OSGi/Blueprint
add 71ed1be CXF-8234 - Only disable output stream optimization in TransformOutInterceptor if it isn't configured already
add b6ad0ff CXF-8234 - Checkstyle fix
add 85b048e cxf-systests-rs-security: explicit 'issuer' initialization
add 2f9c529 CXF-8235 Handle null continuation in AsyncResponseImpl instead of throwing a NullPointerException (#649)
add 7971b50 Update to microprofile.rest.client 1.4.1
add 5b59268 CXF-8215: SSE breaks Pipeline Processing. Fixed the regression (the request filters are called twice for non-SSE endpoints), fixed CDI support
add 3611175 CXF-8234 - Add the encoding to the TransformOutInterceptor XMLStreamWriter
add d34a270 CXF-8234 - Removing unused method
add df4a4d6 CXF-8237 OAuth 2.0 Authorization Server Metadata / OpenID Provider Metadata (#650)
add b7a8df7 CXF-8240 - STSClient produces wrong element order for TokenType
add 0de9dca cxf-rt-rs-json-basic: cleanup pom
add 9c37b6c Update to maven-checkstyle-plugin 3.1.1
add 29f9d03 [CXF-8241]cxf-codegen-plugin not using the proxy port configured in settings.xml
add 5e511db Fixing some Jakarta JAX-RS TCKs tests due to missing dependencies
add 330f0f9 CXF-8238: Tracing spans need more tag to make it clearer
add 1367e94 Updating ActiveMQ to 5.15.12
add babe9c6 Updating Apache Tomcat
add 16d2858 Updating Tika to 1.24
add c8b2075 Updating woodstox to 5.3.0
add 6a984d1 Adding a test for the service listing + private endpoints
add 4644035 CXF-8246 - The bus may be null on instantiating ServiceListGeneratorServlet in OSGi
add 1ce6cb7 Removing some unused test code
add b899a64 Updating Undertown to 2.0.30
add 4067920 Updating owasp to 5.3.1
add 3026d63 Updating Tika to 1.24 in the samples
add 1e3817e Updating Jettison to 1.4.1
add 8f98004 cxf-rt-rs-security-oauth2: use lambdas in JPA
add 16cbb21 CXF-8249: SSE client refuses to accept valid stream
add 1c7ddfd Updating Spring Security to 5.3.0
add 794949e Adding an @Ignored test for RPC-Literal issue
add 2e43632 Bridge/synthetic methods may not have the parameter annotations, search for the actual method to use
add b563f7b Prevent SOAPAction spoofing for RPC/Lit services
add 19c0024 Fixing checkstyle
add a207359 examples: update plugins
add dd976dd cxf-systests-microprofile-weld: rollback wiremock-maven-plugin version
add 1cf4fed CXF-8250 - Remove createMBServerConnectorFactory functionality from the JMX InstrumentationManager
add 93246fa Updating Spring to 5.2.5
add ccb743e Updating Jetty version in samples to 9.4.27.v20200227
add 67dbf83 Fixing samples build
add 51417a1 Updating Spring Boot to 2.2.6
add 4ee3180 [CXF-8251]introduce a new property in http-undertow transport so that can enable http/2 if necessary
add e73daaa examples: Updating Spring Boot to 2.2.6
add 0841019 Upgrade to Jakarta Xml Ws 2.3.3
add ea3f552 Upgrade to Jakarta Xml Bind 2.3.3
add f4f227b cxf-rt-bindings-corba: move jacorb dependency
add 8b11d6b Consolidate getTargetMethod calls
add 7aa6e0a Code review comments - use Optional<Method>
add 0a62ccf Merge pull request #656 from andymc12/consolidateGetTargetMethod
add 3921fc2 CXF-8242: Stop blocking executor thread on microprofile rest asynchronous call (#654)
add a8fcf81 Adding build number to TCK Jenkins job build name
add 5fdadf9 Update Commons Lang version to 3.10
add 12e20a5 Update Swagger UI to 3.25.0
add 2cff3ce Upgrade to Netty 4.1.48.Final
add 6bc7f0c Upgrade to Jakarta Mail 1.6.5
add 9c2721f Upgrade to Rxjava2 2.2.19
add 4081929 cxf-services-xkms: update readme
add c287485 CXF-8243 JwtAccessTokenValidator using the JWK Set URL (#652)
add 7b4622f Adding a test case for TlS trustManager refs in Spring
add c6b87a0 CXF-7998: add integration test
add 3157955 CXF-8253 - Provide a way to disable TLS trust verification for the OSGi HttpConduitConfigApplier
add 4f23c3f CXF-8242: Stop blocking executor thread on microprofile rest asynchronous call. Fixing handler invocation flow.
add e0b16df CXF-8242: Stop blocking executor thread on microprofile rest asynchronous call. Fixing JAX-WS handler invocation flow.
add de221ef Updating to Spring Security 5.3.1.RELEASE
add 797fa44 [CXF-7949] Upgrade to Jakarta Servlet API 4.0.3
add daf7c2a [CXF-7949] Remove cxf.servlet-api-2.5.* properties
add 5bc1e0e [CXF-7949] Upgrade to Tomcat 9.0.30
add 4a56c1e [CXF-7949] fix tests used embded Tomcat
add 12b80dc Update to Tomcat 9.0.31
add 2e7df5d Update to tomcat 9.0.33
add bcb05eb Merge pull request #626 from apache/CXF-7949_jakarta-servlet
add f68556e Updating OpenSAML bundle to 3.4.5_1
add c82d702 cxf-systests-jaxrs: update JAXRS20ClientServerBookTest
add 79dafbd Upgrade to Jakarta Persistence API 2.2.3
add 3f3dc69 Updating BouncyCastle to 1.65
add 9425968 Make sure to close the SAML cache
add bc31b97 CXF-8254 - NPE in WebFaultOutInterceptor handleMessage method
add 95dc2d0 [CXF-8151] Upgrade to Bean Validation 2.x and Hibernate Validator 6.1.0
add aa99567 [CXF-8151] Upgrade to Swagger Core 2.1.2
add f1fa1e7 [CXF-8151] also update Swagger 1.x to 1.6.1
add 22a365b [CXF-8151] Upgrade to classgraph 4.8.25
add 0af6ac0 [CXF-8151] Upgrade to hibernate-validator 6.1.2.Final
add 694741b Karaf features: downgrade javax.validation for swagger2
add 61c6740 [CXF-8151] Upgrade to validation-api 2.0.2
add 55de869 Merge pull request #657 from apache/CXF-8151_bean-validation
add 432c6a3 Consolidating some STS caching tests
add b5d0c54 add old servlet-api coordinates to banned dependencies (Jakarta dependency should be used instead)
add 6f9303c add old json-api coordinates to banned dependencies (Jakarta dependency should be used instead)
add e38fc4a CXF-8078: Support RxJava 3.0
add 08a30d9 Make sure we can load any EhCache config in an OSGi container
add 74816c5 CXF-7594 - Support EhCache 3+ (#658)
add 97e891d osgi: remove wrap from velocity bundle
add c87876c Update to async-http-client 2.12.1
add 582c88e Picking up changes from SANTUARIO-533
add dfa8498 Picking up changes relating to WSS-668
add 3cd982b Picking up some changes from WSS-669
add 9196eb8 Picking up a change from SANTUARIO-536
add 9387c3f Making cache close methods synchronized
add 16e8620 Refactor of MSV dependencies
add e6ca654 Updating Mockito and fixing deprecated method call
add a5161fd CXF-8260 - Remove HBase search component
add 9f8c167 CXF-8259: Blocked thread of JMS transport during jboss shutdown (#659)
add d0ab914 Update to Javadoc plugin 3.2.0
add 5044428 Update owasp to 5.3.2
add 7a655b4 Updating pax exam to 4.13.3
add 504f947 CXF-8264 - Remove Log4J 1.x dependencies
add 375b065 update Maven minor version
add 56e962c CXF-8265: [JDK14] Accommodate SSLv3 deprecation
add 2e3258c Update to slf4j 1.7.30
add 62f1035 Update cxf-transports-websocket-client Karaf feature dependencies
add fa1238f Update EasyMock to 4.2
add fc54b7f Update Commons Codec to 1.14
add 49b765b Updating Jetty to 9.4.28.v20200408
add d9fd7f1 Updating Reactor to 3.3.4.RELEASE
add b84270d Updating Snakeyaml to 1.26
add 2a5629f Updating XBean to 4.16
add f201f1e Updating Checkstyle to 8.31
add f39f726 Updating awaitility to 4.0.2
add 591a007 Updating ant to 1.10.7
add ff7b028 Moving Artemis dependencies into the sample where they are used
add 9762b77 Make sure to unset the properties for SSLv3 when done
add ce23b66 Update to maven-antrun-plugin 3.0.0
add 49337a7 Update to stax-ex 1.8.3
add caf6f42 cxf-distribution-javadoc: fix warnings
add 5ed3a96 A few trivial changes to the Stax Validator code
add 9d46140 CXF-8267 - Syntax error in wsdl2java.bat + wsdl2service.bat. Thanks to Christoph Leuzinger for the patch.
add 16e0e3d cxf-services-sts-core: avoid null assignment
add ac56abe cxf-services-sts-core: use ConcurrentHashMap
add 0919568 cxf-rt-javascript: fix warnings
add bcb2af9 cxf-tools-common: avoid useless null check
add 727c2b8 Updating Netty to 4.1.49.Final
add 8823c80 fix: invalid 'client_secret_expires_at' value (#661)
add 4b43096 Updating Tika to 1.24.1
add 706dd02 CXF-8269 Servlet Transport: allow any whitespace character as param-value separator
add 177afff back protected
add 76a770f CXF-8129 - Add support for Woodstox 6.2.x (#588)
add 9584a56 CXF-8261: Exceptions being thrown in a ClientResponseFilter are ignored (#662)
add 6ef11c9 Fixing a few typos
add 73ab0d3 CXF-8270 - fix SSL persistent connection (#664)
add fce6a87 Updating Hibernate validator
add a0ea980 Updating Spring to 5.2.6
add 0f1b331 Updating Swagger UI to 3.25.1
add 2d2e384 HttpAuthHeader: use String.join
add a409fb5 Should fail on valid responses in DispatchClientServerWithHugeResponseTest
add 1c6ea39 CXF-8273 - Remove static methods from StaxUtils to restrict XML level/count
add b2ba19a CXF-8273 - Tidying up how we parse values in StaxUtils
add d334b46 Replace deprecated PropertyPlaceholderConfigurer with PropertySourcesPlaceholderConfigurer
add 428a40a Switching Jakarta EE TCK branch from 'master' to '8.0' since master is quite unstable and always changing
add 337b24a Adding more StaxUtils tests
add 568b967 CXF-8271: The async JAX-RS client never completes the response in case of an exception during the interceptor chain processing. (#665)
add ffb3dd0 support xbean-asm8 shade
add dbf838d Merge pull request #668 from rmannibucau/patch-2
add d6be151 fix: pass 'maxInactiveInterval' though overloaded methods (#667)
add 1a71e4c Some optimisations for TrustedAuthorityValidator
add e4b7097 CXF-8275 - Support CRL/OCSP cert extensions in the XKMS TrustedAuthorityValidator
add eec13f4 upgrade guava, CVE-2018-10237 (#638)
add 37a8716 CXF-5216 - WSDL definition cache issue for web service client when WSDL in service war changed
add 9c146e1 Updating to OpenSAML bundle 3.4.5_2 (#663)
add d5ad40b Updating Jackson to 2.10.4
add 41c6c00 DigestAuthSupplier: fix nc-value and update cnonce generation (#666)
add 18671fb Update to maven-pmd-plugin 3.13.0
add cb337b7 Revert "Update to maven-pmd-plugin 3.13.0"
add 6067969 Updating to Spring Security 5.3.2.RELEASE
add 8c3e380 Only add parenthesese to regex pattern when needed. (#671)
add a3682d5 Updating to Spring Boot 2.2.7.RELEASE
add da5a3db [CXF-8276] BOM POM File with only CXF modules
add 3b851e9 remove unused org.apache.xbean:xbean-spring
add b68f3c6 remove unused org.springframework:spring-jms
add 4ac0628 Update to jakarta.xml.soap-api 1.4.2
add cd2e923 karaf features module: cleanup pom
add cd7cbb3 Upgrade to Glassfish Jaxb 2.3.3
add f54f4b4 samples:sync activation-api version
add 909190a CXF-8280 - Also try URL decoding when trying to match attachments in WS-Security.
add a1b0abe Add the ability to configure revocation for Jose
new 0e424e7 Merge remote-tracking branch 'cxf/master' into saaj-impl
new e038fb3 Upgrade to Saaj Impl 1.5.2
The 2 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:
bom/pom.xml | 576 ++++++++++++++
core/pom.xml | 19 +-
.../org/apache/cxf/common/logging/Log4jLogger.java | 209 -----
.../org/apache/cxf/common/logging/LogUtils.java | 2 +-
.../java/org/apache/cxf/common/util/ASMHelper.java | 1 +
.../org/apache/cxf/common/util/StringUtils.java | 15 +-
.../org/apache/cxf/common/util/URIParserUtil.java | 16 +-
.../org/apache/cxf/endpoint/ClientCallback.java | 79 +-
.../java/org/apache/cxf/helpers/JavaUtils.java | 16 +-
.../security/AbstractAuthorizingInInterceptor.java | 20 +-
.../transform/TransformOutInterceptor.java | 30 +-
.../main/java/org/apache/cxf/message/Message.java | 7 +
.../java/org/apache/cxf/message/MessageUtils.java | 15 +
.../java/org/apache/cxf/staxutils/StaxUtils.java | 173 ++---
.../cxf/staxutils/transform/TransformUtils.java | 16 +-
.../cxf/staxutils/validation/EmbeddedSchema.java | 49 --
.../ResolvingGrammarReaderController.java | 87 ---
.../staxutils/validation/Stax2ValidationUtils.java | 58 +-
.../validation/W3CMultiSchemaFactory.java | 71 +-
.../validation/AbstractValidationInterceptor.java | 13 +-
.../apache/cxf/common/util/StringUtilsTest.java | 6 +
.../apache/cxf/configuration/spring/test-beans.xml | 2 +-
.../apache/cxf/endpoint/ClientCallbackTest.java | 164 ++++
.../org/apache/cxf/message/MessageUtilsTest.java | 83 ++
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 144 +++-
.../validation/Stax2ValidationUtilsTest.java | 10 +-
.../security/DeprecatedSecurityContextTest.java | 10 +-
distribution/javadoc/pom.xml | 50 +-
distribution/manifest/pom.xml | 4 +-
distribution/pom.xml | 8 +-
distribution/src/main/release/bin/wsdl2java.bat | 2 +-
distribution/src/main/release/bin/wsdl2service.bat | 2 +-
.../src/main/release/samples/corba/bank/pom.xml | 9 -
.../samples/corba/bank_ws_addressing/pom.xml | 13 +-
.../release/samples/groovy_spring_support/pom.xml | 4 -
.../src/main/resources/ClientConfig.xml | 2 +-
.../jax_rs/description_openapi_v3_osgi/README.txt | 2 +-
.../jax_rs/description_swagger2_osgi/README.txt | 2 +-
.../jax_rs/description_swagger2_web/pom.xml | 4 +-
.../src/main/release/samples/jax_rs/search/pom.xml | 6 +-
.../release/samples/jax_rs/tracing_brave/pom.xml | 6 +-
.../samples/jax_rs/tracing_brave_osgi/README.txt | 2 +-
.../samples/jax_rs/tracing_brave_osgi/pom.xml | 4 +-
.../samples/jax_rs/tracing_opentracing/pom.xml | 4 +-
.../jax_rs/tracing_opentracing_osgi/pom.xml | 4 +-
.../main/release/samples/jax_rs/websocket/pom.xml | 3 -
.../src/main/java/demo/jaxrs/client/Client.java | 126 ++-
.../demo/jaxrs/client/WebSocketTestClient.java | 205 +++--
.../src/main/release/samples/jms_pubsub/pom.xml | 3 +
.../src/main/release/samples/oauth/client/pom.xml | 4 +-
distribution/src/main/release/samples/pom.xml | 26 +-
.../main/java/demo/throttling/client/Client.java | 1 -
.../src/main/release/samples/ws_eventing/pom.xml | 6 +-
.../main/java/demo/wssec/client/StaxClient.java | 4 +-
.../main/java/demo/wssec/server/StaxServer.java | 4 +-
.../main/resources/server-applicationContext.xml | 2 +-
integration/cdi/pom.xml | 6 -
.../apache/cxf/jca/core/logging/LoggerHelper.java | 8 -
integration/spring-boot/autoconfigure/pom.xml | 16 +-
integration/spring-boot/starter-jaxrs/pom.xml | 4 +-
integration/spring-boot/starter-jaxws/pom.xml | 4 +-
.../tracing/brave/AbstractBraveClientProvider.java | 5 +-
.../cxf/tracing/brave/AbstractBraveProvider.java | 16 -
.../cxf/tracing/brave/BraveStopInterceptor.java | 2 +-
.../AbstractOpenTracingClientProvider.java | 1 +
.../opentracing/AbstractOpenTracingProvider.java | 1 +
.../opentracing/OpenTracingStopInterceptor.java | 2 +-
maven-plugins/codegen-plugin/pom.xml | 6 +-
.../Cxf7998Service-1.0.0.wsdl | 43 ++
.../pom.xml | 79 +-
.../src/it/jdk-cxf-with-toolchain/pom.xml | 44 +-
.../codegen-plugin/src/it/mark-generated/pom.xml | 58 +-
.../src/it/wsdl-artifact-resolution/pom.xml | 58 +-
.../cxf/maven_plugin/AbstractCodegenMojo.java | 2 +-
maven-plugins/java2swagger-plugin/pom.xml | 5 -
maven-plugins/java2wadl-plugin/pom.xml | 6 -
.../maven_plugin/javatowadl/ParseJavaDocMojo.java | 4 +-
maven-plugins/wadl2java-plugin/pom.xml | 5 +-
osgi/bundle/compatible/pom.xml | 59 +-
osgi/bundle/pom.xml | 96 ---
osgi/itests-felix/pom.xml | 19 +-
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 53 +-
.../apache/cxf/osgi/itests/OSGiTestSupport.java | 11 +-
osgi/itests/pom.xml | 2 +-
osgi/karaf/commands/pom.xml | 2 +-
osgi/karaf/features/pom.xml | 26 +-
.../karaf/features/src/main/resources/features.xml | 37 +-
osgi/pom.xml | 2 +-
parent/pom.xml | 845 +++------------------
pom.xml | 35 +-
rt/bindings/corba/pom.xml | 17 +
.../binding/soap/interceptor/Messages.properties | 1 +
.../binding/soap/interceptor/RPCInInterceptor.java | 5 +
.../cxf/aegis/type/aegisOptionsTestBeans.xml | 2 +-
rt/features/logging/pom.xml | 2 +-
.../cxf/ext/logging/slf4j/Slf4jEventSender.java | 44 +-
rt/frontend/jaxrs/pom.xml | 8 +-
.../apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 5 +
.../jaxrs/impl/tl/ThreadLocalServletContext.java | 28 +
.../org/apache/cxf/jaxrs/model/URITemplate.java | 17 +-
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 115 ++-
.../cxf/jaxrs/provider/JAXRSDataBinding.java | 16 +-
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 25 +-
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 28 +
.../apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 14 +
.../apache/cxf/jaxrs/model/URITemplateTest.java | 32 +
.../org/apache/cxf/jaxws/JaxwsClientCallback.java | 22 +-
.../jaxws/interceptors/WebFaultOutInterceptor.java | 11 +-
.../apache/cxf/jaxws/JaxwsClientCallbackTest.java | 162 ++++
.../org/apache/cxf/javascript/cxf-utils.js | 4 +-
.../java/org/apache/cxf/javascript/AegisTest.java | 1 +
.../src/test/resources/AegisBeans.xml | 2 +-
.../src/test/resources/AnyBeans.xml | 2 +-
.../test/resources/DocLitBareClientTestBeans.xml | 2 +-
.../resources/DocLitWrappedClientTestBeans.xml | 2 +-
.../src/test/resources/GreeterClientTestBeans.xml | 2 +-
.../src/test/resources/HelloWorldDocLitBeans.xml | 2 +-
.../src/test/resources/HelloWorldGreeterBeans.xml | 2 +-
.../src/test/resources/MtoMBeans.xml | 2 +-
.../src/test/resources/RPCClientTestBeans.xml | 2 +-
.../src/test/resources/XMLHttpRequestTestBeans.xml | 2 +-
.../src/test/resources/attributeTestBeans.xml | 2 +-
rt/management/pom.xml | 24 +
.../management/jmx/InstrumentationManagerImpl.java | 52 +-
.../management/jmx/MBServerConnectorFactory.java | 186 -----
.../cxf/management/utils/ManagementConsole.java | 2 +-
.../cxf/management/InstrumentationManagerTest.java | 2 -
.../cxf/management/jmx/BusRegistrationTest.java | 6 -
.../jmx/JMXManagedComponentManagerTest.java | 23 +-
.../cxf/management/jmx/MBServerConnectorTest.java | 57 --
.../src/test/resources/managed-spring.xml | 4 -
.../src/test/resources/managed-spring3.xml | 4 -
.../src/test/resources/no-connector-spring.xml | 1 -
.../apache/cxf/jaxrs/client/AbstractClient.java | 6 +-
.../cxf/jaxrs/client/JaxrsClientCallback.java | 32 +-
.../spec/ClientResponseFilterInterceptor.java | 27 +-
.../jaxrs/client/spec/InvocationBuilderImpl.java | 8 +-
.../cxf/jaxrs/client/JaxrsClientCallbackTest.java | 193 +++++
.../client/spec/ClientResponseFilterTest.java | 252 ++++++
.../client/spec/InvocationBuilderImplTest.java | 9 +
rt/rs/description-swagger-ui/pom.xml | 5 +
.../jaxrs/swagger/ui/SwaggerUiResourceLocator.java | 8 +-
.../swagger/ui/SwaggerUIResourceLocatorTest.java | 36 +-
rt/rs/description-swagger/pom.xml | 1 +
rt/rs/extensions/json-basic/pom.xml | 9 -
.../apache/cxf/jaxrs/json/basic/JsonMapObject.java | 44 +-
.../json/basic/JsonMapObjectReaderWriter.java | 10 +-
.../cxf/jaxrs/json/basic/JsonMapObjectTest.java | 54 ++
rt/rs/extensions/providers/pom.xml | 6 +-
rt/rs/extensions/{json-basic => rx3}/pom.xml | 31 +-
.../cxf/jaxrs/rx3/client/FlowableRxInvoker.java | 105 +++
.../jaxrs/rx3/client/FlowableRxInvokerImpl.java | 199 +++++
.../rx3/client/FlowableRxInvokerProvider.java | 22 +-
.../cxf/jaxrs/rx3/client/ObservableRxInvoker.java | 104 +++
.../jaxrs/rx3/client/ObservableRxInvokerImpl.java | 198 +++++
.../rx3/client/ObservableRxInvokerProvider.java | 22 +-
.../cxf/jaxrs/rx3/server/ReactiveIOCustomizer.java | 34 +-
.../cxf/jaxrs/rx3/server/ReactiveIOInvoker.java | 71 ++
...rs.ext.JAXRSServerFactoryCustomizationExtension | 1 +
rt/rs/extensions/search/pom.xml | 22 +-
.../jaxrs/ext/search/hbase/HBaseQueryVisitor.java | 142 ----
.../jaxrs/ext/search/hbase/HBaseVisitorTest.java | 85 ---
rt/rs/microprofile-client/pom.xml | 4 +-
.../microprofile/client/MPRestClientCallback.java | 31 +-
.../client/MPRestClientCallbackTest.java | 161 ++++
rt/rs/pom.xml | 1 +
.../cxf/rs/security/jose/common/JoseUtils.java | 6 +-
.../security/jose/common/KeyManagementUtils.java | 34 +-
.../jwe/EcdhAesWrapKeyDecryptionAlgorithm.java | 4 +-
.../security/jose/jwe/JweJwtCompactConsumer.java | 9 +-
.../apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +-
.../cxf/rs/security/jose/jwk/JsonWebKeys.java | 6 +-
.../apache/cxf/rs/security/jose/jwk/JwkUtils.java | 2 +-
.../rs/security/jose/jws/JwsCompactProducer.java | 12 +-
.../apache/cxf/rs/security/jose/jws/JwsUtils.java | 4 -
.../cxf/rs/security/jose/jwt/JoseJwtConsumer.java | 2 +-
.../apache/cxf/rs/security/jose/jwt/JwtToken.java | 6 +-
.../jose/jwa/JwaDecryptRfcConformanceTest.java | 10 +
.../oauth/provider/MD5SequenceGenerator.java | 20 +-
rt/rs/security/oauth-parent/oauth2/pom.xml | 55 +-
.../security/oauth2/client/OAuthClientUtils.java | 25 +-
.../filters/JwsJwksJwtAccessTokenValidator.java | 112 +++
.../oauth2/grants/code/JPACMTCodeDataProvider.java | 20 +-
.../oauth2/grants/code/JPACodeDataProvider.java | 69 +-
.../grants/refresh/RefreshTokenGrantHandler.java | 5 +-
.../oauth2/provider/AbstractOAuthDataProvider.java | 20 +-
.../oauth2/provider/JPAOAuthDataProvider.java | 214 +++---
.../services/AbstractAccessTokenValidator.java | 2 +-
.../oauth2/services/AccessTokenService.java | 2 +-
.../services/AuthorizationCodeGrantService.java | 2 +-
.../oauth2/services/AuthorizationMetadata.java | 266 +++++++
.../services/AuthorizationMetadataService.java | 5 +-
.../services/ClientRegistrationResponse.java | 9 +-
.../services/DynamicRegistrationService.java | 52 +-
.../rs/security/oauth2/services/JwksService.java} | 9 +-
.../services/RedirectionBasedGrantService.java | 7 +-
.../oauth2/services/WellKnownService.java} | 20 +-
.../hawk/AbstractHawkAccessTokenValidator.java | 2 +-
.../security/oauth2/utils/AuthorizationUtils.java | 2 +-
.../cxf/rs/security/oauth2/utils/OAuthUtils.java | 38 +-
.../JwsJwksJwtAccessTokenValidatorTest.java | 90 +++
.../rs/security/oauth2/utils/OAuthUtilsTest.java | 20 +
rt/rs/security/oauth-parent/pom.xml | 5 -
rt/rs/security/sso/oidc/pom.xml | 10 +-
.../security/oidc/idp/IdTokenResponseFilter.java | 9 +-
.../oidc/idp/OidcConfigurationService.java | 22 +-
.../oidc/idp/OidcDynamicRegistrationService.java | 8 +-
.../cxf/rs/security/oidc/idp/OidcKeysService.java | 53 +-
.../rs/security/oidc/idp/OidcProviderMetadata.java | 245 ++++++
.../cxf/rs/security/oidc/idp/UserInfoService.java | 2 +-
.../oidc/rp/OidcRpAuthenticationFilter.java | 2 +-
.../cxf/rs/security/oidc/utils/OidcUtils.java | 17 +
rt/rs/security/sso/saml/pom.xml | 6 +-
.../AbstractRequestAssertionConsumerHandler.java | 4 +-
.../security/saml/sso/EHCacheTokenReplayCache.java | 166 ++--
.../cxf/rs/security/saml/sso/EHCacheUtil.java | 88 ---
.../saml/sso/SAMLSSOResponseValidator.java | 7 +-
.../cxf/rs/security/saml/sso/TokenReplayCache.java | 5 +-
.../saml/sso/state/EHCacheSPStateManager.java | 175 ++---
.../rs/security/saml/sso/state/RequestState.java | 26 +
.../rs/security/saml/sso/state/ResponseState.java | 23 +
.../saml/src/main/resources/cxf-samlp-ehcache.xml | 47 +-
.../cxf/rs/security/saml/sso/EHCacheUtilTest.java | 59 --
.../rs/security/saml/sso/SPStateManagerTest.java | 133 ++++
.../rs/security/saml/sso/TokenReplayCacheTest.java | 108 +++
.../saml/src/test/resources/cxf-test-ehcache.xml | 5 -
.../cxf/rs/security/xml/XmlSecOutInterceptor.java | 2 +-
.../cxf/jaxrs/sse/SseEventSinkContextProvider.java | 9 +
.../java/org/apache/cxf/jaxrs/sse/SseFeature.java | 7 +
.../jaxrs/sse/client/InboundSseEventProcessor.java | 50 +-
.../cxf/jaxrs/sse/client/SseEventSourceImpl.java | 6 +-
.../ext/SseTransportCustomizationExtension.java | 2 +
.../cxf/jaxrs/sse/interceptor/SseInterceptor.java | 139 ++++
.../cxf/transport/sse/SseProvidersExtension.java | 4 +-
.../jaxrs/sse/client/SseEventSourceImplTest.java | 104 ++-
.../interceptor/ClaimsAuthorizingInterceptor.java | 20 +-
.../cxf/rt/security/rs/RSSecurityConstants.java | 5 +
rt/transports/http-hc/pom.xml | 2 +-
.../http/asyncclient/AsyncHTTPConduit.java | 8 +-
rt/transports/http-jetty/pom.xml | 2 +-
.../http_jetty/JettyHTTPServerEngine.java | 19 +-
.../JettyHTTPServerEngineFactoryHolder.java | 4 +-
.../osgi/HTTPJettyTransportActivator.java | 2 +
.../http_jetty/JettyHTTPDestinationTest.java | 5 +-
.../transport/http_jetty/spring/beans-props.xml | 6 +-
.../http/netty/client/NettyHttpConduit.java | 15 +-
.../http/netty/client/integration/ServerConfig.xml | 2 +-
rt/transports/http-netty/netty-server/pom.xml | 3 +-
.../netty/server/NettyHttpDestinationTest.java | 5 +-
.../server/integration/ApplicationContext.xml | 2 +-
.../http/netty/server/integration/ServerConfig.xml | 2 +-
.../http/netty/server/spring/beans-props.xml | 6 +-
rt/transports/http-undertow/pom.xml | 2 +-
.../http_undertow/UndertowHTTPServerEngine.java | 17 +
.../http_undertow/UndertowHTTPDestinationTest.java | 5 +-
.../transport/http_undertow/spring/beans-props.xml | 6 +-
rt/transports/http/pom.xml | 2 +-
.../org/apache/cxf/transport/http/HTTPConduit.java | 11 +-
.../http/auth/DefaultBasicAuthSupplier.java | 2 +-
.../transport/http/auth/DigestAuthSupplier.java | 83 +-
.../cxf/transport/http/auth/HttpAuthHeader.java | 21 +-
.../http/osgi/HttpConduitConfigApplier.java | 10 +-
.../transport/https/AllowAllHostnameVerifier.java | 9 +
.../cxf/transport/https/InsecureTrustManager.java | 68 ++
.../cxf/transport/servlet/AbstractHTTPServlet.java | 50 +-
.../servicelist/ServiceListGeneratorServlet.java | 3 +
.../apache/cxf/transport/http/HTTPConduitTest.java | 9 +-
.../http/auth/DefaultBasicAuthSupplierTest.java} | 19 +-
.../http/auth/DigestAuthSupplierTest.java | 14 +-
.../http/osgi/HttpConduitConfigApplierTest.java | 105 +++
rt/transports/jms/pom.xml | 5 -
.../apache/cxf/transport/jms/JMSDestination.java | 2 +-
.../org/apache/cxf/transport/jms/util/JMSUtil.java | 12 +-
rt/transports/websocket/pom.xml | 3 +-
.../websocket/ahc/AhcWebSocketConduit.java | 34 +-
.../org/apache/cxf/ws/rm/managed-manager-bean.xml | 3 -
rt/ws/security/pom.xml | 6 +-
.../CXFEHCacheExpiry.java} | 14 +-
.../ws/security/cache/CXFEHCacheReplayCache.java | 7 +-
.../ws/security/cache/CacheCleanupListener.java | 4 +
.../apache/cxf/ws/security/cache/EHCacheUtils.java | 59 --
.../KerberosTokenInterceptorProvider.java | 22 +-
.../policy/interceptors/NegotiationUtils.java | 3 +-
.../SecureConversationInInterceptor.java | 52 +-
.../SecureConversationOutInterceptor.java | 47 +-
.../SpnegoContextTokenInInterceptor.java | 35 +-
.../SpnegoContextTokenOutInterceptor.java | 40 +-
.../ws/security/tokenstore/EHCacheTokenStore.java | 143 ++--
.../tokenstore/EHCacheTokenStoreFactory.java | 12 +-
.../tokenstore/MemoryTokenStoreFactory.java | 1 +
.../security/tokenstore/TokenStoreException.java | 13 +-
.../ws/security/tokenstore/TokenStoreFactory.java | 4 +-
.../ws/security/tokenstore/TokenStoreUtils.java | 6 +-
.../cxf/ws/security/trust/AbstractSTSClient.java | 35 +-
.../ws/security/trust/DefaultSTSTokenCacher.java | 14 +-
.../cxf/ws/security/trust/STSLoginModule.java | 3 +-
.../cxf/ws/security/trust/STSTokenCacher.java | 13 +-
.../cxf/ws/security/trust/STSTokenRetriever.java | 7 +-
.../cxf/ws/security/trust/STSTokenValidator.java | 3 +-
.../security/wss4j/AttachmentCallbackHandler.java | 12 +-
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 3 +-
.../ws/security/wss4j/StaxActionInInterceptor.java | 2 +-
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 24 +-
.../ws/security/wss4j/WSS4JStaxInInterceptor.java | 3 +-
.../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 7 +-
.../apache/cxf/ws/security/wss4j/WSS4JUtils.java | 27 +-
.../policyhandlers/AbstractBindingBuilder.java | 13 +-
.../AbstractCommonBindingHandler.java | 3 +-
.../policyhandlers/AbstractStaxBindingHandler.java | 5 +-
.../policyhandlers/AsymmetricBindingHandler.java | 55 +-
.../StaxAsymmetricBindingHandler.java | 4 +-
.../StaxSymmetricBindingHandler.java | 27 +-
.../StaxTransportBindingHandler.java | 16 +-
.../policyhandlers/SymmetricBindingHandler.java | 3 +-
.../KerberosTokenPolicyValidator.java | 11 +-
rt/ws/security/src/main/resources/cxf-ehcache.xml | 42 +-
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 75 --
.../security/tokenstore/MemoryTokenStoreTest.java | 91 ---
.../ws/security/tokenstore/SecurityTokenTest.java | 14 +
...acheTokenStoreTest.java => TokenStoreTest.java} | 32 +-
.../security/wss4j/AbstractPolicySecurityTest.java | 13 +-
.../wss4j/AttachmentCallbackHandlerTest.java | 87 +++
.../security/wss4j/CryptoCoverageCheckerTest.java | 2 +-
.../wss4j/DOMToStaxEncryptionIdentifierTest.java | 10 +-
.../ws/security/wss4j/DOMToStaxRoundTripTest.java | 8 +-
.../wss4j/DefaultCryptoCoverageCheckerTest.java | 2 +-
.../cxf/ws/security/wss4j/RoundTripTest.java | 6 +-
.../ws/security/wss4j/SecurityActionTokenTest.java | 2 +-
.../wss4j/StaxCryptoCoverageCheckerTest.java | 6 +-
.../ws/security/wss4j/StaxRoundTripActionTest.java | 36 +-
.../cxf/ws/security/wss4j/StaxRoundTripTest.java | 12 +-
.../wss4j/StaxToDOMEncryptionIdentifierTest.java | 20 +-
.../ws/security/wss4j/StaxToDOMRoundTripTest.java | 32 +-
.../wss4j/UserNameTokenAuthorizationTest.java | 8 +-
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 4 +-
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 8 +-
.../ws/security/wss4j/WSS4JOutInterceptorTest.java | 2 +-
.../src/test/resources/cxf-test-ehcache.xml | 16 -
.../main/java/org/apache/cxf/wsdl/WSDLManager.java | 6 +
.../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 19 +
.../org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 100 ++-
services/sts/sts-core/pom.xml | 12 +-
.../cxf/sts/cache/AbstractIdentityCache.java | 6 +-
.../cxf/sts/cache/DefaultInMemoryTokenStore.java | 11 +-
.../apache/cxf/sts/cache/EHCacheIdentityCache.java | 67 +-
...dentityCache.java => EHCacheIdentityValue.java} | 19 +-
.../org/apache/cxf/sts/cache/IdentityCache.java | 4 -
.../apache/cxf/sts/cache/MemoryIdentityCache.java | 24 +-
.../cxf/sts/operation/AbstractOperation.java | 6 +-
.../sts-core/src/main/resources/sts-ehcache.xml | 26 +-
.../apache/cxf/sts/cache/CacheIdentityMapper.java | 27 +-
.../cxf/sts/cache/EhCacheIdentityCacheTest.java | 116 +--
.../cxf/sts/cache/MemoryIdentityCacheTest.java | 54 +-
.../cxf/sts/operation/CancelSCTUnitTest.java | 10 +-
.../apache/cxf/sts/operation/IssueJWTUnitTest.java | 9 +-
.../apache/cxf/sts/operation/IssueSCTUnitTest.java | 10 +-
.../cxf/sts/operation/RenewSamlUnitTest.java | 3 +-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 10 +-
.../cxf/sts/token/canceller/SCTCancellerTest.java | 10 +-
.../sts/token/provider/JWTTokenProviderTest.java | 9 +-
.../cxf/sts/token/provider/SCTProviderTest.java | 10 +-
.../renewer/SAMLTokenRenewerLifetimeTest.java | 3 +-
.../sts/token/renewer/SAMLTokenRenewerPOPTest.java | 3 +-
.../token/renewer/SAMLTokenRenewerRealmTest.java | 3 +-
.../sts/token/renewer/SAMLTokenRenewerTest.java | 3 +-
.../validator/JWTTokenValidatorRealmTest.java | 10 +-
.../sts/token/validator/JWTTokenValidatorTest.java | 10 +-
.../SAMLTokenValidatorCachedRealmTest.java | 3 +-
.../token/validator/SAMLTokenValidatorTest.java | 3 +-
.../cxf/sts/token/validator/SCTValidatorTest.java | 10 +-
services/sts/systests/advanced/pom.xml | 4 +-
.../cxf/systest/sts/caching/CachingTest.java | 2 -
.../cxf/systest/sts/caching/ServerCachingTest.java | 2 -
.../cxf/systest/sts/asymmetric_encr/cxf-sts.xml | 2 +-
.../systest/sts/asymmetric_encr/stax-cxf-sts.xml | 2 +-
.../cxf/systest/sts/basic_auth/cxf-service.xml | 2 +-
.../systest/sts/basic_auth/stax-cxf-service.xml | 2 +-
.../cxf/systest/sts/batch/cxf-client-unit.xml | 2 +-
.../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 2 +-
.../apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 2 +-
.../sts/binarysecuritytoken/cxf-service.xml | 2 +-
.../sts/binarysecuritytoken/stax-cxf-service.xml | 2 +-
.../systest/sts/caching/cxf-caching-service.xml | 2 +-
.../apache/cxf/systest/sts/caching/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/caching/cxf-service.xml | 2 +-
.../cxf/systest/sts/claims/cxf-bad-client.xml | 2 +-
.../systest/sts/claims/cxf-client-cbhandler.xml | 2 +-
.../apache/cxf/systest/sts/claims/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/claims/cxf-service.xml | 2 +-
.../cxf/systest/sts/claims/stax-cxf-service.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-client-b.xml | 2 +-
.../systest/sts/cross_domain/cxf-client-mex.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-client.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-service.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 2 +-
.../apache/cxf/systest/sts/custom/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/custom/cxf-service.xml | 2 +-
.../cxf/systest/sts/custom/cxf-sts-common.xml | 2 +-
.../systest/sts/custom_onbehalfof/cxf-client.xml | 2 +-
.../systest/sts/custom_onbehalfof/cxf-service.xml | 2 +-
.../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 2 +-
.../sts/defaultstsprovider/cxf-client-unit.xml | 2 +-
.../sts/defaultstsprovider/cxf-sts-common.xml | 2 +-
.../cxf/systest/sts/deployment/cxf-sts-common.xml | 2 +-
.../systest/sts/distributed_caching/cxf-client.xml | 2 +-
.../sts/distributed_caching/cxf-service.xml | 2 +-
.../systest/sts/distributed_caching/cxf-sts-1.xml | 2 +-
.../systest/sts/distributed_caching/cxf-sts-2.xml | 2 +-
.../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 2 +-
.../sts/kerberos/cxf-intermediary-client.xml | 2 +-
.../sts/kerberos/cxf-intermediary-jaxrs-client.xml | 2 +-
.../cxf/systest/sts/kerberos/cxf-intermediary.xml | 2 +-
.../cxf/systest/sts/kerberos/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/realms/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/realms/cxf-service.xml | 2 +-
.../cxf/systest/sts/realms/cxf-sts-saml1.xml | 2 +-
.../cxf/systest/sts/realms/cxf-sts-saml2.xml | 2 +-
.../cxf/systest/sts/renew/cxf-client-unit.xml | 2 +-
.../apache/cxf/systest/sts/renew/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/renew/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 2 +-
.../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 2 +-
.../apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 2 +-
.../cxf/systest/sts/secure_conv/cxf-client.xml | 2 +-
.../cxf/systest/sts/secure_conv/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 2 +-
.../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 2 +-
.../apache/cxf/systest/sts/soap12/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/soap12/cxf-service.xml | 2 +-
.../cxf/systest/sts/soap12/stax-cxf-service.xml | 2 +-
.../systest/sts/sts_sender_vouches/cxf-service.xml | 2 +-
.../cxf/systest/sts/sts_sender_vouches/cxf-sts.xml | 2 +-
.../sts/sts_sender_vouches/stax-cxf-sts.xml | 2 +-
.../cxf/systest/sts/transformation/cxf-service.xml | 2 +-
.../cxf/systest/sts/usernametoken/cxf-service.xml | 2 +-
.../systest/sts/usernametoken/stax-cxf-service.xml | 2 +-
services/sts/systests/basic/pom.xml | 4 +-
.../cxf/systest/sts/asymmetric/cxf-service.xml | 2 +-
.../systest/sts/asymmetric/cxf-stax-service.xml | 2 +-
.../apache/cxf/systest/sts/bearer/cxf-service.xml | 2 +-
.../cxf/systest/sts/bearer/cxf-stax-service.xml | 2 +-
.../systest/sts/delegation/cxf-sts-transport.xml | 2 +-
.../cxf/systest/sts/deployment/sts/cxf-sts.xml | 2 +-
.../cxf-intermediary-caching.xml | 2 +-
.../cxf-intermediary.xml | 2 +-
.../intermediary_transformation/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/issuer/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/jaas/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/jaas/cxf-service2.xml | 2 +-
.../apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 2 +-
.../systest/sts/sendervouches/cxf-intermediary.xml | 2 +-
.../cxf/systest/sts/sendervouches/cxf-service.xml | 2 +-
.../sts/sendervouches/cxf-stax-intermediary.xml | 2 +-
.../systest/sts/sendervouches/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/stsclient/cxf-client-name.xml | 2 +-
.../systest/sts/stsclient/cxf-default-client.xml | 2 +-
.../cxf/systest/sts/stsclient/cxf-service.xml | 2 +-
.../cxf/systest/sts/symmetric/cxf-service.xml | 2 +-
.../cxf/systest/sts/symmetric/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/template/cxf-service.xml | 2 +-
.../cxf/systest/sts/template/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/transport/cxf-service.xml | 2 +-
.../cxf/systest/sts/transport/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/username_actas/cxf-service.xml | 2 +-
.../systest/sts/username_actas/cxf-service2.xml | 2 +-
.../sts/username_onbehalfof/cxf-service.xml | 2 +-
.../sts/username_onbehalfof/cxf-service2.xml | 2 +-
.../systest/sts/x509/cxf-asymmetric-service.xml | 2 +-
.../apache/cxf/systest/sts/x509/cxf-service.xml | 2 +-
.../cxf/systest/sts/x509/cxf-stax-service.xml | 2 +-
services/wsn/wsn-osgi/pom.xml | 1 -
services/xkms/README.txt | 7 +-
services/xkms/xkms-client/pom.xml | 4 +-
.../org/apache/cxf/xkms/cache/EHCacheUtil.java | 88 ---
.../cxf/xkms/cache/EHCacheXKMSClientCache.java | 103 ++-
.../cxf/xkms/cache/XKMSClientCacheException.java | 13 +-
.../xkms/crypto/provider/XkmsCryptoProvider.java | 8 +-
.../crypto/provider/XkmsCryptoProviderFactory.java | 40 +-
.../src/main/resources/cxf-xkms-client-ehcache.xml | 23 +-
.../xkms-features/src/main/resources/features.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
services/xkms/xkms-service/pom.xml | 2 +-
services/xkms/xkms-x509-handlers/pom.xml | 2 +-
.../xkms/x509/validator/DirectTrustValidator.java | 2 +-
.../x509/validator/TrustedAuthorityValidator.java | 16 +-
.../TrustedAuthorityValidatorCRLTest.java | 1 +
systests/cdi/base/pom.xml | 8 +-
.../cdi/base/tomcat/AbstractTomcatServer.java | 30 +-
systests/cdi/cdi-owb/pom.xml | 10 +-
systests/cdi/cdi-weld/cdi-producers-weld/pom.xml | 6 +
systests/cdi/cdi-weld/pom.xml | 14 +-
systests/cdi/pom.xml | 46 +-
systests/databinding/pom.xml | 11 -
.../src/test/resources/aegisJaxWsBeans.xml | 2 +-
.../src/test/resources/aegisSportsServiceBeans.xml | 2 +-
.../src/test/resources/aegisWSDLNSBeans.xml | 2 +-
.../src/test/resources/extrajaxbclass.xml | 2 +-
.../src/test/resources/jaxbCustomValidators.xml | 2 +-
.../src/test/resources/mtomTestBeans.xml | 2 +-
systests/{transports-ssl3 => forked}/pom.xml | 22 +-
.../DispatchClientServerWithHugeResponseTest.java | 35 +-
.../forked}/dispatch/HugeResponseInterceptor.java | 6 +-
.../forked}/dispatch/ResponseInterceptorType.java | 2 +-
.../cxf/systests/forked}/ssl3/GreeterImpl.java | 2 +-
.../cxf/systests/forked}/ssl3/SSLv3Server.java | 8 +-
.../cxf/systests/forked}/ssl3/SSLv3Test.java | 54 +-
.../forked/dispatch}/GreetMeDocLiteralReq3.xml | 0
...tMeDocLiteralRespBreakElementCountThreshold.xml | 27 +
.../GreetMeDocLiteralRespBreakThreshold.xml | 0
.../systests/forked}/ssl3/sslv3-client-allow.xml | 0
.../cxf/systests/forked}/ssl3/sslv3-client.xml | 0
.../cxf/systests/forked}/ssl3/sslv3-server.xml | 10 +-
systests/jaxrs/pom.xml | 38 +-
.../org/apache/cxf/systest/jaxrs/BookServer20.java | 53 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 12 +-
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 277 ++++---
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 107 ++-
.../systest/jaxrs/JAXRSClientServerBookTest.java | 16 +-
.../systest/jaxrs/JAXRSServicesListingTest.java | 15 +
.../cxf/systest/jaxrs/jms/jms_server_config.xml | 2 +-
.../jaxrs/reactive/JAXRSRxJava3FlowableTest.java | 155 ++++
.../jaxrs/reactive/JAXRSRxJava3ObservableTest.java | 106 +++
.../jaxrs/reactive/RxJava3FlowableServer.java | 81 ++
.../jaxrs/reactive/RxJava3FlowableService.java | 165 ++++
.../jaxrs/reactive/RxJava3ObservableServer.java | 73 ++
.../jaxrs/reactive/RxJava3ObservableService.java | 58 ++
.../jaxrs/security/AbstractSpringSecurityTest.java | 13 +-
.../JAXRSJaasConfigurationSecurityTest.java | 3 +-
.../jaxrs/security/JAXRSJaasSecurityTest.java | 3 +-
.../systest/jaxrs/security/jaxrs-https-client3.xml | 2 +-
.../systest/jaxrs/security/jaxrs-https-client4.xml | 2 +-
.../systest/jaxrs/security/jaxrs-https-client5.xml | 2 +-
.../jaxrs/security/jaxrs-https-client_old.xml | 2 +-
.../systest/jaxrs/security/jaxrs-https-server.xml | 2 +-
.../AbstractJAXRSClientServerWebSocketTest.java | 65 +-
.../jaxrs/websocket/WebSocketTestClient.java | 181 ++---
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 77 +-
.../resources/jaxrs_soap_rest/WEB-INF/beans.xml | 2 +-
.../resources/jaxrs_websocket/beans-embedded.xml | 2 +-
.../resources/jaxrs_websocket/beans-embedded2.xml | 2 +-
.../systest/jaxrs/discovery/jaxrs-http-client.xml | 2 +-
.../cxf/systest/jaxrs/failover/cxf-lb-service.xml | 2 +-
.../cxf/systest/jaxrs/failover/cxf-service.xml | 2 +-
.../resources/service_listing/WEB-INF/beans.xml | 8 +
systests/jaxws/pom.xml | 7 -
.../java/org/apache/cxf/systest/handlers/beans.xml | 2 +-
.../handlers/beans_autoRewriteSoapAddress.xml | 2 +-
.../handlers/beans_no_autoRewriteSoapAddress.xml | 2 +-
.../cxf/systest/handlers/soap_fault_beans.xml | 2 +-
.../jaxws/metrics/JAXWSClientMetricsTest.java | 10 +-
.../apache/cxf/systest/jaxws/springWebService.xml | 2 +-
.../cxf/systest/kerberos/wssec/kerberos/client.xml | 2 +-
.../cxf/systest/kerberos/wssec/kerberos/server.xml | 2 +-
.../kerberos/wssec/kerberos/stax-server.xml | 2 +-
.../systest/kerberos/wssec/kerberos/sts-client.xml | 2 +-
.../cxf/systest/kerberos/wssec/spnego/client.xml | 2 +-
.../cxf/systest/kerberos/wssec/spnego/server.xml | 2 +-
.../systest/kerberos/wssec/spnego/stax-server.xml | 2 +-
.../cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 2 +-
.../systest/kerberos/wssec/sts/stax-cxf-sts.xml | 2 +-
systests/microprofile/client/async/pom.xml | 4 +-
systests/microprofile/client/jaxrs/pom.xml | 4 -
systests/microprofile/client/weld/pom.xml | 27 +-
systests/microprofile/pom.xml | 4 +-
systests/pom.xml | 2 +-
systests/rs-http-sci/pom.xml | 1 -
systests/rs-security/pom.xml | 23 +-
.../security/oauth/MemoryOAuthDataProvider.java | 4 +-
.../oauth2/common/JCacheOAuthDataProviderImpl.java | 68 +-
.../oauth2/common/JPAOAuthDataProviderImpl.java | 68 +-
.../security/oauth2/common/OAuth2TestUtils.java | 79 +-
.../oauth2/common/WSS4JBasicAuthFilter.java | 5 +
.../oauth2/filters/BookServerOAuth2Filters.java | 48 --
.../oauth2/filters/BookServerOAuth2FiltersJwt.java | 48 --
.../oauth2/filters/BookServerOAuth2Service.java | 48 --
.../oauth2/filters/BookServerOAuth2ServiceJwt.java | 48 --
.../security/oauth2/filters/OAuth2FiltersTest.java | 203 ++---
.../oauth2/filters/OAuth2JwtFiltersTest.java | 99 ++-
.../security/oauth2/filters/PartnerServer.java | 49 --
.../security/oauth2/filters/PartnerService.java | 34 +-
.../oauth2/grants/AuthorizationGrantTest.java | 293 ++-----
.../oauth2/grants/DynamicRegistrationTest.java | 111 +--
.../security/oauth2/grants/PublicClientTest.java | 214 ++----
.../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 4 +-
.../security/oauth2/tls/OAuthDataProviderImpl.java | 4 +-
.../oauth2/tls/OAuthDataProviderImplJwt.java | 2 +-
.../jaxrs/security/oidc/IdTokenProviderImpl.java | 11 +-
.../security/oidc/OIDCDynamicRegistrationTest.java | 141 ++--
.../systest/jaxrs/security/oidc/OIDCFlowTest.java | 186 +++--
.../security/oidc/OIDCMetadataServiceTest.java | 73 --
.../jaxrs/security/oidc/SubjectCreatorImpl.java | 58 ++
.../oidc/filters/BookServerOIDCFilters.java | 48 --
.../oidc/filters/BookServerOIDCService.java | 48 --
.../security/oidc/filters/OIDCFiltersTest.java | 81 +-
.../src/test/resources/META-INF/persistence.xml | 1 +
.../jaxrs/security/httpsignature/client.xml | 2 +-
.../jaxrs/security/httpsignature/server.xml | 2 +-
.../cxf/systest/jaxrs/security/jcs/client.xml | 2 +-
.../cxf/systest/jaxrs/security/jcs/jcs-server.xml | 2 +-
.../security/jose/jwejws/algorithms-server.xml | 2 +-
.../systest/jaxrs/security/jose/jwejws/client.xml | 2 +-
.../security/jose/jwejws/http-headers-server.xml | 2 +-
.../security/jose/jwejws/reference-server.xml | 2 +-
.../systest/jaxrs/security/jose/jwejws/server.xml | 2 +-
.../jaxrs/security/jose/jwejws/serverJweJson.xml | 2 +-
.../jaxrs/security/jose/jwejws/serverJwsJson.xml | 2 +-
.../jaxrs/security/jose/jwejws/serverMultipart.xml | 2 +-
.../jaxrs/security/jose/jwt/algorithms-server.xml | 2 +-
.../jaxrs/security/jose/jwt/authn-authz-server.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwt/client.xml | 2 +-
.../jaxrs/security/jose/jwt/properties-server.xml | 2 +-
.../jaxrs/security/oauth2/filters/client.xml | 45 --
.../security/oauth2/filters/filters-server.xml | 2 +-
.../security/oauth2/filters/filters-serverJwt.xml | 23 +-
.../security/oauth2/filters/oauth20-server.xml | 2 +-
.../security/oauth2/filters/oauth20-serverJwt.xml | 46 +-
.../security/oauth2/filters/partner-service.xml | 11 +-
.../jaxrs/security/oauth2/grants/client.xml | 2 +-
.../grants/dynamic-reg-server-jcache-jwt.xml | 2 +-
.../oauth2/grants/dynamic-reg-server-jcache.xml | 2 +-
.../oauth2/grants/dynamic-reg-server-jpa.xml | 2 +-
...ants-negative-server-jcache-jwt-non-persist.xml | 2 +-
.../grants/grants-negative-server-jcache-jwt.xml | 2 +-
.../grants/grants-negative-server-jcache.xml | 2 +-
.../oauth2/grants/grants-negative-server-jpa.xml | 2 +-
.../grants-server-jcache-jwt-non-persist.xml | 9 +-
.../oauth2/grants/grants-server-jcache-jwt.xml | 9 +-
.../oauth2/grants/grants-server-jcache.xml | 8 +-
.../security/oauth2/grants/grants-server-jpa.xml | 8 +-
.../oauth2/grants/grants-server-public.xml | 2 +-
...introspection-server-jcache-jwt-non-persist.xml | 2 +-
.../grants/introspection-server-jcache-jwt.xml | 2 +-
.../oauth2/grants/introspection-server-jcache.xml | 2 +-
.../oauth2/grants/introspection-server-jpa.xml | 2 +-
.../jaxrs/security/oauth2/grants/publicclient.xml | 2 +-
.../oauth2/grants/revocation-server-jcache-jwt.xml | 2 +-
.../oauth2/grants/revocation-server-jcache.xml | 2 +-
.../oauth2/grants/revocation-server-jpa.xml | 2 +-
.../grants/server-jcache-jwt-non-persist.xml | 2 +-
.../security/oauth2/grants/server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oauth2/grants/server-jcache.xml | 2 +-
.../jaxrs/security/oauth2/grants/server-jpa.xml | 2 +-
.../systest/jaxrs/security/oauth2/tls/client.xml | 2 +-
.../systest/jaxrs/security/oauth2/tls/client2.xml | 2 +-
.../jaxrs/security/oauth2/tls/serverTls.xml | 2 +-
.../systest/jaxrs/security/oidc/filters/client.xml | 45 --
.../jaxrs/security/oidc/filters/filters-server.xml | 2 +-
.../jaxrs/security/oidc/filters/oidc-server.xml | 19 +-
.../jaxrs/security/oidc/metadata-server-jcache.xml | 84 --
.../jaxrs/security/oidc/oidc-keys-jcache.xml | 2 +-
...oidc-negative-server-jcache-jwt-non-persist.xml | 2 +-
.../oidc/oidc-negative-server-jcache-jwt.xml | 2 +-
.../security/oidc/oidc-negative-server-jcache.xml | 2 +-
.../security/oidc/oidc-negative-server-jpa.xml | 2 +-
.../jaxrs/security/oidc/oidc-server-dynreg.xml | 2 +-
.../oidc/oidc-server-jcache-jwt-non-persist.xml | 25 +-
.../jaxrs/security/oidc/oidc-server-jcache-jwt.xml | 25 +-
.../jaxrs/security/oidc/oidc-server-jcache.xml | 25 +-
.../jaxrs/security/oidc/oidc-server-jpa.xml | 39 +-
.../userinfo-server-jcache-jwt-non-persist.xml | 2 +-
.../security/oidc/userinfo-server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oidc/userinfo-server-jcache.xml | 2 +-
.../jaxrs/security/oidc/userinfo-server-jpa.xml | 2 +-
.../cxf/systest/jaxrs/security/saml/client.xml | 2 +-
.../systest/jaxrs/security/saml/secureServer.xml | 2 +-
.../cxf/systest/jaxrs/security/saml/server.xml | 2 +-
.../cxf/systest/jaxrs/security/samlsso/client.xml | 2 +-
.../jaxrs/security/samlsso/metadata-server.xml | 2 +-
.../cxf/systest/jaxrs/security/xml/client.xml | 2 +-
.../cxf/systest/jaxrs/security/xml/server.xml | 2 +-
.../cxf/systest/jaxrs/security/xml/stax-server.xml | 2 +-
systests/rs-sse/pom.xml | 13 -
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 72 +-
.../apache/cxf/systest/jaxrs/sse/BookStore.java | 69 +-
.../apache/cxf/systest/jaxrs/sse/BookStore2.java | 69 +-
.../jaxrs/sse/BookStoreClientCloseable.java | 18 +-
.../systest/jaxrs/sse/BookStoreResponseFilter.java | 55 ++
.../cxf/systest/jaxrs/sse/SseApplication.java | 6 +-
.../jaxrs/sse/jetty/AbstractJettyServer.java | 7 +-
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 43 +-
systests/rs-sse/rs-sse-undertow/pom.xml | 5 +
.../jaxrs/sse/undertow/AbstractUndertowServer.java | 5 +-
systests/spring-boot/pom.xml | 18 +-
.../apache/cxf/systest/jaxrs/resources/Book.java | 19 +
.../jaxrs/spring/boot/SpringSseEmitterTest.java | 132 ++++
systests/tracing/pom.xml | 1 -
.../cxf/systest/jaxrs/tracing/BookStore.java | 24 +-
.../jaxrs/tracing/NullPointerExceptionMapper.java | 20 +-
.../jaxrs/tracing/brave/BraveTracingTest.java | 97 +--
.../opentracing/OpenTracingTracingTest.java | 39 +-
.../systest/jaxws/tracing/BookStoreService.java | 1 +
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 12 +
.../jaxws/tracing/brave/BraveTracingTest.java | 160 ++--
.../jaxws/tracing/opentracing/BookStore.java | 14 +-
.../opentracing/OpenTracingTracingTest.java | 15 +
.../cxf/systest/jms/action/JMSSoapActionTest.java | 16 +-
.../systest/jms/continuations/jms_test_config.xml | 2 +-
systests/transport-undertow/pom.xml | 6 -
.../websocket/JAXRSClientServerWebSocketTest.java | 65 +-
.../JAXRSClientServerWebSocketTest.java.bak | 438 -----------
.../websocket/WebSocketTestClient.java | 182 ++---
.../resources/jaxrs_websocket/beans-embedded.xml | 2 +-
.../resources/jaxrs_websocket/beans-embedded2.xml | 2 +-
.../cxf/systest/http_undertow/SessionServer.xml | 2 +-
.../http_undertow/continuations/cxf_https.xml | 2 +-
.../http_undertow/continuations/jaxws-server.xml | 2 +-
.../http_undertow/server-lifecycle-beans.xml | 2 +-
.../apache/cxf/systest/http_undertow/server.xml | 2 +-
.../cxf/systest/http_undertow/undertow-engine.xml | 2 +-
.../http_undertow/undertowBasicAuthServer.xml | 2 +-
.../systest/http_undertow/undertowDigestServer.xml | 2 +-
systests/transports/pom.xml | 45 ++
.../http/auth/DigestAuthSupplierJettyTest.java | 140 ++++
.../http/auth/DigestAuthSupplierSpringTest.java | 145 ++++
.../systest/http_jetty/EngineLifecycleTest.java | 11 +-
.../https/ciphersuites/CipherSuitesTest.java | 39 +-
.../systest/https/clientauth/ClientAuthTest.java | 86 +--
.../systest/https/conduit/HTTPSConduitTest.java | 6 +-
.../cxf/systest/https/trust/TrustManagerTest.java | 56 +-
.../test/resources/digestauth/WEB-INF/beans.xml | 3 +-
.../org/apache/cxf/systest/http/SessionServer.xml | 2 +-
.../systest/http_jetty/continuations/cxf_https.xml | 2 +-
.../http_jetty/continuations/jaxws-server.xml | 2 +-
.../apache/cxf/systest/http_jetty/jetty-engine.xml | 10 +-
.../systest/http_jetty/jettyBasicAuthServer.xml | 2 +-
.../cxf/systest/http_jetty/jettyDigestServer.xml | 2 +-
.../systest/http_jetty/server-lifecycle-beans.xml | 2 +-
.../org/apache/cxf/systest/http_jetty/server.xml | 2 +-
.../https/ciphersuites/ciphersuites-server.xml | 2 +-
.../https/clientauth/client-auth-server.xml | 2 +-
.../systest/https/conduit/BethalClientBeans.xml | 2 +-
.../https/conduit/jaxws-publish-callback.xml | 2 +-
.../cxf/systest/https/conduit/jaxws-publish.xml | 2 +-
.../cxf/systest/https/conduit/jaxws-server.xml | 2 +-
.../https/conduit/jaxws-tlsrefs-publish.xml | 2 +-
.../apache/cxf/systest/https/conduit/pkcs12.xml | 2 +-
.../https/conduit/resource-key-spec-url.xml | 2 +-
.../systest/https/conduit/resource-key-spec.xml | 2 +-
.../https/constraints/jaxws-server-constraints.xml | 2 +-
.../https/hostname/hostname-server-deprecated.xml | 2 +-
.../cxf/systest/https/hostname/hostname-server.xml | 2 +-
.../https/trust/client-trust-manager-ref.xml} | 10 +-
.../cxf/systest/https/trust/trust-server.xml | 2 +-
systests/uncategorized/pom.xml | 25 -
.../src/test/java/org/apache/cxf/cxf1332/beans.xml | 2 +-
.../clustering/failover_address_override.xml | 2 +-
.../load_distributor_address_override.xml | 2 +-
.../cxf/systest/factory_pattern/cxf_multiplex.xml | 2 +-
.../cxf/systest/management/ManagedBusTest.java | 4 -
.../cxf/systest/management/counter-spring.xml | 3 +-
.../apache/cxf/systest/management/managed-bus.xml | 3 +-
.../cxf/systest/management/managed-spring.xml | 3 +-
.../cxf/systest/management/persistent-id.xml | 3 +-
.../systest/soap/RPCLitSoapActionGreeterImpl.java | 16 +-
.../apache/cxf/systest/soap/SoapActionTest.java | 15 +-
.../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 +-
.../org/apache/cxf/systest/ws/rm/decoupled.xml | 2 +-
.../apache/cxf/systest/ws/rm/decoupled_bare.xml | 2 +-
.../ws/rm/exactlyonce-inorder-decoupled.xml | 2 +-
.../apache/cxf/systest/ws/rm/managed-client.xml | 4 +-
.../apache/cxf/systest/ws/rm/managed-server.xml | 3 +-
.../ws/rm/persistent-message-loss-server.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/persistent.xml | 2 +-
.../apache/cxf/systest/ws/rm/sec/client-policy.xml | 2 +-
.../apache/cxf/systest/ws/rm/sec/server-policy.xml | 2 +-
.../java/org/apache/cxf/systest/ws/rm/simple.xml | 2 +-
.../systest/ws/rm/sync-ack-persistent-server.xml | 2 +-
.../cxf/systest/ws/rm/wsrm-policy-resolve.xml | 2 +-
.../cxf/systest/wssec/examples/saml/server.xml | 2 +-
.../systest/wssec/examples/saml/stax-server.xml | 2 +-
.../cxf/systest/wssec/examples/secconv/server.xml | 2 +-
.../systest/wssec/examples/secconv/stax-server.xml | 2 +-
.../systest/wssec/examples/sts/cxf-symmetric.xml | 2 +-
.../cxf/systest/wssec/examples/ut/server.xml | 2 +-
.../cxf/systest/wssec/examples/ut/stax-server.xml | 2 +-
.../cxf/systest/wssec/examples/x509/server.xml | 2 +-
.../systest/wssec/examples/x509/stax-server.xml | 2 +-
.../apache/cxf/systest/ws/cache/CachingTest.java | 89 ++-
.../org/apache/cxf/systest/ws/action/server.xml | 2 +-
.../cxf/systest/ws/action/signature-server.xml | 2 +-
.../systest/ws/action/signature-stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/algsuite/server.xml | 2 +-
.../apache/cxf/systest/ws/algsuite/stax-server.xml | 2 +-
.../systest/ws/basicauth/server-continuation.xml | 2 +-
.../org/apache/cxf/systest/ws/basicauth/server.xml | 2 +-
.../org/apache/cxf/systest/ws/bindings/server.xml | 2 +-
.../apache/cxf/systest/ws/bindings/stax-server.xml | 2 +-
.../cxf/systest/ws/cache/per-proxy-cache.xml | 57 +-
.../org/apache/cxf/systest/ws/cache/server.xml | 2 +-
.../cxf/systest/ws/coverage_checker/server.xml | 2 +-
.../systest/ws/coverage_checker/stax-server.xml | 2 +-
.../cxf/systest/ws/fault/modified-server.xml | 2 +-
.../org/apache/cxf/systest/ws/fault/server.xml | 2 +-
.../org/apache/cxf/systest/ws/gcm/mgf-server.xml | 2 +-
.../apache/cxf/systest/ws/gcm/mgf-stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/gcm/server.xml | 2 +-
.../org/apache/cxf/systest/ws/gcm/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/httpget/server.xml | 2 +-
.../org/apache/cxf/systest/ws/https/server.xml | 2 +-
.../apache/cxf/systest/ws/https/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/mtom/server.xml | 2 +-
.../org/apache/cxf/systest/ws/mtom/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/parts/server.xml | 2 +-
.../apache/cxf/systest/ws/parts/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/password/server.xml | 2 +-
.../cxf/systest/ws/policy/javafirstclient.xml | 2 +-
.../cxf/systest/ws/policy/javafirstserver.xml | 2 +-
.../cxf/systest/ws/policy/operation/server.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/server.xml | 2 +-
.../apache/cxf/systest/ws/policy/sslcertclient.xml | 2 +-
.../cxf/systest/ws/policy/sslnocertclient.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/client.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/server.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/stax-server.xml | 2 +-
.../systest/ws/saml/subjectconf/client-auth.xml | 2 +-
.../systest/ws/saml/subjectconf/client-noauth.xml | 2 +-
.../cxf/systest/ws/saml/subjectconf/server.xml | 2 +-
.../systest/ws/saml/subjectconf/stax-server.xml | 2 +-
.../cxf/systest/ws/security/handler/server.xml | 2 +-
.../cxf/systest/ws/security/https_config.xml | 2 +-
.../systest/ws/security/https_config_client.xml | 2 +-
.../org/apache/cxf/systest/ws/security/server.xml | 2 +-
.../apache/cxf/systest/ws/security/stax-server.xml | 2 +-
.../apache/cxf/systest/ws/swa/policy-server.xml | 2 +-
.../org/apache/cxf/systest/ws/swa/server.xml | 2 +-
.../cxf/systest/ws/swa/stax-policy-server.xml | 2 +-
.../apache/cxf/systest/ws/tokens/bst-server.xml | 2 +-
.../cxf/systest/ws/tokens/endorsing-server.xml | 2 +-
.../org/apache/cxf/systest/ws/tokens/server.xml | 2 +-
.../systest/ws/tokens/stax-endorsing-server.xml | 2 +-
.../apache/cxf/systest/ws/tokens/stax-server.xml | 2 +-
.../apache/cxf/systest/ws/tokens/tls-server.xml | 2 +-
.../cxf/systest/ws/tokens/tls-stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 2 +-
.../apache/cxf/systest/ws/ut/server-derived.xml | 2 +-
.../org/apache/cxf/systest/ws/ut/server.xml | 2 +-
.../cxf/systest/ws/ut/stax-policy-server.xml | 2 +-
.../org/apache/cxf/systest/ws/ut/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssc/server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssc/unit-server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssec10/server.xml | 2 +-
.../cxf/systest/ws/wssec10/server_authorized.xml | 2 +-
.../cxf/systest/ws/wssec10/server_authorized_2.xml | 2 +-
.../cxf/systest/ws/wssec10/server_restricted.xml | 2 +-
.../apache/cxf/systest/ws/wssec10/stax-server.xml | 2 +-
.../systest/ws/wssec10/stax-server_restricted.xml | 2 +-
.../apache/cxf/systest/ws/x509/intermediary.xml | 2 +-
.../org/apache/cxf/systest/ws/x509/server.xml | 2 +-
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/client.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/server.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 2 +-
.../apache/cxf/systest/ws/addressing/cxf-hpux.xml | 2 +-
.../org/apache/cxf/systest/ws/addressing/cxf.xml | 2 +-
.../cxf/systest/ws/addressing/jms_decoupled.xml | 2 +-
.../cxf/systest/ws/policy/addr-anon-client.xml | 2 +-
.../cxf/systest/ws/policy/addr-anon-server.xml | 2 +-
.../systest/ws/policy/addr-inline-policy-old.xml | 2 +-
.../cxf/systest/ws/policy/addr-inline-policy.xml | 2 +-
.../apache/cxf/systest/ws/policy/addr-optional.xml | 2 +-
.../apache/cxf/systest/ws/policy/addr-wsdl11.xml | 2 +-
.../java/org/apache/cxf/systest/ws/policy/addr.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/addr0705.xml | 2 +-
.../ws/policy/http_client_policy_feature.xml | 2 +-
.../java/org/apache/cxf/systest/ws/policy/rm.xml | 2 +-
.../cxf/systest/ws/policy/rm10wsdl_server.xml | 2 +-
.../cxf/systest/ws/policy/rm12wsdl_server.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/rmwsdl.xml | 2 +-
systests/wsdl_maven/codegen/pom.xml | 7 +-
tck/Jenkinsfile | 20 +-
tck/ts.jte.template | 2 +-
testutils/pom.xml | 5 +-
.../wsdl/hello_world_soap_action_rpc.wsdl | 117 +++
.../cxf/tools/common/toolspec/parser/Form.java | 55 +-
.../cxf/tools/validator/WSDLValidationTest.java | 9 +-
tools/wadlto/jaxrs/pom.xml | 4 +-
880 files changed, 11274 insertions(+), 8779 deletions(-)
create mode 100644 bom/pom.xml
delete mode 100644 core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
delete mode 100644 core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
delete mode 100644 core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java
create mode 100644 core/src/test/java/org/apache/cxf/endpoint/ClientCallbackTest.java
create mode 100644 core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
create mode 100644 maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/Cxf7998Service-1.0.0.wsdl
copy maven-plugins/codegen-plugin/src/it/{wsdl-artifact-resolution => jaxb-xjc-runtime-sources}/pom.xml (63%)
create mode 100644 rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxwsClientCallbackTest.java
delete mode 100644 rt/management/src/main/java/org/apache/cxf/management/jmx/MBServerConnectorFactory.java
delete mode 100644 rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
create mode 100644 rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JaxrsClientCallbackTest.java
create mode 100644 rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientResponseFilterTest.java
copy systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Book.java => rt/rs/description-swagger-ui/src/test/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUIResourceLocatorTest.java (53%)
create mode 100644 rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectTest.java
copy rt/rs/extensions/{json-basic => rx3}/pom.xml (67%)
create mode 100644 rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/client/FlowableRxInvoker.java
create mode 100644 rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/client/FlowableRxInvokerImpl.java
copy systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/SseApplication.java => rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/client/FlowableRxInvokerProvider.java (59%)
create mode 100644 rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/client/ObservableRxInvoker.java
create mode 100644 rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/client/ObservableRxInvokerImpl.java
copy systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/SseApplication.java => rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/client/ObservableRxInvokerProvider.java (59%)
rename services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java => rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/server/ReactiveIOCustomizer.java (54%)
create mode 100644 rt/rs/extensions/rx3/src/main/java/org/apache/cxf/jaxrs/rx3/server/ReactiveIOInvoker.java
create mode 100644 rt/rs/extensions/rx3/src/main/resources/META-INF/services/org.apache.cxf.jaxrs.ext.JAXRSServerFactoryCustomizationExtension
delete mode 100644 rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
delete mode 100644 rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
create mode 100644 rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/MPRestClientCallbackTest.java
create mode 100644 rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/JwsJwksJwtAccessTokenValidator.java
create mode 100644 rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadata.java
copy rt/rs/security/{sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcKeysService.java => oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/JwksService.java} (93%)
copy rt/{ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreFactory.java => rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/WellKnownService.java} (65%)
create mode 100644 rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/filters/JwsJwksJwtAccessTokenValidatorTest.java
create mode 100644 rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcProviderMetadata.java
delete mode 100644 rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtil.java
delete mode 100644 rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
create mode 100644 rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SPStateManagerTest.java
create mode 100644 rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/TokenReplayCacheTest.java
delete mode 100644 rt/rs/security/sso/saml/src/test/resources/cxf-test-ehcache.xml
create mode 100644 rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/interceptor/SseInterceptor.java
create mode 100644 rt/transports/http/src/main/java/org/apache/cxf/transport/https/InsecureTrustManager.java
copy rt/{ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreFactory.java => transports/http/src/test/java/org/apache/cxf/transport/http/auth/DefaultBasicAuthSupplierTest.java} (55%)
create mode 100644 rt/transports/http/src/test/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplierTest.java
copy rt/ws/security/src/main/java/org/apache/cxf/ws/security/{tokenstore/MemoryTokenStoreFactory.java => cache/CXFEHCacheExpiry.java} (71%)
delete mode 100644 rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
copy systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/ResponseInterceptorType.java => rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreException.java (81%)
delete mode 100644 rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
delete mode 100644 rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java
rename rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/{EHCacheTokenStoreTest.java => TokenStoreTest.java} (73%)
create mode 100644 rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java
delete mode 100644 rt/ws/security/src/test/resources/cxf-test-ehcache.xml
copy services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/{IdentityCache.java => EHCacheIdentityValue.java} (69%)
delete mode 100644 services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheUtil.java
copy systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/ResponseInterceptorType.java => services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/XKMSClientCacheException.java (81%)
rename systests/{transports-ssl3 => forked}/pom.xml (88%)
rename systests/{jaxws/src/test/java/org/apache/cxf/systest => forked/src/test/java/org/apache/cxf/systests/forked}/dispatch/DispatchClientServerWithHugeResponseTest.java (90%)
rename systests/{jaxws/src/test/java/org/apache/cxf/systest => forked/src/test/java/org/apache/cxf/systests/forked}/dispatch/HugeResponseInterceptor.java (93%)
rename systests/{jaxws/src/test/java/org/apache/cxf/systest => forked/src/test/java/org/apache/cxf/systests/forked}/dispatch/ResponseInterceptorType.java (94%)
rename systests/{transports-ssl3/src/test/java/org/apache/cxf/https => forked/src/test/java/org/apache/cxf/systests/forked}/ssl3/GreeterImpl.java (97%)
rename systests/{transports-ssl3/src/test/java/org/apache/cxf/https => forked/src/test/java/org/apache/cxf/systests/forked}/ssl3/SSLv3Server.java (84%)
rename systests/{transports-ssl3/src/test/java/org/apache/cxf/https => forked/src/test/java/org/apache/cxf/systests/forked}/ssl3/SSLv3Test.java (85%)
copy systests/{jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources => forked/src/test/resources/org/apache/cxf/systests/forked/dispatch}/GreetMeDocLiteralReq3.xml (100%)
rename systests/{jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources => forked/src/test/resources/org/apache/cxf/systests/forked/dispatch}/GreetMeDocLiteralRespBreakElementCountThreshold.xml (52%)
rename systests/{jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources => forked/src/test/resources/org/apache/cxf/systests/forked/dispatch}/GreetMeDocLiteralRespBreakThreshold.xml (100%)
rename systests/{transports-ssl3/src/test/resources/org/apache/cxf/https => forked/src/test/resources/org/apache/cxf/systests/forked}/ssl3/sslv3-client-allow.xml (100%)
copy systests/{transports-ssl3/src/test/resources/org/apache/cxf/https => forked/src/test/resources/org/apache/cxf/systests/forked}/ssl3/sslv3-client.xml (100%)
rename systests/{transports-ssl3/src/test/resources/org/apache/cxf/https => forked/src/test/resources/org/apache/cxf/systests/forked}/ssl3/sslv3-server.xml (94%)
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3FlowableTest.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3ObservableTest.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3FlowableServer.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3FlowableService.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3ObservableServer.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3ObservableService.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2Filters.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2FiltersJwt.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2Service.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2ServiceJwt.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/PartnerServer.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCMetadataServiceTest.java
create mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/SubjectCreatorImpl.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/BookServerOIDCFilters.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/BookServerOIDCService.java
delete mode 100644 systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml
delete mode 100644 systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/client.xml
delete mode 100644 systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/metadata-server-jcache.xml
create mode 100644 systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/BookStoreResponseFilter.java
create mode 100644 systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringSseEmitterTest.java
copy rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreFactory.java => systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/NullPointerExceptionMapper.java (66%)
delete mode 100644 systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/JAXRSClientServerWebSocketTest.java.bak
create mode 100644 systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthSupplierJettyTest.java
create mode 100644 systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthSupplierSpringTest.java
rename systests/{transports-ssl3/src/test/resources/org/apache/cxf/https/ssl3/sslv3-client.xml => transports/src/test/resources/org/apache/cxf/systest/https/trust/client-trust-manager-ref.xml} (90%)
create mode 100644 testutils/src/main/resources/wsdl/hello_world_soap_action_rpc.wsdl
[cxf] 02/02: Upgrade to Saaj Impl 1.5.2
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch saaj-impl
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e038fb3f4dce3fdf0b2d53113dd11c671d489635
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri May 8 23:56:43 2020 +0300
Upgrade to Saaj Impl 1.5.2
---
distribution/src/main/release/samples/pom.xml | 2 +-
osgi/karaf/features/src/main/resources/features.xml | 1 -
parent/pom.xml | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 1fc9ed7..2be18db 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -274,7 +274,7 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index edbae56..bc8a801 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -60,7 +60,6 @@
</feature>
<feature name="saaj-impl" version="${cxf.saaj-impl.version}">
<bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle>
- <bundle start-level="25">mvn:org.jvnet.mimepull/mimepull/1.9.11</bundle>
<bundle start-level="25">mvn:com.sun.xml.messaging.saaj/saaj-impl/${cxf.saaj-impl.version}</bundle>
</feature>
<feature name="wss4j" version="${cxf.wss4j.version}">
diff --git a/parent/pom.xml b/parent/pom.xml
index bd2f00d..a732ec0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,7 +184,7 @@
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
<cxf.rxjava2.version>2.2.19</cxf.rxjava2.version>
<cxf.rxjava3.version>3.0.2</cxf.rxjava3.version>
- <cxf.saaj-impl.version>1.5.1</cxf.saaj-impl.version>
+ <cxf.saaj-impl.version>1.5.2</cxf.saaj-impl.version>
<cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
<cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
<cxf.servlet-api.version>4.0.3</cxf.servlet-api.version>
[cxf] 01/02: Merge remote-tracking branch 'cxf/master' into
saaj-impl
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch saaj-impl
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0e424e7947d09ba75b0c04c768e452d9665999e8
Merge: 7986c7d a1b0abe
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri May 8 21:59:36 2020 +0300
Merge remote-tracking branch 'cxf/master' into saaj-impl
Conflicts:
parent/pom.xml
bom/pom.xml | 576 ++++++++++++++
core/pom.xml | 19 +-
.../org/apache/cxf/common/logging/Log4jLogger.java | 209 -----
.../org/apache/cxf/common/logging/LogUtils.java | 2 +-
.../java/org/apache/cxf/common/util/ASMHelper.java | 1 +
.../org/apache/cxf/common/util/StringUtils.java | 15 +-
.../org/apache/cxf/common/util/URIParserUtil.java | 16 +-
.../org/apache/cxf/endpoint/ClientCallback.java | 79 +-
.../java/org/apache/cxf/helpers/JavaUtils.java | 16 +-
.../security/AbstractAuthorizingInInterceptor.java | 20 +-
.../transform/TransformOutInterceptor.java | 30 +-
.../main/java/org/apache/cxf/message/Message.java | 7 +
.../java/org/apache/cxf/message/MessageUtils.java | 15 +
.../java/org/apache/cxf/staxutils/StaxUtils.java | 173 ++---
.../cxf/staxutils/transform/TransformUtils.java | 16 +-
.../cxf/staxutils/validation/EmbeddedSchema.java | 49 --
.../ResolvingGrammarReaderController.java | 87 ---
.../staxutils/validation/Stax2ValidationUtils.java | 58 +-
.../validation/W3CMultiSchemaFactory.java | 71 +-
.../validation/AbstractValidationInterceptor.java | 13 +-
.../apache/cxf/common/util/StringUtilsTest.java | 6 +
.../apache/cxf/configuration/spring/test-beans.xml | 2 +-
.../apache/cxf/endpoint/ClientCallbackTest.java | 164 ++++
.../org/apache/cxf/message/MessageUtilsTest.java | 83 ++
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 144 +++-
.../validation/Stax2ValidationUtilsTest.java | 10 +-
.../security/DeprecatedSecurityContextTest.java | 10 +-
distribution/javadoc/pom.xml | 50 +-
distribution/manifest/pom.xml | 4 +-
distribution/pom.xml | 8 +-
distribution/src/main/release/bin/wsdl2java.bat | 2 +-
distribution/src/main/release/bin/wsdl2service.bat | 2 +-
.../src/main/release/samples/corba/bank/pom.xml | 9 -
.../samples/corba/bank_ws_addressing/pom.xml | 13 +-
.../release/samples/groovy_spring_support/pom.xml | 4 -
.../src/main/resources/ClientConfig.xml | 2 +-
.../jax_rs/description_openapi_v3_osgi/README.txt | 2 +-
.../jax_rs/description_swagger2_osgi/README.txt | 2 +-
.../jax_rs/description_swagger2_web/pom.xml | 4 +-
.../src/main/release/samples/jax_rs/search/pom.xml | 6 +-
.../release/samples/jax_rs/tracing_brave/pom.xml | 6 +-
.../samples/jax_rs/tracing_brave_osgi/README.txt | 2 +-
.../samples/jax_rs/tracing_brave_osgi/pom.xml | 4 +-
.../samples/jax_rs/tracing_opentracing/pom.xml | 4 +-
.../jax_rs/tracing_opentracing_osgi/pom.xml | 4 +-
.../main/release/samples/jax_rs/websocket/pom.xml | 3 -
.../src/main/java/demo/jaxrs/client/Client.java | 126 ++-
.../demo/jaxrs/client/WebSocketTestClient.java | 205 +++--
.../src/main/release/samples/jms_pubsub/pom.xml | 3 +
.../src/main/release/samples/oauth/client/pom.xml | 4 +-
distribution/src/main/release/samples/pom.xml | 24 +-
.../main/java/demo/throttling/client/Client.java | 1 -
.../src/main/release/samples/ws_eventing/pom.xml | 6 +-
.../main/java/demo/wssec/client/StaxClient.java | 4 +-
.../main/java/demo/wssec/server/StaxServer.java | 4 +-
.../main/resources/server-applicationContext.xml | 2 +-
integration/cdi/pom.xml | 6 -
.../apache/cxf/jca/core/logging/LoggerHelper.java | 8 -
integration/spring-boot/autoconfigure/pom.xml | 16 +-
integration/spring-boot/starter-jaxrs/pom.xml | 4 +-
integration/spring-boot/starter-jaxws/pom.xml | 4 +-
.../tracing/brave/AbstractBraveClientProvider.java | 5 +-
.../cxf/tracing/brave/AbstractBraveProvider.java | 16 -
.../cxf/tracing/brave/BraveStopInterceptor.java | 2 +-
.../AbstractOpenTracingClientProvider.java | 1 +
.../opentracing/AbstractOpenTracingProvider.java | 1 +
.../opentracing/OpenTracingStopInterceptor.java | 2 +-
maven-plugins/codegen-plugin/pom.xml | 6 +-
.../Cxf7998Service-1.0.0.wsdl | 43 ++
.../pom.xml | 79 +-
.../src/it/jdk-cxf-with-toolchain/pom.xml | 44 +-
.../codegen-plugin/src/it/mark-generated/pom.xml | 58 +-
.../src/it/wsdl-artifact-resolution/pom.xml | 58 +-
.../cxf/maven_plugin/AbstractCodegenMojo.java | 2 +-
maven-plugins/java2swagger-plugin/pom.xml | 5 -
maven-plugins/java2wadl-plugin/pom.xml | 6 -
.../maven_plugin/javatowadl/ParseJavaDocMojo.java | 4 +-
maven-plugins/wadl2java-plugin/pom.xml | 5 +-
osgi/bundle/compatible/pom.xml | 59 +-
osgi/bundle/pom.xml | 96 ---
osgi/itests-felix/pom.xml | 19 +-
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 53 +-
.../apache/cxf/osgi/itests/OSGiTestSupport.java | 11 +-
osgi/itests/pom.xml | 2 +-
osgi/karaf/commands/pom.xml | 2 +-
osgi/karaf/features/pom.xml | 26 +-
.../karaf/features/src/main/resources/features.xml | 36 +-
osgi/pom.xml | 2 +-
parent/pom.xml | 843 +++------------------
pom.xml | 35 +-
rt/bindings/corba/pom.xml | 17 +
.../binding/soap/interceptor/Messages.properties | 1 +
.../binding/soap/interceptor/RPCInInterceptor.java | 5 +
.../cxf/aegis/type/aegisOptionsTestBeans.xml | 2 +-
rt/features/logging/pom.xml | 2 +-
.../cxf/ext/logging/slf4j/Slf4jEventSender.java | 44 +-
rt/frontend/jaxrs/pom.xml | 8 +-
.../apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 5 +
.../jaxrs/impl/tl/ThreadLocalServletContext.java | 28 +
.../org/apache/cxf/jaxrs/model/URITemplate.java | 17 +-
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 115 ++-
.../cxf/jaxrs/provider/JAXRSDataBinding.java | 16 +-
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 25 +-
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 28 +
.../apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 14 +
.../apache/cxf/jaxrs/model/URITemplateTest.java | 32 +
.../org/apache/cxf/jaxws/JaxwsClientCallback.java | 22 +-
.../jaxws/interceptors/WebFaultOutInterceptor.java | 11 +-
.../apache/cxf/jaxws/JaxwsClientCallbackTest.java | 162 ++++
.../org/apache/cxf/javascript/cxf-utils.js | 4 +-
.../java/org/apache/cxf/javascript/AegisTest.java | 1 +
.../src/test/resources/AegisBeans.xml | 2 +-
.../src/test/resources/AnyBeans.xml | 2 +-
.../test/resources/DocLitBareClientTestBeans.xml | 2 +-
.../resources/DocLitWrappedClientTestBeans.xml | 2 +-
.../src/test/resources/GreeterClientTestBeans.xml | 2 +-
.../src/test/resources/HelloWorldDocLitBeans.xml | 2 +-
.../src/test/resources/HelloWorldGreeterBeans.xml | 2 +-
.../src/test/resources/MtoMBeans.xml | 2 +-
.../src/test/resources/RPCClientTestBeans.xml | 2 +-
.../src/test/resources/XMLHttpRequestTestBeans.xml | 2 +-
.../src/test/resources/attributeTestBeans.xml | 2 +-
rt/management/pom.xml | 24 +
.../management/jmx/InstrumentationManagerImpl.java | 52 +-
.../management/jmx/MBServerConnectorFactory.java | 186 -----
.../cxf/management/utils/ManagementConsole.java | 2 +-
.../cxf/management/InstrumentationManagerTest.java | 2 -
.../cxf/management/jmx/BusRegistrationTest.java | 6 -
.../jmx/JMXManagedComponentManagerTest.java | 23 +-
.../cxf/management/jmx/MBServerConnectorTest.java | 57 --
.../src/test/resources/managed-spring.xml | 4 -
.../src/test/resources/managed-spring3.xml | 4 -
.../src/test/resources/no-connector-spring.xml | 1 -
.../apache/cxf/jaxrs/client/AbstractClient.java | 6 +-
.../cxf/jaxrs/client/JaxrsClientCallback.java | 32 +-
.../spec/ClientResponseFilterInterceptor.java | 27 +-
.../jaxrs/client/spec/InvocationBuilderImpl.java | 8 +-
.../cxf/jaxrs/client/JaxrsClientCallbackTest.java | 193 +++++
.../client/spec/ClientResponseFilterTest.java | 252 ++++++
.../client/spec/InvocationBuilderImplTest.java | 9 +
rt/rs/description-swagger-ui/pom.xml | 5 +
.../jaxrs/swagger/ui/SwaggerUiResourceLocator.java | 8 +-
.../swagger/ui/SwaggerUIResourceLocatorTest.java | 36 +-
rt/rs/description-swagger/pom.xml | 1 +
rt/rs/extensions/json-basic/pom.xml | 9 -
.../apache/cxf/jaxrs/json/basic/JsonMapObject.java | 44 +-
.../json/basic/JsonMapObjectReaderWriter.java | 10 +-
.../cxf/jaxrs/json/basic/JsonMapObjectTest.java | 54 ++
rt/rs/extensions/providers/pom.xml | 6 +-
rt/rs/extensions/{json-basic => rx3}/pom.xml | 31 +-
.../cxf/jaxrs/rx3/client/FlowableRxInvoker.java | 105 +++
.../jaxrs/rx3/client/FlowableRxInvokerImpl.java | 199 +++++
.../rx3/client/FlowableRxInvokerProvider.java | 22 +-
.../cxf/jaxrs/rx3/client/ObservableRxInvoker.java | 104 +++
.../jaxrs/rx3/client/ObservableRxInvokerImpl.java | 198 +++++
.../rx3/client/ObservableRxInvokerProvider.java | 22 +-
.../cxf/jaxrs/rx3/server/ReactiveIOCustomizer.java | 34 +-
.../cxf/jaxrs/rx3/server/ReactiveIOInvoker.java | 71 ++
...rs.ext.JAXRSServerFactoryCustomizationExtension | 1 +
rt/rs/extensions/search/pom.xml | 22 +-
.../jaxrs/ext/search/hbase/HBaseQueryVisitor.java | 142 ----
.../jaxrs/ext/search/hbase/HBaseVisitorTest.java | 85 ---
rt/rs/microprofile-client/pom.xml | 4 +-
.../microprofile/client/MPRestClientCallback.java | 31 +-
.../client/MPRestClientCallbackTest.java | 161 ++++
rt/rs/pom.xml | 1 +
.../cxf/rs/security/jose/common/JoseUtils.java | 6 +-
.../security/jose/common/KeyManagementUtils.java | 34 +-
.../jwe/EcdhAesWrapKeyDecryptionAlgorithm.java | 4 +-
.../security/jose/jwe/JweJwtCompactConsumer.java | 9 +-
.../apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +-
.../cxf/rs/security/jose/jwk/JsonWebKeys.java | 6 +-
.../apache/cxf/rs/security/jose/jwk/JwkUtils.java | 2 +-
.../rs/security/jose/jws/JwsCompactProducer.java | 12 +-
.../apache/cxf/rs/security/jose/jws/JwsUtils.java | 4 -
.../cxf/rs/security/jose/jwt/JoseJwtConsumer.java | 2 +-
.../apache/cxf/rs/security/jose/jwt/JwtToken.java | 6 +-
.../jose/jwa/JwaDecryptRfcConformanceTest.java | 10 +
.../oauth/provider/MD5SequenceGenerator.java | 20 +-
rt/rs/security/oauth-parent/oauth2/pom.xml | 55 +-
.../security/oauth2/client/OAuthClientUtils.java | 25 +-
.../filters/JwsJwksJwtAccessTokenValidator.java | 112 +++
.../oauth2/grants/code/JPACMTCodeDataProvider.java | 20 +-
.../oauth2/grants/code/JPACodeDataProvider.java | 69 +-
.../grants/refresh/RefreshTokenGrantHandler.java | 5 +-
.../oauth2/provider/AbstractOAuthDataProvider.java | 20 +-
.../oauth2/provider/JPAOAuthDataProvider.java | 214 +++---
.../services/AbstractAccessTokenValidator.java | 2 +-
.../oauth2/services/AccessTokenService.java | 2 +-
.../services/AuthorizationCodeGrantService.java | 2 +-
.../oauth2/services/AuthorizationMetadata.java | 266 +++++++
.../services/AuthorizationMetadataService.java | 5 +-
.../services/ClientRegistrationResponse.java | 9 +-
.../services/DynamicRegistrationService.java | 52 +-
.../rs/security/oauth2/services/JwksService.java} | 9 +-
.../services/RedirectionBasedGrantService.java | 7 +-
.../oauth2/services/WellKnownService.java} | 20 +-
.../hawk/AbstractHawkAccessTokenValidator.java | 2 +-
.../security/oauth2/utils/AuthorizationUtils.java | 2 +-
.../cxf/rs/security/oauth2/utils/OAuthUtils.java | 38 +-
.../JwsJwksJwtAccessTokenValidatorTest.java | 90 +++
.../rs/security/oauth2/utils/OAuthUtilsTest.java | 20 +
rt/rs/security/oauth-parent/pom.xml | 5 -
rt/rs/security/sso/oidc/pom.xml | 10 +-
.../security/oidc/idp/IdTokenResponseFilter.java | 9 +-
.../oidc/idp/OidcConfigurationService.java | 22 +-
.../oidc/idp/OidcDynamicRegistrationService.java | 8 +-
.../cxf/rs/security/oidc/idp/OidcKeysService.java | 53 +-
.../rs/security/oidc/idp/OidcProviderMetadata.java | 245 ++++++
.../cxf/rs/security/oidc/idp/UserInfoService.java | 2 +-
.../oidc/rp/OidcRpAuthenticationFilter.java | 2 +-
.../cxf/rs/security/oidc/utils/OidcUtils.java | 17 +
rt/rs/security/sso/saml/pom.xml | 6 +-
.../AbstractRequestAssertionConsumerHandler.java | 4 +-
.../security/saml/sso/EHCacheTokenReplayCache.java | 166 ++--
.../cxf/rs/security/saml/sso/EHCacheUtil.java | 88 ---
.../saml/sso/SAMLSSOResponseValidator.java | 7 +-
.../cxf/rs/security/saml/sso/TokenReplayCache.java | 5 +-
.../saml/sso/state/EHCacheSPStateManager.java | 175 ++---
.../rs/security/saml/sso/state/RequestState.java | 26 +
.../rs/security/saml/sso/state/ResponseState.java | 23 +
.../saml/src/main/resources/cxf-samlp-ehcache.xml | 47 +-
.../cxf/rs/security/saml/sso/EHCacheUtilTest.java | 59 --
.../rs/security/saml/sso/SPStateManagerTest.java | 133 ++++
.../rs/security/saml/sso/TokenReplayCacheTest.java | 108 +++
.../saml/src/test/resources/cxf-test-ehcache.xml | 5 -
.../cxf/rs/security/xml/XmlSecOutInterceptor.java | 2 +-
.../cxf/jaxrs/sse/SseEventSinkContextProvider.java | 9 +
.../java/org/apache/cxf/jaxrs/sse/SseFeature.java | 7 +
.../jaxrs/sse/client/InboundSseEventProcessor.java | 50 +-
.../cxf/jaxrs/sse/client/SseEventSourceImpl.java | 6 +-
.../ext/SseTransportCustomizationExtension.java | 2 +
.../cxf/jaxrs/sse/interceptor/SseInterceptor.java | 139 ++++
.../cxf/transport/sse/SseProvidersExtension.java | 4 +-
.../jaxrs/sse/client/SseEventSourceImplTest.java | 104 ++-
.../interceptor/ClaimsAuthorizingInterceptor.java | 20 +-
.../cxf/rt/security/rs/RSSecurityConstants.java | 5 +
rt/transports/http-hc/pom.xml | 2 +-
.../http/asyncclient/AsyncHTTPConduit.java | 8 +-
rt/transports/http-jetty/pom.xml | 2 +-
.../http_jetty/JettyHTTPServerEngine.java | 19 +-
.../JettyHTTPServerEngineFactoryHolder.java | 4 +-
.../osgi/HTTPJettyTransportActivator.java | 2 +
.../http_jetty/JettyHTTPDestinationTest.java | 5 +-
.../transport/http_jetty/spring/beans-props.xml | 6 +-
.../http/netty/client/NettyHttpConduit.java | 15 +-
.../http/netty/client/integration/ServerConfig.xml | 2 +-
rt/transports/http-netty/netty-server/pom.xml | 3 +-
.../netty/server/NettyHttpDestinationTest.java | 5 +-
.../server/integration/ApplicationContext.xml | 2 +-
.../http/netty/server/integration/ServerConfig.xml | 2 +-
.../http/netty/server/spring/beans-props.xml | 6 +-
rt/transports/http-undertow/pom.xml | 2 +-
.../http_undertow/UndertowHTTPServerEngine.java | 17 +
.../http_undertow/UndertowHTTPDestinationTest.java | 5 +-
.../transport/http_undertow/spring/beans-props.xml | 6 +-
rt/transports/http/pom.xml | 2 +-
.../org/apache/cxf/transport/http/HTTPConduit.java | 11 +-
.../http/auth/DefaultBasicAuthSupplier.java | 2 +-
.../transport/http/auth/DigestAuthSupplier.java | 83 +-
.../cxf/transport/http/auth/HttpAuthHeader.java | 21 +-
.../http/osgi/HttpConduitConfigApplier.java | 10 +-
.../transport/https/AllowAllHostnameVerifier.java | 9 +
.../cxf/transport/https/InsecureTrustManager.java | 68 ++
.../cxf/transport/servlet/AbstractHTTPServlet.java | 50 +-
.../servicelist/ServiceListGeneratorServlet.java | 3 +
.../apache/cxf/transport/http/HTTPConduitTest.java | 9 +-
.../http/auth/DefaultBasicAuthSupplierTest.java} | 19 +-
.../http/auth/DigestAuthSupplierTest.java | 14 +-
.../http/osgi/HttpConduitConfigApplierTest.java | 105 +++
rt/transports/jms/pom.xml | 5 -
.../apache/cxf/transport/jms/JMSDestination.java | 2 +-
.../org/apache/cxf/transport/jms/util/JMSUtil.java | 12 +-
rt/transports/websocket/pom.xml | 3 +-
.../websocket/ahc/AhcWebSocketConduit.java | 34 +-
.../org/apache/cxf/ws/rm/managed-manager-bean.xml | 3 -
rt/ws/security/pom.xml | 6 +-
.../CXFEHCacheExpiry.java} | 14 +-
.../ws/security/cache/CXFEHCacheReplayCache.java | 7 +-
.../ws/security/cache/CacheCleanupListener.java | 4 +
.../apache/cxf/ws/security/cache/EHCacheUtils.java | 59 --
.../KerberosTokenInterceptorProvider.java | 22 +-
.../policy/interceptors/NegotiationUtils.java | 3 +-
.../SecureConversationInInterceptor.java | 52 +-
.../SecureConversationOutInterceptor.java | 47 +-
.../SpnegoContextTokenInInterceptor.java | 35 +-
.../SpnegoContextTokenOutInterceptor.java | 40 +-
.../ws/security/tokenstore/EHCacheTokenStore.java | 143 ++--
.../tokenstore/EHCacheTokenStoreFactory.java | 12 +-
.../tokenstore/MemoryTokenStoreFactory.java | 1 +
.../security/tokenstore/TokenStoreException.java | 13 +-
.../ws/security/tokenstore/TokenStoreFactory.java | 4 +-
.../ws/security/tokenstore/TokenStoreUtils.java | 6 +-
.../cxf/ws/security/trust/AbstractSTSClient.java | 35 +-
.../ws/security/trust/DefaultSTSTokenCacher.java | 14 +-
.../cxf/ws/security/trust/STSLoginModule.java | 3 +-
.../cxf/ws/security/trust/STSTokenCacher.java | 13 +-
.../cxf/ws/security/trust/STSTokenRetriever.java | 7 +-
.../cxf/ws/security/trust/STSTokenValidator.java | 3 +-
.../security/wss4j/AttachmentCallbackHandler.java | 12 +-
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 3 +-
.../ws/security/wss4j/StaxActionInInterceptor.java | 2 +-
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 24 +-
.../ws/security/wss4j/WSS4JStaxInInterceptor.java | 3 +-
.../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 7 +-
.../apache/cxf/ws/security/wss4j/WSS4JUtils.java | 27 +-
.../policyhandlers/AbstractBindingBuilder.java | 13 +-
.../AbstractCommonBindingHandler.java | 3 +-
.../policyhandlers/AbstractStaxBindingHandler.java | 5 +-
.../policyhandlers/AsymmetricBindingHandler.java | 55 +-
.../StaxAsymmetricBindingHandler.java | 4 +-
.../StaxSymmetricBindingHandler.java | 27 +-
.../StaxTransportBindingHandler.java | 16 +-
.../policyhandlers/SymmetricBindingHandler.java | 3 +-
.../KerberosTokenPolicyValidator.java | 11 +-
rt/ws/security/src/main/resources/cxf-ehcache.xml | 42 +-
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 75 --
.../security/tokenstore/MemoryTokenStoreTest.java | 91 ---
.../ws/security/tokenstore/SecurityTokenTest.java | 14 +
...acheTokenStoreTest.java => TokenStoreTest.java} | 32 +-
.../security/wss4j/AbstractPolicySecurityTest.java | 13 +-
.../wss4j/AttachmentCallbackHandlerTest.java | 87 +++
.../security/wss4j/CryptoCoverageCheckerTest.java | 2 +-
.../wss4j/DOMToStaxEncryptionIdentifierTest.java | 10 +-
.../ws/security/wss4j/DOMToStaxRoundTripTest.java | 8 +-
.../wss4j/DefaultCryptoCoverageCheckerTest.java | 2 +-
.../cxf/ws/security/wss4j/RoundTripTest.java | 6 +-
.../ws/security/wss4j/SecurityActionTokenTest.java | 2 +-
.../wss4j/StaxCryptoCoverageCheckerTest.java | 6 +-
.../ws/security/wss4j/StaxRoundTripActionTest.java | 36 +-
.../cxf/ws/security/wss4j/StaxRoundTripTest.java | 12 +-
.../wss4j/StaxToDOMEncryptionIdentifierTest.java | 20 +-
.../ws/security/wss4j/StaxToDOMRoundTripTest.java | 32 +-
.../wss4j/UserNameTokenAuthorizationTest.java | 8 +-
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 4 +-
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 8 +-
.../ws/security/wss4j/WSS4JOutInterceptorTest.java | 2 +-
.../src/test/resources/cxf-test-ehcache.xml | 16 -
.../main/java/org/apache/cxf/wsdl/WSDLManager.java | 6 +
.../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 19 +
.../org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 100 ++-
services/sts/sts-core/pom.xml | 12 +-
.../cxf/sts/cache/AbstractIdentityCache.java | 6 +-
.../cxf/sts/cache/DefaultInMemoryTokenStore.java | 11 +-
.../apache/cxf/sts/cache/EHCacheIdentityCache.java | 67 +-
...dentityCache.java => EHCacheIdentityValue.java} | 19 +-
.../org/apache/cxf/sts/cache/IdentityCache.java | 4 -
.../apache/cxf/sts/cache/MemoryIdentityCache.java | 24 +-
.../cxf/sts/operation/AbstractOperation.java | 6 +-
.../sts-core/src/main/resources/sts-ehcache.xml | 26 +-
.../apache/cxf/sts/cache/CacheIdentityMapper.java | 27 +-
.../cxf/sts/cache/EhCacheIdentityCacheTest.java | 116 +--
.../cxf/sts/cache/MemoryIdentityCacheTest.java | 54 +-
.../cxf/sts/operation/CancelSCTUnitTest.java | 10 +-
.../apache/cxf/sts/operation/IssueJWTUnitTest.java | 9 +-
.../apache/cxf/sts/operation/IssueSCTUnitTest.java | 10 +-
.../cxf/sts/operation/RenewSamlUnitTest.java | 3 +-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 10 +-
.../cxf/sts/token/canceller/SCTCancellerTest.java | 10 +-
.../sts/token/provider/JWTTokenProviderTest.java | 9 +-
.../cxf/sts/token/provider/SCTProviderTest.java | 10 +-
.../renewer/SAMLTokenRenewerLifetimeTest.java | 3 +-
.../sts/token/renewer/SAMLTokenRenewerPOPTest.java | 3 +-
.../token/renewer/SAMLTokenRenewerRealmTest.java | 3 +-
.../sts/token/renewer/SAMLTokenRenewerTest.java | 3 +-
.../validator/JWTTokenValidatorRealmTest.java | 10 +-
.../sts/token/validator/JWTTokenValidatorTest.java | 10 +-
.../SAMLTokenValidatorCachedRealmTest.java | 3 +-
.../token/validator/SAMLTokenValidatorTest.java | 3 +-
.../cxf/sts/token/validator/SCTValidatorTest.java | 10 +-
services/sts/systests/advanced/pom.xml | 4 +-
.../cxf/systest/sts/caching/CachingTest.java | 2 -
.../cxf/systest/sts/caching/ServerCachingTest.java | 2 -
.../cxf/systest/sts/asymmetric_encr/cxf-sts.xml | 2 +-
.../systest/sts/asymmetric_encr/stax-cxf-sts.xml | 2 +-
.../cxf/systest/sts/basic_auth/cxf-service.xml | 2 +-
.../systest/sts/basic_auth/stax-cxf-service.xml | 2 +-
.../cxf/systest/sts/batch/cxf-client-unit.xml | 2 +-
.../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 2 +-
.../apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 2 +-
.../sts/binarysecuritytoken/cxf-service.xml | 2 +-
.../sts/binarysecuritytoken/stax-cxf-service.xml | 2 +-
.../systest/sts/caching/cxf-caching-service.xml | 2 +-
.../apache/cxf/systest/sts/caching/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/caching/cxf-service.xml | 2 +-
.../cxf/systest/sts/claims/cxf-bad-client.xml | 2 +-
.../systest/sts/claims/cxf-client-cbhandler.xml | 2 +-
.../apache/cxf/systest/sts/claims/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/claims/cxf-service.xml | 2 +-
.../cxf/systest/sts/claims/stax-cxf-service.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-client-b.xml | 2 +-
.../systest/sts/cross_domain/cxf-client-mex.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-client.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-service.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 2 +-
.../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 2 +-
.../apache/cxf/systest/sts/custom/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/custom/cxf-service.xml | 2 +-
.../cxf/systest/sts/custom/cxf-sts-common.xml | 2 +-
.../systest/sts/custom_onbehalfof/cxf-client.xml | 2 +-
.../systest/sts/custom_onbehalfof/cxf-service.xml | 2 +-
.../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 2 +-
.../sts/defaultstsprovider/cxf-client-unit.xml | 2 +-
.../sts/defaultstsprovider/cxf-sts-common.xml | 2 +-
.../cxf/systest/sts/deployment/cxf-sts-common.xml | 2 +-
.../systest/sts/distributed_caching/cxf-client.xml | 2 +-
.../sts/distributed_caching/cxf-service.xml | 2 +-
.../systest/sts/distributed_caching/cxf-sts-1.xml | 2 +-
.../systest/sts/distributed_caching/cxf-sts-2.xml | 2 +-
.../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 2 +-
.../sts/kerberos/cxf-intermediary-client.xml | 2 +-
.../sts/kerberos/cxf-intermediary-jaxrs-client.xml | 2 +-
.../cxf/systest/sts/kerberos/cxf-intermediary.xml | 2 +-
.../cxf/systest/sts/kerberos/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/realms/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/realms/cxf-service.xml | 2 +-
.../cxf/systest/sts/realms/cxf-sts-saml1.xml | 2 +-
.../cxf/systest/sts/realms/cxf-sts-saml2.xml | 2 +-
.../cxf/systest/sts/renew/cxf-client-unit.xml | 2 +-
.../apache/cxf/systest/sts/renew/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/renew/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 2 +-
.../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 2 +-
.../apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 2 +-
.../cxf/systest/sts/secure_conv/cxf-client.xml | 2 +-
.../cxf/systest/sts/secure_conv/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 2 +-
.../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 2 +-
.../apache/cxf/systest/sts/soap12/cxf-client.xml | 2 +-
.../apache/cxf/systest/sts/soap12/cxf-service.xml | 2 +-
.../cxf/systest/sts/soap12/stax-cxf-service.xml | 2 +-
.../systest/sts/sts_sender_vouches/cxf-service.xml | 2 +-
.../cxf/systest/sts/sts_sender_vouches/cxf-sts.xml | 2 +-
.../sts/sts_sender_vouches/stax-cxf-sts.xml | 2 +-
.../cxf/systest/sts/transformation/cxf-service.xml | 2 +-
.../cxf/systest/sts/usernametoken/cxf-service.xml | 2 +-
.../systest/sts/usernametoken/stax-cxf-service.xml | 2 +-
services/sts/systests/basic/pom.xml | 4 +-
.../cxf/systest/sts/asymmetric/cxf-service.xml | 2 +-
.../systest/sts/asymmetric/cxf-stax-service.xml | 2 +-
.../apache/cxf/systest/sts/bearer/cxf-service.xml | 2 +-
.../cxf/systest/sts/bearer/cxf-stax-service.xml | 2 +-
.../systest/sts/delegation/cxf-sts-transport.xml | 2 +-
.../cxf/systest/sts/deployment/sts/cxf-sts.xml | 2 +-
.../cxf-intermediary-caching.xml | 2 +-
.../cxf-intermediary.xml | 2 +-
.../intermediary_transformation/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/issuer/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/jaas/cxf-service.xml | 2 +-
.../apache/cxf/systest/sts/jaas/cxf-service2.xml | 2 +-
.../apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 2 +-
.../systest/sts/sendervouches/cxf-intermediary.xml | 2 +-
.../cxf/systest/sts/sendervouches/cxf-service.xml | 2 +-
.../sts/sendervouches/cxf-stax-intermediary.xml | 2 +-
.../systest/sts/sendervouches/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/stsclient/cxf-client-name.xml | 2 +-
.../systest/sts/stsclient/cxf-default-client.xml | 2 +-
.../cxf/systest/sts/stsclient/cxf-service.xml | 2 +-
.../cxf/systest/sts/symmetric/cxf-service.xml | 2 +-
.../cxf/systest/sts/symmetric/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/template/cxf-service.xml | 2 +-
.../cxf/systest/sts/template/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/transport/cxf-service.xml | 2 +-
.../cxf/systest/sts/transport/cxf-stax-service.xml | 2 +-
.../cxf/systest/sts/username_actas/cxf-service.xml | 2 +-
.../systest/sts/username_actas/cxf-service2.xml | 2 +-
.../sts/username_onbehalfof/cxf-service.xml | 2 +-
.../sts/username_onbehalfof/cxf-service2.xml | 2 +-
.../systest/sts/x509/cxf-asymmetric-service.xml | 2 +-
.../apache/cxf/systest/sts/x509/cxf-service.xml | 2 +-
.../cxf/systest/sts/x509/cxf-stax-service.xml | 2 +-
services/wsn/wsn-osgi/pom.xml | 1 -
services/xkms/README.txt | 7 +-
services/xkms/xkms-client/pom.xml | 4 +-
.../org/apache/cxf/xkms/cache/EHCacheUtil.java | 88 ---
.../cxf/xkms/cache/EHCacheXKMSClientCache.java | 103 ++-
.../cxf/xkms/cache/XKMSClientCacheException.java | 13 +-
.../xkms/crypto/provider/XkmsCryptoProvider.java | 8 +-
.../crypto/provider/XkmsCryptoProviderFactory.java | 40 +-
.../src/main/resources/cxf-xkms-client-ehcache.xml | 23 +-
.../xkms-features/src/main/resources/features.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
services/xkms/xkms-service/pom.xml | 2 +-
services/xkms/xkms-x509-handlers/pom.xml | 2 +-
.../xkms/x509/validator/DirectTrustValidator.java | 2 +-
.../x509/validator/TrustedAuthorityValidator.java | 16 +-
.../TrustedAuthorityValidatorCRLTest.java | 1 +
systests/cdi/base/pom.xml | 8 +-
.../cdi/base/tomcat/AbstractTomcatServer.java | 30 +-
systests/cdi/cdi-owb/pom.xml | 10 +-
systests/cdi/cdi-weld/cdi-producers-weld/pom.xml | 6 +
systests/cdi/cdi-weld/pom.xml | 14 +-
systests/cdi/pom.xml | 46 +-
systests/databinding/pom.xml | 11 -
.../src/test/resources/aegisJaxWsBeans.xml | 2 +-
.../src/test/resources/aegisSportsServiceBeans.xml | 2 +-
.../src/test/resources/aegisWSDLNSBeans.xml | 2 +-
.../src/test/resources/extrajaxbclass.xml | 2 +-
.../src/test/resources/jaxbCustomValidators.xml | 2 +-
.../src/test/resources/mtomTestBeans.xml | 2 +-
systests/{transports-ssl3 => forked}/pom.xml | 22 +-
.../DispatchClientServerWithHugeResponseTest.java | 35 +-
.../forked}/dispatch/HugeResponseInterceptor.java | 6 +-
.../forked}/dispatch/ResponseInterceptorType.java | 2 +-
.../cxf/systests/forked}/ssl3/GreeterImpl.java | 2 +-
.../cxf/systests/forked}/ssl3/SSLv3Server.java | 8 +-
.../cxf/systests/forked}/ssl3/SSLv3Test.java | 54 +-
.../forked/dispatch/GreetMeDocLiteralReq3.xml | 17 +-
...tMeDocLiteralRespBreakElementCountThreshold.xml | 27 +
.../GreetMeDocLiteralRespBreakThreshold.xml | 0
.../systests/forked}/ssl3/sslv3-client-allow.xml | 0
.../cxf/systests/forked}/ssl3/sslv3-client.xml | 0
.../cxf/systests/forked}/ssl3/sslv3-server.xml | 10 +-
systests/jaxrs/pom.xml | 38 +-
.../org/apache/cxf/systest/jaxrs/BookServer20.java | 53 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 12 +-
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 277 ++++---
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 107 ++-
.../systest/jaxrs/JAXRSClientServerBookTest.java | 16 +-
.../systest/jaxrs/JAXRSServicesListingTest.java | 15 +
.../cxf/systest/jaxrs/jms/jms_server_config.xml | 2 +-
.../jaxrs/reactive/JAXRSRxJava3FlowableTest.java | 155 ++++
.../jaxrs/reactive/JAXRSRxJava3ObservableTest.java | 106 +++
.../jaxrs/reactive/RxJava3FlowableServer.java | 81 ++
.../jaxrs/reactive/RxJava3FlowableService.java | 165 ++++
.../jaxrs/reactive/RxJava3ObservableServer.java | 73 ++
.../jaxrs/reactive/RxJava3ObservableService.java | 58 ++
.../jaxrs/security/AbstractSpringSecurityTest.java | 13 +-
.../JAXRSJaasConfigurationSecurityTest.java | 3 +-
.../jaxrs/security/JAXRSJaasSecurityTest.java | 3 +-
.../systest/jaxrs/security/jaxrs-https-client3.xml | 2 +-
.../systest/jaxrs/security/jaxrs-https-client4.xml | 2 +-
.../systest/jaxrs/security/jaxrs-https-client5.xml | 2 +-
.../jaxrs/security/jaxrs-https-client_old.xml | 2 +-
.../systest/jaxrs/security/jaxrs-https-server.xml | 2 +-
.../AbstractJAXRSClientServerWebSocketTest.java | 65 +-
.../jaxrs/websocket/WebSocketTestClient.java | 181 ++---
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 77 +-
.../resources/jaxrs_soap_rest/WEB-INF/beans.xml | 2 +-
.../resources/jaxrs_websocket/beans-embedded.xml | 2 +-
.../resources/jaxrs_websocket/beans-embedded2.xml | 2 +-
.../systest/jaxrs/discovery/jaxrs-http-client.xml | 2 +-
.../cxf/systest/jaxrs/failover/cxf-lb-service.xml | 2 +-
.../cxf/systest/jaxrs/failover/cxf-service.xml | 2 +-
.../resources/service_listing/WEB-INF/beans.xml | 8 +
systests/jaxws/pom.xml | 7 -
.../java/org/apache/cxf/systest/handlers/beans.xml | 2 +-
.../handlers/beans_autoRewriteSoapAddress.xml | 2 +-
.../handlers/beans_no_autoRewriteSoapAddress.xml | 2 +-
.../cxf/systest/handlers/soap_fault_beans.xml | 2 +-
.../jaxws/metrics/JAXWSClientMetricsTest.java | 10 +-
.../apache/cxf/systest/jaxws/springWebService.xml | 2 +-
.../cxf/systest/kerberos/wssec/kerberos/client.xml | 2 +-
.../cxf/systest/kerberos/wssec/kerberos/server.xml | 2 +-
.../kerberos/wssec/kerberos/stax-server.xml | 2 +-
.../systest/kerberos/wssec/kerberos/sts-client.xml | 2 +-
.../cxf/systest/kerberos/wssec/spnego/client.xml | 2 +-
.../cxf/systest/kerberos/wssec/spnego/server.xml | 2 +-
.../systest/kerberos/wssec/spnego/stax-server.xml | 2 +-
.../cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 2 +-
.../systest/kerberos/wssec/sts/stax-cxf-sts.xml | 2 +-
systests/microprofile/client/async/pom.xml | 4 +-
systests/microprofile/client/jaxrs/pom.xml | 4 -
systests/microprofile/client/weld/pom.xml | 27 +-
systests/microprofile/pom.xml | 4 +-
systests/pom.xml | 2 +-
systests/rs-http-sci/pom.xml | 1 -
systests/rs-security/pom.xml | 23 +-
.../security/oauth/MemoryOAuthDataProvider.java | 4 +-
.../oauth2/common/JCacheOAuthDataProviderImpl.java | 68 +-
.../oauth2/common/JPAOAuthDataProviderImpl.java | 68 +-
.../security/oauth2/common/OAuth2TestUtils.java | 79 +-
.../oauth2/common/WSS4JBasicAuthFilter.java | 5 +
.../oauth2/filters/BookServerOAuth2Filters.java | 48 --
.../oauth2/filters/BookServerOAuth2FiltersJwt.java | 48 --
.../oauth2/filters/BookServerOAuth2Service.java | 48 --
.../oauth2/filters/BookServerOAuth2ServiceJwt.java | 48 --
.../security/oauth2/filters/OAuth2FiltersTest.java | 203 ++---
.../oauth2/filters/OAuth2JwtFiltersTest.java | 99 ++-
.../security/oauth2/filters/PartnerServer.java | 49 --
.../security/oauth2/filters/PartnerService.java | 34 +-
.../oauth2/grants/AuthorizationGrantTest.java | 293 ++-----
.../oauth2/grants/DynamicRegistrationTest.java | 111 +--
.../security/oauth2/grants/PublicClientTest.java | 214 ++----
.../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 4 +-
.../security/oauth2/tls/OAuthDataProviderImpl.java | 4 +-
.../oauth2/tls/OAuthDataProviderImplJwt.java | 2 +-
.../jaxrs/security/oidc/IdTokenProviderImpl.java | 11 +-
.../security/oidc/OIDCDynamicRegistrationTest.java | 141 ++--
.../systest/jaxrs/security/oidc/OIDCFlowTest.java | 186 +++--
.../security/oidc/OIDCMetadataServiceTest.java | 73 --
.../jaxrs/security/oidc/SubjectCreatorImpl.java | 58 ++
.../oidc/filters/BookServerOIDCFilters.java | 48 --
.../oidc/filters/BookServerOIDCService.java | 48 --
.../security/oidc/filters/OIDCFiltersTest.java | 81 +-
.../src/test/resources/META-INF/persistence.xml | 1 +
.../jaxrs/security/httpsignature/client.xml | 2 +-
.../jaxrs/security/httpsignature/server.xml | 2 +-
.../cxf/systest/jaxrs/security/jcs/client.xml | 2 +-
.../cxf/systest/jaxrs/security/jcs/jcs-server.xml | 2 +-
.../security/jose/jwejws/algorithms-server.xml | 2 +-
.../systest/jaxrs/security/jose/jwejws/client.xml | 2 +-
.../security/jose/jwejws/http-headers-server.xml | 2 +-
.../security/jose/jwejws/reference-server.xml | 2 +-
.../systest/jaxrs/security/jose/jwejws/server.xml | 2 +-
.../jaxrs/security/jose/jwejws/serverJweJson.xml | 2 +-
.../jaxrs/security/jose/jwejws/serverJwsJson.xml | 2 +-
.../jaxrs/security/jose/jwejws/serverMultipart.xml | 2 +-
.../jaxrs/security/jose/jwt/algorithms-server.xml | 2 +-
.../jaxrs/security/jose/jwt/authn-authz-server.xml | 2 +-
.../cxf/systest/jaxrs/security/jose/jwt/client.xml | 2 +-
.../jaxrs/security/jose/jwt/properties-server.xml | 2 +-
.../jaxrs/security/oauth2/filters/client.xml | 45 --
.../security/oauth2/filters/filters-server.xml | 2 +-
.../security/oauth2/filters/filters-serverJwt.xml | 23 +-
.../security/oauth2/filters/oauth20-server.xml | 2 +-
.../security/oauth2/filters/oauth20-serverJwt.xml | 46 +-
.../security/oauth2/filters/partner-service.xml | 11 +-
.../jaxrs/security/oauth2/grants/client.xml | 2 +-
.../grants/dynamic-reg-server-jcache-jwt.xml | 2 +-
.../oauth2/grants/dynamic-reg-server-jcache.xml | 2 +-
.../oauth2/grants/dynamic-reg-server-jpa.xml | 2 +-
...ants-negative-server-jcache-jwt-non-persist.xml | 2 +-
.../grants/grants-negative-server-jcache-jwt.xml | 2 +-
.../grants/grants-negative-server-jcache.xml | 2 +-
.../oauth2/grants/grants-negative-server-jpa.xml | 2 +-
.../grants-server-jcache-jwt-non-persist.xml | 9 +-
.../oauth2/grants/grants-server-jcache-jwt.xml | 9 +-
.../oauth2/grants/grants-server-jcache.xml | 8 +-
.../security/oauth2/grants/grants-server-jpa.xml | 8 +-
.../oauth2/grants/grants-server-public.xml | 2 +-
...introspection-server-jcache-jwt-non-persist.xml | 2 +-
.../grants/introspection-server-jcache-jwt.xml | 2 +-
.../oauth2/grants/introspection-server-jcache.xml | 2 +-
.../oauth2/grants/introspection-server-jpa.xml | 2 +-
.../jaxrs/security/oauth2/grants/publicclient.xml | 2 +-
.../oauth2/grants/revocation-server-jcache-jwt.xml | 2 +-
.../oauth2/grants/revocation-server-jcache.xml | 2 +-
.../oauth2/grants/revocation-server-jpa.xml | 2 +-
.../grants/server-jcache-jwt-non-persist.xml | 2 +-
.../security/oauth2/grants/server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oauth2/grants/server-jcache.xml | 2 +-
.../jaxrs/security/oauth2/grants/server-jpa.xml | 2 +-
.../systest/jaxrs/security/oauth2/tls/client.xml | 2 +-
.../systest/jaxrs/security/oauth2/tls/client2.xml | 2 +-
.../jaxrs/security/oauth2/tls/serverTls.xml | 2 +-
.../systest/jaxrs/security/oidc/filters/client.xml | 45 --
.../jaxrs/security/oidc/filters/filters-server.xml | 2 +-
.../jaxrs/security/oidc/filters/oidc-server.xml | 19 +-
.../jaxrs/security/oidc/metadata-server-jcache.xml | 84 --
.../jaxrs/security/oidc/oidc-keys-jcache.xml | 2 +-
...oidc-negative-server-jcache-jwt-non-persist.xml | 2 +-
.../oidc/oidc-negative-server-jcache-jwt.xml | 2 +-
.../security/oidc/oidc-negative-server-jcache.xml | 2 +-
.../security/oidc/oidc-negative-server-jpa.xml | 2 +-
.../jaxrs/security/oidc/oidc-server-dynreg.xml | 2 +-
.../oidc/oidc-server-jcache-jwt-non-persist.xml | 25 +-
.../jaxrs/security/oidc/oidc-server-jcache-jwt.xml | 25 +-
.../jaxrs/security/oidc/oidc-server-jcache.xml | 25 +-
.../jaxrs/security/oidc/oidc-server-jpa.xml | 39 +-
.../userinfo-server-jcache-jwt-non-persist.xml | 2 +-
.../security/oidc/userinfo-server-jcache-jwt.xml | 2 +-
.../jaxrs/security/oidc/userinfo-server-jcache.xml | 2 +-
.../jaxrs/security/oidc/userinfo-server-jpa.xml | 2 +-
.../cxf/systest/jaxrs/security/saml/client.xml | 2 +-
.../systest/jaxrs/security/saml/secureServer.xml | 2 +-
.../cxf/systest/jaxrs/security/saml/server.xml | 2 +-
.../cxf/systest/jaxrs/security/samlsso/client.xml | 2 +-
.../jaxrs/security/samlsso/metadata-server.xml | 2 +-
.../cxf/systest/jaxrs/security/xml/client.xml | 2 +-
.../cxf/systest/jaxrs/security/xml/server.xml | 2 +-
.../cxf/systest/jaxrs/security/xml/stax-server.xml | 2 +-
systests/rs-sse/pom.xml | 13 -
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 72 +-
.../apache/cxf/systest/jaxrs/sse/BookStore.java | 69 +-
.../apache/cxf/systest/jaxrs/sse/BookStore2.java | 69 +-
.../jaxrs/sse/BookStoreClientCloseable.java | 18 +-
.../systest/jaxrs/sse/BookStoreResponseFilter.java | 55 ++
.../cxf/systest/jaxrs/sse/SseApplication.java | 6 +-
.../jaxrs/sse/jetty/AbstractJettyServer.java | 7 +-
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 43 +-
systests/rs-sse/rs-sse-undertow/pom.xml | 5 +
.../jaxrs/sse/undertow/AbstractUndertowServer.java | 5 +-
systests/spring-boot/pom.xml | 18 +-
.../apache/cxf/systest/jaxrs/resources/Book.java | 19 +
.../jaxrs/spring/boot/SpringSseEmitterTest.java | 132 ++++
systests/tracing/pom.xml | 1 -
.../cxf/systest/jaxrs/tracing/BookStore.java | 24 +-
.../jaxrs/tracing/NullPointerExceptionMapper.java | 20 +-
.../jaxrs/tracing/brave/BraveTracingTest.java | 97 +--
.../opentracing/OpenTracingTracingTest.java | 39 +-
.../systest/jaxws/tracing/BookStoreService.java | 1 +
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 12 +
.../jaxws/tracing/brave/BraveTracingTest.java | 160 ++--
.../jaxws/tracing/opentracing/BookStore.java | 14 +-
.../opentracing/OpenTracingTracingTest.java | 15 +
.../cxf/systest/jms/action/JMSSoapActionTest.java | 16 +-
.../systest/jms/continuations/jms_test_config.xml | 2 +-
systests/transport-undertow/pom.xml | 6 -
.../websocket/JAXRSClientServerWebSocketTest.java | 65 +-
.../JAXRSClientServerWebSocketTest.java.bak | 438 -----------
.../websocket/WebSocketTestClient.java | 182 ++---
.../resources/jaxrs_websocket/beans-embedded.xml | 2 +-
.../resources/jaxrs_websocket/beans-embedded2.xml | 2 +-
.../cxf/systest/http_undertow/SessionServer.xml | 2 +-
.../http_undertow/continuations/cxf_https.xml | 2 +-
.../http_undertow/continuations/jaxws-server.xml | 2 +-
.../http_undertow/server-lifecycle-beans.xml | 2 +-
.../apache/cxf/systest/http_undertow/server.xml | 2 +-
.../cxf/systest/http_undertow/undertow-engine.xml | 2 +-
.../http_undertow/undertowBasicAuthServer.xml | 2 +-
.../systest/http_undertow/undertowDigestServer.xml | 2 +-
systests/transports/pom.xml | 45 ++
.../http/auth/DigestAuthSupplierJettyTest.java | 140 ++++
.../http/auth/DigestAuthSupplierSpringTest.java | 145 ++++
.../systest/http_jetty/EngineLifecycleTest.java | 11 +-
.../https/ciphersuites/CipherSuitesTest.java | 39 +-
.../systest/https/clientauth/ClientAuthTest.java | 86 +--
.../systest/https/conduit/HTTPSConduitTest.java | 6 +-
.../cxf/systest/https/trust/TrustManagerTest.java | 56 +-
.../test/resources/digestauth/WEB-INF/beans.xml | 3 +-
.../org/apache/cxf/systest/http/SessionServer.xml | 2 +-
.../systest/http_jetty/continuations/cxf_https.xml | 2 +-
.../http_jetty/continuations/jaxws-server.xml | 2 +-
.../apache/cxf/systest/http_jetty/jetty-engine.xml | 10 +-
.../systest/http_jetty/jettyBasicAuthServer.xml | 2 +-
.../cxf/systest/http_jetty/jettyDigestServer.xml | 2 +-
.../systest/http_jetty/server-lifecycle-beans.xml | 2 +-
.../org/apache/cxf/systest/http_jetty/server.xml | 2 +-
.../https/ciphersuites/ciphersuites-server.xml | 2 +-
.../https/clientauth/client-auth-server.xml | 2 +-
.../systest/https/conduit/BethalClientBeans.xml | 2 +-
.../https/conduit/jaxws-publish-callback.xml | 2 +-
.../cxf/systest/https/conduit/jaxws-publish.xml | 2 +-
.../cxf/systest/https/conduit/jaxws-server.xml | 2 +-
.../https/conduit/jaxws-tlsrefs-publish.xml | 2 +-
.../apache/cxf/systest/https/conduit/pkcs12.xml | 2 +-
.../https/conduit/resource-key-spec-url.xml | 2 +-
.../systest/https/conduit/resource-key-spec.xml | 2 +-
.../https/constraints/jaxws-server-constraints.xml | 2 +-
.../https/hostname/hostname-server-deprecated.xml | 2 +-
.../cxf/systest/https/hostname/hostname-server.xml | 2 +-
.../https/trust/client-trust-manager-ref.xml} | 10 +-
.../cxf/systest/https/trust/trust-server.xml | 2 +-
systests/uncategorized/pom.xml | 25 -
.../src/test/java/org/apache/cxf/cxf1332/beans.xml | 2 +-
.../clustering/failover_address_override.xml | 2 +-
.../load_distributor_address_override.xml | 2 +-
.../cxf/systest/factory_pattern/cxf_multiplex.xml | 2 +-
.../cxf/systest/management/ManagedBusTest.java | 4 -
.../cxf/systest/management/counter-spring.xml | 3 +-
.../apache/cxf/systest/management/managed-bus.xml | 3 +-
.../cxf/systest/management/managed-spring.xml | 3 +-
.../cxf/systest/management/persistent-id.xml | 3 +-
.../systest/soap/RPCLitSoapActionGreeterImpl.java | 16 +-
.../apache/cxf/systest/soap/SoapActionTest.java | 15 +-
.../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 +-
.../org/apache/cxf/systest/ws/rm/decoupled.xml | 2 +-
.../apache/cxf/systest/ws/rm/decoupled_bare.xml | 2 +-
.../ws/rm/exactlyonce-inorder-decoupled.xml | 2 +-
.../apache/cxf/systest/ws/rm/managed-client.xml | 4 +-
.../apache/cxf/systest/ws/rm/managed-server.xml | 3 +-
.../ws/rm/persistent-message-loss-server.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/persistent.xml | 2 +-
.../apache/cxf/systest/ws/rm/sec/client-policy.xml | 2 +-
.../apache/cxf/systest/ws/rm/sec/server-policy.xml | 2 +-
.../java/org/apache/cxf/systest/ws/rm/simple.xml | 2 +-
.../systest/ws/rm/sync-ack-persistent-server.xml | 2 +-
.../cxf/systest/ws/rm/wsrm-policy-resolve.xml | 2 +-
.../cxf/systest/wssec/examples/saml/server.xml | 2 +-
.../systest/wssec/examples/saml/stax-server.xml | 2 +-
.../cxf/systest/wssec/examples/secconv/server.xml | 2 +-
.../systest/wssec/examples/secconv/stax-server.xml | 2 +-
.../systest/wssec/examples/sts/cxf-symmetric.xml | 2 +-
.../cxf/systest/wssec/examples/ut/server.xml | 2 +-
.../cxf/systest/wssec/examples/ut/stax-server.xml | 2 +-
.../cxf/systest/wssec/examples/x509/server.xml | 2 +-
.../systest/wssec/examples/x509/stax-server.xml | 2 +-
.../apache/cxf/systest/ws/cache/CachingTest.java | 89 ++-
.../org/apache/cxf/systest/ws/action/server.xml | 2 +-
.../cxf/systest/ws/action/signature-server.xml | 2 +-
.../systest/ws/action/signature-stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/algsuite/server.xml | 2 +-
.../apache/cxf/systest/ws/algsuite/stax-server.xml | 2 +-
.../systest/ws/basicauth/server-continuation.xml | 2 +-
.../org/apache/cxf/systest/ws/basicauth/server.xml | 2 +-
.../org/apache/cxf/systest/ws/bindings/server.xml | 2 +-
.../apache/cxf/systest/ws/bindings/stax-server.xml | 2 +-
.../cxf/systest/ws/cache/per-proxy-cache.xml | 57 +-
.../org/apache/cxf/systest/ws/cache/server.xml | 2 +-
.../cxf/systest/ws/coverage_checker/server.xml | 2 +-
.../systest/ws/coverage_checker/stax-server.xml | 2 +-
.../cxf/systest/ws/fault/modified-server.xml | 2 +-
.../org/apache/cxf/systest/ws/fault/server.xml | 2 +-
.../org/apache/cxf/systest/ws/gcm/mgf-server.xml | 2 +-
.../apache/cxf/systest/ws/gcm/mgf-stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/gcm/server.xml | 2 +-
.../org/apache/cxf/systest/ws/gcm/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/httpget/server.xml | 2 +-
.../org/apache/cxf/systest/ws/https/server.xml | 2 +-
.../apache/cxf/systest/ws/https/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/mtom/server.xml | 2 +-
.../org/apache/cxf/systest/ws/mtom/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/parts/server.xml | 2 +-
.../apache/cxf/systest/ws/parts/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/password/server.xml | 2 +-
.../cxf/systest/ws/policy/javafirstclient.xml | 2 +-
.../cxf/systest/ws/policy/javafirstserver.xml | 2 +-
.../cxf/systest/ws/policy/operation/server.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/server.xml | 2 +-
.../apache/cxf/systest/ws/policy/sslcertclient.xml | 2 +-
.../cxf/systest/ws/policy/sslnocertclient.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/client.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/server.xml | 2 +-
.../org/apache/cxf/systest/ws/saml/stax-server.xml | 2 +-
.../systest/ws/saml/subjectconf/client-auth.xml | 2 +-
.../systest/ws/saml/subjectconf/client-noauth.xml | 2 +-
.../cxf/systest/ws/saml/subjectconf/server.xml | 2 +-
.../systest/ws/saml/subjectconf/stax-server.xml | 2 +-
.../cxf/systest/ws/security/handler/server.xml | 2 +-
.../cxf/systest/ws/security/https_config.xml | 2 +-
.../systest/ws/security/https_config_client.xml | 2 +-
.../org/apache/cxf/systest/ws/security/server.xml | 2 +-
.../apache/cxf/systest/ws/security/stax-server.xml | 2 +-
.../apache/cxf/systest/ws/swa/policy-server.xml | 2 +-
.../org/apache/cxf/systest/ws/swa/server.xml | 2 +-
.../cxf/systest/ws/swa/stax-policy-server.xml | 2 +-
.../apache/cxf/systest/ws/tokens/bst-server.xml | 2 +-
.../cxf/systest/ws/tokens/endorsing-server.xml | 2 +-
.../org/apache/cxf/systest/ws/tokens/server.xml | 2 +-
.../systest/ws/tokens/stax-endorsing-server.xml | 2 +-
.../apache/cxf/systest/ws/tokens/stax-server.xml | 2 +-
.../apache/cxf/systest/ws/tokens/tls-server.xml | 2 +-
.../cxf/systest/ws/tokens/tls-stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 2 +-
.../apache/cxf/systest/ws/ut/server-derived.xml | 2 +-
.../org/apache/cxf/systest/ws/ut/server.xml | 2 +-
.../cxf/systest/ws/ut/stax-policy-server.xml | 2 +-
.../org/apache/cxf/systest/ws/ut/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssc/server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssc/unit-server.xml | 2 +-
.../org/apache/cxf/systest/ws/wssec10/server.xml | 2 +-
.../cxf/systest/ws/wssec10/server_authorized.xml | 2 +-
.../cxf/systest/ws/wssec10/server_authorized_2.xml | 2 +-
.../cxf/systest/ws/wssec10/server_restricted.xml | 2 +-
.../apache/cxf/systest/ws/wssec10/stax-server.xml | 2 +-
.../systest/ws/wssec10/stax-server_restricted.xml | 2 +-
.../apache/cxf/systest/ws/x509/intermediary.xml | 2 +-
.../org/apache/cxf/systest/ws/x509/server.xml | 2 +-
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/client.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/server.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/stax-server.xml | 2 +-
.../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 2 +-
.../apache/cxf/systest/ws/addressing/cxf-hpux.xml | 2 +-
.../org/apache/cxf/systest/ws/addressing/cxf.xml | 2 +-
.../cxf/systest/ws/addressing/jms_decoupled.xml | 2 +-
.../cxf/systest/ws/policy/addr-anon-client.xml | 2 +-
.../cxf/systest/ws/policy/addr-anon-server.xml | 2 +-
.../systest/ws/policy/addr-inline-policy-old.xml | 2 +-
.../cxf/systest/ws/policy/addr-inline-policy.xml | 2 +-
.../apache/cxf/systest/ws/policy/addr-optional.xml | 2 +-
.../apache/cxf/systest/ws/policy/addr-wsdl11.xml | 2 +-
.../java/org/apache/cxf/systest/ws/policy/addr.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/addr0705.xml | 2 +-
.../ws/policy/http_client_policy_feature.xml | 2 +-
.../java/org/apache/cxf/systest/ws/policy/rm.xml | 2 +-
.../cxf/systest/ws/policy/rm10wsdl_server.xml | 2 +-
.../cxf/systest/ws/policy/rm12wsdl_server.xml | 2 +-
.../org/apache/cxf/systest/ws/policy/rmwsdl.xml | 2 +-
systests/wsdl_maven/codegen/pom.xml | 7 +-
tck/Jenkinsfile | 20 +-
tck/ts.jte.template | 2 +-
testutils/pom.xml | 5 +-
.../wsdl/hello_world_soap_action_rpc.wsdl | 117 +++
.../cxf/tools/common/toolspec/parser/Form.java | 55 +-
.../cxf/tools/validator/WSDLValidationTest.java | 9 +-
tools/wadlto/jaxrs/pom.xml | 4 +-
880 files changed, 11279 insertions(+), 8786 deletions(-)
diff --cc parent/pom.xml
index dae8802,8d96962..bd2f00d
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -128,14 -126,13 +126,14 @@@
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
- <cxf.httpcomponents.client.version>4.5.11</cxf.httpcomponents.client.version>
+ <cxf.httpcomponents.client.version>4.5.12</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.httpcomponents.core.version>4.4.13</cxf.httpcomponents.core.version>
- <cxf.jackson.version>2.10.2</cxf.jackson.version>
- <cxf.jackson.databind.version>2.10.2</cxf.jackson.databind.version>
+ <cxf.jackson.version>2.10.4</cxf.jackson.version>
+ <cxf.jackson.databind.version>2.10.4</cxf.jackson.databind.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.0.0</cxf.jaeger.version>
+ <cxf.jakarta.activation.version>1.2.1</cxf.jakarta.activation.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.javassist.version>3.25.0-GA</cxf.javassist.version>
<cxf.javax.annotation-api.version>1.3.5</cxf.javax.annotation-api.version>
@@@ -177,25 -172,24 +173,25 @@@
<cxf.olingo.version>2.0.11</cxf.olingo.version>
<cxf.openjpa.version>3.1.0</cxf.openjpa.version>
<cxf.opensaml.osgi.version.range>[3.1,4)</cxf.opensaml.osgi.version.range>
- <cxf.opensaml.osgi.version>3.4.3_1</cxf.opensaml.osgi.version>
+ <cxf.opensaml.osgi.version>3.4.5_2</cxf.opensaml.osgi.version>
<cxf.opentracing.version>0.33.0</cxf.opentracing.version>
+ <cxf.persistence-api.version>2.2.3</cxf.persistence-api.version>
<cxf.plexus-archiver.version>4.2.0</cxf.plexus-archiver.version>
<cxf.plexus-utils.version>3.2.0</cxf.plexus-utils.version>
- <cxf.reactivestreams.version>1.0.1</cxf.reactivestreams.version>
- <cxf.reactor.version>3.2.11.RELEASE</cxf.reactor.version>
+ <cxf.reactivestreams.version>1.0.3</cxf.reactivestreams.version>
+ <cxf.reactor.version>3.3.4.RELEASE</cxf.reactor.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
- <cxf.rxjava2.version>2.2.11</cxf.rxjava2.version>
+ <cxf.rxjava2.version>2.2.19</cxf.rxjava2.version>
+ <cxf.rxjava3.version>3.0.2</cxf.rxjava3.version>
+ <cxf.saaj-impl.version>1.5.1</cxf.saaj-impl.version>
- <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
- <cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
- <cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>
- <cxf.servlet-api.group>javax.servlet</cxf.servlet-api.group>
- <cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
- <cxf.slf4j.version>1.7.29</cxf.slf4j.version>
- <cxf.snakeyaml.version>1.25</cxf.snakeyaml.version>
+ <cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>
+ <cxf.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
+ <cxf.servlet-api.version>4.0.3</cxf.servlet-api.version>
+ <cxf.slf4j.version>1.7.30</cxf.slf4j.version>
+ <cxf.snakeyaml.version>1.26</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>2.2.4.RELEASE</cxf.spring.boot.version>
+ <cxf.spring.boot.version>2.2.7.RELEASE</cxf.spring.boot.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
@@@ -249,10 -242,11 +244,10 @@@
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
<cxf.osgi.saaj.version>[1.4,2)</cxf.osgi.saaj.version>
- <cxf.osgi.version>5.0.0</cxf.osgi.version>
- <cxf.pax.exam.version>4.13.1</cxf.pax.exam.version>
+ <cxf.osgi.version>6.0.0</cxf.osgi.version>
+ <cxf.pax.exam.version>4.13.3</cxf.pax.exam.version>
<cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
- <cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
<cxf.servicemix.aspectj.version>1.9.1_1</cxf.servicemix.aspectj.version>
<cxf.servicemix.cglib.version>3.3.0_1</cxf.servicemix.cglib.version>
<cxf.servicemix.javax.el.version>3.0.0_1</cxf.servicemix.javax.el.version>
@@@ -2873,22 -2279,19 +2280,10 @@@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.3.23</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>${cxf.saaj-impl.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb</artifactId>
- <version>${cxf.jacorb.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- This artifact needs to be included in compile scope since the corba module has been removed from jdk 11 -->
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb-omgapi</artifactId>
- <version>${cxf.jacorb.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>