This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch opensaml4 in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0958984b1094ac8101510f74047b73d67bdaed4d Merge: 0edbe1f f7300e4 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Tue Aug 10 14:24:47 2021 +0100 Merge branch 'master' of github.com:apache/cxf into opensaml4 Jenkinsfile | 2 +- SECURITY.md | 14 + core/pom.xml | 4 +- .../cxf/common/spi/NamespaceClassGenerator.java | 5 +- .../endpoint/ListenerRegistrationException.java | 15 +- .../java/org/apache/cxf/endpoint/ServerImpl.java | 16 +- .../main/java/org/apache/cxf/helpers/IOUtils.java | 40 ++- .../cxf/interceptor/AttachmentOutInterceptor.java | 7 +- .../apache/cxf/io/CacheAndWriteOutputStream.java | 15 +- .../cxf/workqueue/AutomaticWorkQueueImpl.java | 9 +- .../org/apache/cxf/configuration/foo/Address.java | 12 +- .../java/org/apache/cxf/configuration/foo/Foo.java | 14 +- .../org/apache/cxf/configuration/foo/Point.java | 8 +- .../cxf/io/CacheAndWriteOutputStreamTest.java | 12 + distribution/javadoc/pom.xml | 19 +- distribution/manifest/pom.xml | 2 +- .../release/samples/jax_rs/graalvm_basic/pom.xml | 1 - .../src/main/release/samples/jaxws_graalvm/pom.xml | 1 - .../src/graalvm/client/reflect-config.json | 4 + .../src/graalvm/client/serialization-config.json | 2 + .../src/graalvm/server/reflect-config.json | 4 + .../src/graalvm/server/serialization-config.json | 2 + .../jaxws_graalvm/native-image.properties | 2 +- .../samples/jaxws_graalvm_dynamic/client/pom.xml | 1 - .../native-image.properties | 2 +- .../reflect-config.json | 4 + .../serialization-config.json | 2 + .../samples/jaxws_graalvm_dynamic/server/pom.xml | 1 - .../native-image.properties | 2 +- .../reflect-config.json | 4 + .../serialization-config.json | 2 + .../src/main/release/samples/js_client/pom.xml | 4 +- distribution/src/main/release/samples/mtom/pom.xml | 4 +- distribution/src/main/release/samples/pom.xml | 13 +- .../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 30 +- .../cxf/cdi/JAXRSCdiResourceExtensionTest.java | 4 +- integration/jca/pom.xml | 16 + .../boot/autoconfigure/CxfAutoConfiguration.java | 4 +- osgi/itests-felix/pom.xml | 9 +- .../cxf/osgi/itests/NoAriesBlueprintTest.java | 17 +- .../apache/cxf/osgi/itests/jaxrs/BookStore.java | 18 +- .../cxf/karaf/commands/ListEndpointsCommand.java | 7 +- .../main/resources/org.apache.karaf.features.xml | 7 +- parent/pom.xml | 119 ++++---- pom.xml | 2 +- rt/bindings/corba/pom.xml | 7 + rt/bindings/soap/pom.xml | 4 +- .../cxf/binding/soap/SoapBindingFactory.java | 3 +- .../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 16 +- .../ext/logging/event/DefaultLogEventMapper.java | 12 +- .../cxf/ext/logging/DefaultLogEventMapperTest.java | 45 +++ rt/frontend/jaxrs/pom.xml | 4 +- .../apache/cxf/jaxrs/JAXRSServerFactoryBean.java | 5 +- .../cxf/jaxrs/impl/EntityTagHeaderProvider.java | 11 +- .../cxf/jaxrs/impl/RetryAfterHeaderProvider.java | 123 ++++++++ .../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 9 + .../apache/cxf/jaxrs/model/ClassResourceInfo.java | 2 +- .../cxf/jaxrs/provider/JAXBElementProvider.java | 24 +- .../apache/cxf/jaxrs/provider/ProviderFactory.java | 44 ++- .../apache/cxf/jaxrs/utils/AnnotationUtils.java | 13 + .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 97 +++++- .../test/java/org/apache/cxf/jaxrs/Customer.java | 6 + .../jaxrs/PriorityCustomerParameterHandler.java | 53 ++++ .../jaxrs/impl/EntityTagHeaderProviderTest.java | 4 +- .../jaxrs/impl/RetryAfterHeaderProviderTest.java | 75 +++++ .../apache/cxf/jaxrs/impl/UriBuilderImplTest.java | 230 ++++++++++++++ .../cxf/jaxrs/provider/CustomJaxbProvider.java | 70 +++++ .../cxf/jaxrs/provider/ProviderFactoryTest.java | 63 ++++ .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 18 ++ rt/frontend/jaxws/pom.xml | 4 +- .../cxf/jaxws/handler/jakartaee/IconType.java | 7 +- .../jaxws/handler/jakartaee/ParamValueType.java | 8 +- .../jakartaee/PortComponentHandlerType.java | 14 +- .../apache/cxf/jaxws/handler/types/IconType.java | 7 +- .../cxf/jaxws/handler/types/ParamValueType.java | 8 +- .../handler/types/PortComponentHandlerType.java | 14 +- .../apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 3 +- rt/frontend/js/pom.xml | 4 +- rt/javascript/javascript-tests/pom.xml | 4 +- .../cxf/jaxrs/client/JAXRSClientFactoryBean.java | 2 +- .../org/apache/cxf/jaxrs/client/WebClient.java | 2 +- .../jaxrs/client/ClientProviderFactoryTest.java | 51 ++++ .../java/org/apache/cxf/jaxrs/client/Customer.java | 21 +- .../cxf/jaxrs/client/CustomerParameterHandler.java | 42 +-- .../client/PriorityCustomerParameterHandler.java | 53 ++++ .../jaxrs/client/cache/CXFCacheControlFeature.java | 163 ++++++++++ .../cxf/jaxrs/client/cache/ClientCacheTest.java | 38 +++ .../cxf/jaxrs/client/logging/RESTLoggingTest.java | 37 ++- .../client/spring/JAXRSClientFactoryBeanTest.java | 16 + .../org/apache/cxf/jaxrs/client/spring/clients.xml | 5 + .../json/basic/JsonMapObjectReaderWriter.java | 70 ++++- .../json/basic/JsonMapObjectReaderWriterTest.java | 74 ++++- .../provider/jsrjsonb/JsrJsonbProviderTest.java | 2 +- rt/rs/microprofile-client/pom.xml | 24 ++ .../client/proxy/MicroProfileClientProxyImpl.java | 16 +- rt/rs/security/http-signature/pom.xml | 6 + .../filters/CreateSignatureInterceptor.java | 12 +- .../filters/VerifySignatureFilter.java | 6 +- .../httpsignature/utils/SignatureHeaderUtils.java | 11 + .../security/httpsignature/SpecExamplesTest.java | 260 +++++++++++++++- .../jose/jws/JwsCompactReaderWriterTest.java | 18 ++ .../jaxrs/sse/client/InboundSseEventProcessor.java | 18 +- .../cxf/jaxrs/sse/client/SseEventSourceImpl.java | 86 +++++- .../cxf/jaxrs/sse/interceptor/SseInterceptor.java | 46 +-- .../jaxrs/sse/client/SseEventSourceImplTest.java | 127 +++++++- .../http/netty/client/NettyHttpConduit.java | 62 +++- .../http_undertow/UndertowHTTPServerEngine.java | 2 +- .../transport/jms/util/MessageListenerTest.java | 4 +- .../cxf/sts/cache/AbstractIdentityCache.java | 2 +- .../apache/cxf/sts/cache/HazelCastTokenStore.java | 2 +- .../org/apache/cxf/sts/claims/ClaimsManager.java | 4 +- .../apache/cxf/sts/claims/LdapClaimsHandler.java | 2 +- .../cxf/sts/claims/LdapGroupClaimsHandler.java | 4 +- .../java/org/apache/cxf/sts/claims/LdapUtils.java | 8 +- .../apache/cxf/sts/event/map/MapEventLogger.java | 52 ++-- .../cxf/sts/operation/TokenIssueOperation.java | 6 +- .../cxf/sts/operation/TokenRenewOperation.java | 6 +- .../cxf/sts/operation/TokenValidateOperation.java | 6 +- .../org/apache/cxf/sts/request/RequestParser.java | 2 +- .../sts/token/provider/DefaultSubjectProvider.java | 4 +- .../cxf/sts/token/provider/SAMLTokenProvider.java | 2 +- .../sts/token/provider/SymmetricKeyHandler.java | 2 +- .../provider/jwt/DefaultJWTClaimsProvider.java | 4 +- .../sts/token/provider/jwt/JWTTokenProvider.java | 5 +- .../cxf/sts/token/renewer/SAMLTokenRenewer.java | 2 +- .../token/validator/UsernameTokenValidator.java | 2 +- .../sts/token/validator/X509TokenValidator.java | 2 +- .../token/validator/jwt/DefaultJWTRoleParser.java | 2 +- .../cxf/sts/common/CustomUserClaimsHandler.java | 4 +- .../apache/cxf/sts/service/StaticServiceTest.java | 4 +- .../sts/token/provider/SAMLProviderRealmTest.java | 1 - .../token/validator/X509TokenValidatorTest.java | 3 +- .../asymmetric_encr/AsymmetricEncryptionTest.java | 48 +-- .../sts/basic_auth/DoubleItPortTypeImpl.java | 7 +- .../systest/sts/basic_auth/JaxrsBasicAuthTest.java | 24 +- .../systest/sts/basic_auth/JaxwsBasicAuthTest.java | 76 ++--- .../apache/cxf/systest/sts/basic_auth/Server.java | 46 --- .../cxf/systest/sts/basic_auth/StaxServer.java | 46 --- .../cxf/systest/sts/batch/SAMLBatchUnitTest.java | 45 +-- .../cxf/systest/sts/batch/StaxSTSServer.java | 50 ---- .../BinarySecurityTokenTest.java | 76 ++--- .../systest/sts/binarysecuritytoken/Server.java | 46 --- .../sts/binarysecuritytoken/StaxServer.java | 46 --- .../cxf/systest/sts/caching/CachingServer.java | 46 --- .../cxf/systest/sts/caching/CachingTest.java | 57 +--- .../systest/sts/caching/DoubleItPortTypeImpl.java | 2 +- .../org/apache/cxf/systest/sts/caching/Server.java | 46 --- .../cxf/systest/sts/caching/ServerCachingTest.java | 59 +--- .../apache/cxf/systest/sts/claims/ClaimsTest.java | 167 +++-------- .../apache/cxf/systest/sts/claims/StaxServer.java | 46 --- .../systest/sts/common/DoubleItPortTypeImpl.java | 2 +- .../cxf/systest/sts/common/SecurityTestUtil.java | 22 ++ .../apache/cxf/systest/sts/common/TestParam.java | 2 +- .../cxf/systest/sts/common/TokenTestUtils.java | 98 ------ .../systest/sts/cross_domain/CrossDomainTest.java | 112 ++----- .../cxf/systest/sts/cross_domain/STSServer.java | 50 ---- .../cxf/systest/sts/cross_domain/STSServer2.java | 50 ---- .../cxf/systest/sts/cross_domain/Server.java | 46 --- .../systest/sts/custom/CustomParameterTest.java | 87 ++---- .../apache/cxf/systest/sts/custom/STSServer.java | 50 ---- .../org/apache/cxf/systest/sts/custom/Server.java | 46 --- .../custom_onbehalfof/CustomOnBehalfOfTest.java | 44 +-- .../systest/sts/custom_onbehalfof/STSServer.java | 50 ---- .../cxf/systest/sts/custom_onbehalfof/Server.java | 46 --- .../defaultstsprovider/DefaultSTSProviderTest.java | 26 +- .../systest/sts/defaultstsprovider/STSServer.java | 50 ---- .../Server.java => deployment/DoubleItServer.java} | 22 +- .../cxf/systest/sts/deployment/STSServer.java | 22 +- .../systest/sts/deployment/StaxDoubleItServer.java | 16 +- .../cxf/systest/sts/deployment/StaxSTSServer.java | 30 +- .../DistributedCachingTest.java | 60 +--- .../systest/sts/distributed_caching/STSServer.java | 50 ---- .../sts/distributed_caching/STSServer2.java | 50 ---- .../systest/sts/distributed_caching/Server.java | 46 --- .../cxf/systest/sts/jwt/DoubleItPortTypeImpl.java | 7 +- .../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 22 +- .../apache/cxf/systest/sts/jwt/JaxrsJWTTest.java | 36 +-- .../systest/sts/kerberos/DoubleItPortTypeImpl.java | 2 +- .../sts/kerberos/IntermediaryPortTypeImpl.java | 2 +- .../kerberos/JAXRSIntermediaryPortTypeImpl.java | 2 +- .../sts/kerberos/KerberosDelegationTokenTest.java | 40 +-- .../apache/cxf/systest/sts/kerberos/Server.java | 46 --- .../cxf/systest/sts/realms/DifferentRealmTest.java | 69 +---- .../apache/cxf/systest/sts/realms/STSServer.java | 50 ---- .../apache/cxf/systest/sts/realms/STSServer2.java | 50 ---- .../org/apache/cxf/systest/sts/realms/Server.java | 46 --- .../cxf/systest/sts/renew/SAMLRenewTest.java | 39 +-- .../cxf/systest/sts/renew/SAMLRenewUnitTest.java | 90 +----- .../apache/cxf/systest/sts/renew/STSServer.java | 50 ---- .../apache/cxf/systest/sts/renew/STSServerPOP.java | 53 ---- .../org/apache/cxf/systest/sts/renew/Server.java | 46 --- .../cxf/systest/sts/renew/StaxSTSServer.java | 50 ---- .../cxf/systest/sts/secure_conv/STSServer.java | 50 ---- .../sts/secure_conv/SecureConversationTest.java | 58 +--- .../SecurityContextTokenCancelTest.java | 26 +- .../secure_conv/SecurityContextTokenUnitTest.java | 74 +---- .../apache/cxf/systest/sts/secure_conv/Server.java | 46 --- .../cxf/systest/sts/secure_conv/StaxSTSServer.java | 50 ---- .../org/apache/cxf/systest/sts/soap12/Server.java | 46 --- .../apache/cxf/systest/sts/soap12/Soap12Test.java | 88 ++---- .../apache/cxf/systest/sts/soap12/StaxServer.java | 46 --- .../sts_sender_vouches/STSSenderVouchesTest.java | 61 ++-- .../systest/sts/sts_sender_vouches/STSServer.java | 50 ---- .../cxf/systest/sts/sts_sender_vouches/Server.java | 46 --- .../sts/sts_sender_vouches/StaxSTSServer.java | 50 ---- .../cxf/systest/sts/transformation/Server.java | 46 --- .../sts/transformation/TransformationTest.java | 45 +-- .../sts/usernametoken/UsernameTokenTest.java | 92 ++---- .../cxf/systest/sts/asymmetric_encr/cxf-client.xml | 32 -- .../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 | 6 +- .../systest/sts/basic_auth/stax-cxf-service.xml | 8 +- .../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 6 +- .../apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 8 +- .../sts/binarysecuritytoken/cxf-service.xml | 2 +- .../sts/binarysecuritytoken/stax-cxf-service.xml | 2 +- .../systest/sts/caching/cxf-caching-service.xml | 8 +- .../apache/cxf/systest/sts/caching/cxf-service.xml | 6 +- .../apache/cxf/systest/sts/claims/cxf-service.xml | 14 +- .../cxf/systest/sts/claims/stax-cxf-service.xml | 16 +- .../cxf/systest/sts/cross_domain/DoubleIt.wsdl | 4 +- .../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 | 4 +- .../cxf/systest/sts/cross_domain/cxf-service.xml | 6 +- .../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 19 +- .../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 20 +- .../apache/cxf/systest/sts/cross_domain/sts-b.wsdl | 4 +- .../apache/cxf/systest/sts/custom/cxf-service.xml | 6 +- .../org/apache/cxf/systest/sts/custom/cxf-sts.xml | 8 +- .../systest/sts/custom_onbehalfof/cxf-client.xml | 2 +- .../systest/sts/custom_onbehalfof/cxf-service.xml | 8 +- .../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 8 +- .../cxf/systest/sts/defaultstsprovider/cxf-sts.xml | 4 +- .../apache/cxf/systest/sts/deployment/cxf-sts.xml | 12 +- .../cxf/systest/sts/deployment/stax-cxf-sts.xml | 10 +- .../systest/sts/distributed_caching/cxf-client.xml | 2 +- .../sts/distributed_caching/cxf-service.xml | 14 +- .../systest/sts/distributed_caching/cxf-sts-1.xml | 8 +- .../systest/sts/distributed_caching/cxf-sts-2.xml | 8 +- .../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 4 +- .../sts/kerberos/cxf-intermediary-client.xml | 1 - .../cxf/systest/sts/kerberos/cxf-intermediary.xml | 5 +- .../cxf/systest/sts/kerberos/cxf-service.xml | 4 +- .../apache/cxf/systest/sts/realms/cxf-client.xml | 8 +- .../apache/cxf/systest/sts/realms/cxf-service.xml | 18 +- .../cxf/systest/sts/realms/cxf-sts-saml1.xml | 8 +- .../cxf/systest/sts/realms/cxf-sts-saml2.xml | 4 +- .../apache/cxf/systest/sts/renew/cxf-client.xml | 10 +- .../apache/cxf/systest/sts/renew/cxf-service.xml | 12 +- .../apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 6 +- .../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 4 +- .../apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 6 +- .../cxf/systest/sts/secure_conv/cxf-service.xml | 14 +- .../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 8 +- .../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 10 +- .../apache/cxf/systest/sts/soap12/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/soap12/cxf-service.xml | 4 +- .../cxf/systest/sts/soap12/stax-cxf-service.xml | 6 +- .../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 | 6 +- .../cxf/systest/sts/usernametoken/cxf-service.xml | 6 +- .../systest/sts/usernametoken/stax-cxf-service.xml | 6 +- .../apache/cxf/ws/discovery/WSDiscoveryClient.java | 3 +- .../org/apache/cxf/wsn/AbstractSubscription.java | 4 +- .../org/apache/cxf/wsn/jms/JmsCreatePullPoint.java | 2 +- .../java/org/apache/cxf/wsn/jms/JmsPullPoint.java | 2 +- .../xkms/crypto/provider/XkmsCryptoProvider.java | 5 +- .../xkms/x509/repo/file/FileCertificateRepo.java | 5 +- .../xkms/x509/repo/ldap/LdapCertificateRepo.java | 3 +- .../systests/cdi/base/AbstractCdiMultiAppTest.java | 30 ++ .../apache/cxf/systests/cdi/base/BookStore.java | 3 + .../systests/cdi/base/CustomScopedBookStore.java | 61 ++++ .../systests/cdi/base/RequestScopedBookStore.java | 61 ++++ .../cxf/systests/cdi/base/bindings/Logged.java} | 22 +- .../systests/cdi/base/bindings/LoggingFilter.java | 26 +- .../cxf/systests/cdi/base/contract/BookStore.java} | 25 +- .../systests/cdi/base/contract/BookStoreImpl.java | 44 +-- .../cxf/systests/cdi/base/scope/CustomContext.java | 55 ++++ .../cdi/base/scope/CustomScopeExtension.java} | 20 +- .../cxf/systests/cdi/base/scope/CustomScoped.java} | 28 +- .../services/javax.enterprise.inject.spi.Extension | 1 + .../systest/jaxrs/BookStoreCustomApplication.java | 8 +- .../systest/jaxrs/BookStoreCustomApplication.java | 11 +- systests/container-integration/grizzly/pom.xml | 4 +- systests/databinding/pom.xml | 4 +- systests/jaxrs/pom.xml | 10 +- .../org/apache/cxf/systest/jaxrs/BookServer.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookStore.java | 11 + .../CXFResource.java => BookStoreRegex.java} | 23 +- .../systest/jaxrs/JAXRS20ClientServerBookTest.java | 61 +++- .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 53 +++- .../systest/jaxrs/JAXRSClientServerBookTest.java | 87 +++--- .../java/org/apache/cxf/systest/jaxrs/XopType.java | 6 +- .../systest/jaxrs/cors/AnnotatedCorsServer.java | 21 +- .../cxf/systest/jaxrs/cors/CorsSecuredBase.java | 19 +- .../systest/jaxrs/cors/UnannotatedCorsServer.java | 11 +- .../jaxrs/provider/CXFJaxbContextResolver.java | 332 +++++++++++++++++++++ .../jaxrs/provider/CXFJaxbElementProvider.java | 70 +++++ .../cxf/systest/jaxrs/provider/CXFResource.java | 6 + ...viderTest.java => JAXBContextResolverTest.java} | 12 +- .../systest/jaxrs/provider/JAXBProviderTest.java | 20 ++ systests/jaxws/pom.xml | 4 +- .../jaxws/DocLitWrappedCodeFirstService.java | 59 ++-- .../cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java | 37 +-- .../cxf/systest/ldap/sts/LDAPClaimsTest.java | 17 +- .../systest/ldap/xkms/LDAPCertificateRepoTest.java | 37 +-- .../microprofile/rest/client/regex/BookStore.java | 5 + .../rest/client/regex/BookStoreClient.java | 7 + ...okStoreClient.java => BookStoreClientRoot.java} | 11 +- .../rest/client/regex/JaxrsPathRegexTest.java | 37 +++ systests/microprofile/client/nocdi/pom.xml | 152 ++++++++++ .../microprofile/rest/client/AsyncMethodTest.java | 240 +++++++++++++++ .../rest/client/AsyncThreadingTest.java | 296 ++++++++++++++++++ .../mock/AsyncClientWithCompletionStage.java | 46 +-- .../AsyncInvocationInterceptorFactoryTestImpl.java | 70 +++++ ...AsyncInvocationInterceptorFactoryTestImpl2.java | 65 ++++ .../rest/client/mock/ThreadLocalClientFilter.java | 48 +++ systests/microprofile/pom.xml | 1 + .../cxf/systest/jaxrs/sse/AbstractSseTest.java | 81 +++++ .../apache/cxf/systest/jaxrs/sse/BookStore.java | 47 ++- .../apache/cxf/systest/jaxrs/sse/BookStore2.java | 29 ++ .../systest/jaxrs/sse/BookStoreResponseFilter.java | 22 +- systests/spring-boot/pom.xml | 6 +- .../spring/boot/SpringJaxrsApplicationTest.java | 35 ++- .../systest/jaxrs/spring/boot/SpringJaxrsTest.java | 29 ++ .../systest/jaxws/spring/boot/SpringJaxwsTest.java | 21 ++ systests/transport-jms/pom.xml | 4 +- .../cxf/systest/jms/shared/JMSSharedQueueTest.java | 30 +- .../cxf/systest/jms/tx/JMSTransactionTest.java | 6 +- systests/transports/pom.xml | 18 ++ .../apache/cxf/systest/http/BadGreeterImpl.java | 62 ++++ .../org/apache/cxf/systest/http/BadServer.java | 41 ++- .../systest/http/HTTPConduitIoExceptionsTest.java | 147 +++++++++ .../https/ciphersuites/CipherSuitesTest.java | 17 +- systests/uncategorized/pom.xml | 23 +- .../cxf/systest/mtom_schema_validation/Hello.java | 9 +- .../mtom_schema_validation/TestProvider.java | 6 +- .../ws/policy/handler/HelloServiceImpl.java | 12 +- tck/Jenkinsfile | 7 +- tck/ts.jte.template | 2 +- testutils/pom.xml | 4 +- .../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 5 +- .../cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 23 ++ .../src/test/resources/wadl/bookstoreDigit.xml | 56 ++++ 348 files changed, 5755 insertions(+), 4193 deletions(-) diff --cc parent/pom.xml index 11a09f3,057726b..49bc874 --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -218,13 -219,13 +219,13 @@@ <cxf.validation.api.version>2.0.2</cxf.validation.api.version> <cxf.velocity.version>2.3</cxf.velocity.version> <cxf.wiremock.version>2.23.2</cxf.wiremock.version> - <cxf.woodstox.core.version>6.2.5</cxf.woodstox.core.version> + <cxf.woodstox.core.version>6.2.6</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> - <cxf.wss4j.version>2.3.2</cxf.wss4j.version> + <cxf.wss4j.version>2.5.0-SNAPSHOT</cxf.wss4j.version> <cxf.xalan.version>2.7.2</cxf.xalan.version> <cxf.xerces.version>2.12.1</cxf.xerces.version> - <cxf.xmlschema.version>2.2.5</cxf.xmlschema.version> + <cxf.xmlschema.version>2.3.0-SNAPSHOT</cxf.xmlschema.version> <cxf.zest.version>2.1</cxf.zest.version> <!-- various OSGi related versions -->
