This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7601_microProfileOpenApi in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d08226c7df7a8dd7297c15558cc71f9ca90bb5d9 Merge: 85c9700 2be435c Author: Dennis Kieselhorst <d...@apache.org> AuthorDate: Sun May 12 20:48:42 2019 +0200 Merge remote-tracking branch 'origin/master' into CXF-7601_microProfileOpenApi # Conflicts: # parent/pom.xml core/pom.xml | 2 +- .../main/java/org/apache/cxf/helpers/DOMUtils.java | 66 +++-- .../java/org/apache/cxf/resource/URIResolver.java | 64 +++-- .../java/org/apache/cxf/staxutils/StaxUtils.java | 8 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/release_notes.txt | 83 +++++-- .../src/main/release/samples/aegis/pom.xml | 21 +- .../main/release/samples/aegis_standalone/pom.xml | 4 +- .../src/main/release/samples/callback/pom.xml | 8 +- .../samples/clustering/failover_jaxws_osgi/pom.xml | 8 +- .../samples/clustering/failover_server/pom.xml | 10 +- .../samples/configuration_interceptor/pom.xml | 8 +- .../src/main/release/samples/corba/bank/pom.xml | 8 +- .../samples/corba/bank_ws_addressing/pom.xml | 8 +- .../main/release/samples/corba/hello_world/pom.xml | 8 +- .../release/samples/groovy_spring_support/pom.xml | 8 +- .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 +- .../main/release/samples/java_first_jms/pom.xml | 6 +- .../main/release/samples/java_first_pojo/pom.xml | 8 +- .../samples/java_first_spring_support/pom.xml | 8 +- .../src/main/release/samples/jax_rs/basic/pom.xml | 8 +- .../release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +- .../main/release/samples/jax_rs/big_query/pom.xml | 14 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../samples/jax_rs/description_openapi_v3/pom.xml | 8 +- .../jax_rs/description_openapi_v3_osgi/pom.xml | 8 +- .../jax_rs/description_openapi_v3_spring/pom.xml | 10 +- .../jax_rs/description_openapi_v3_web/pom.xml | 8 +- .../samples/jax_rs/description_swagger2/pom.xml | 8 +- .../jax_rs/description_swagger2_osgi/pom.xml | 8 +- .../jax_rs/description_swagger2_spring/pom.xml | 10 +- .../jax_rs/description_swagger2_web/pom.xml | 8 +- .../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +- .../src/main/release/samples/jax_rs/spark/pom.xml | 8 +- .../release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../spring_boot_scan/eureka-registry/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 +- .../main/release/samples/jax_rs/sse_cdi/pom.xml | 8 +- .../main/release/samples/jax_rs/sse_client/pom.xml | 8 +- .../main/release/samples/jax_rs/sse_osgi/pom.xml | 8 +- .../main/release/samples/jax_rs/sse_spring/pom.xml | 6 +- .../main/release/samples/jax_rs/sse_tomcat/pom.xml | 6 +- .../release/samples/jax_rs/tracing_brave/pom.xml | 4 +- .../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +- .../samples/jax_rs/tracing_opentracing/pom.xml | 14 +- .../jax_rs/tracing_opentracing_camel/pom.xml | 18 +- .../jax_rs/tracing_opentracing_osgi/pom.xml | 4 +- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_osgi/pom.xml | 2 +- .../release/samples/jax_rs/websocket_web/pom.xml | 8 +- .../samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +- .../samples/jaxws_dispatch_provider/pom.xml | 8 +- .../main/release/samples/jaxws_handlers/pom.xml | 8 +- .../main/release/samples/jaxws_spring_boot/pom.xml | 2 +- .../samples/jaxws_tracing_brave_osgi/pom.xml | 10 +- .../src/main/release/samples/jms_pubsub/pom.xml | 8 +- .../src/main/release/samples/jms_queue/pom.xml | 6 +- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +- .../main/release/samples/jms_spring_config/pom.xml | 6 +- .../samples/js_browser_client_java_first/pom.xml | 10 +- .../samples/js_browser_client_simple/pom.xml | 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml | 8 +- distribution/src/main/release/samples/mtom/pom.xml | 8 +- .../src/main/release/samples/oauth/client/pom.xml | 2 +- .../src/main/release/samples/oauth/server/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml | 8 +- .../src/main/release/samples/soap_header/pom.xml | 8 +- distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/throttling/pom.xml | 2 +- .../src/main/release/samples/ws_addressing/pom.xml | 8 +- .../src/main/release/samples/ws_discovery/pom.xml | 10 +- .../src/main/release/samples/ws_eventing/pom.xml | 2 +- .../main/release/samples/ws_notification/pom.xml | 14 +- .../src/main/release/samples/ws_policy/pom.xml | 8 +- .../src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml | 16 +- .../samples/ws_security/sign_enc_policy/pom.xml | 2 +- .../main/release/samples/ws_security/ut/pom.xml | 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 2 +- .../src/main/release/samples/wsdl_first/pom.xml | 10 +- .../samples/wsdl_first_dynamic_client/pom.xml | 8 +- .../main/release/samples/wsdl_first_https/pom.xml | 2 +- .../release/samples/wsdl_first_pure_xml/pom.xml | 8 +- .../main/release/samples/wsdl_first_rpclit/pom.xml | 8 +- .../main/release/samples/wsdl_first_soap12/pom.xml | 8 +- .../release/samples/wsdl_first_xml_wrapped/pom.xml | 8 +- integration/cdi/pom.xml | 2 +- integration/jca/pom.xml | 2 +- integration/pom.xml | 2 +- integration/spring-boot/autoconfigure/pom.xml | 2 +- integration/spring-boot/pom.xml | 2 +- integration/spring-boot/starter-jaxrs/pom.xml | 2 +- integration/spring-boot/starter-jaxws/pom.xml | 2 +- integration/tracing/tracing-brave/pom.xml | 2 +- integration/tracing/tracing-opentracing/pom.xml | 2 +- maven-plugins/archetypes/cxf-jaxrs-service/pom.xml | 2 +- .../archetypes/cxf-jaxws-javafirst/pom.xml | 4 +- .../archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +- maven-plugins/archetypes/pom.xml | 2 +- maven-plugins/codegen-plugin/pom.xml | 6 +- maven-plugins/corba/pom.xml | 2 +- maven-plugins/java2swagger-plugin/pom.xml | 12 +- maven-plugins/java2wadl-plugin/pom.xml | 12 +- maven-plugins/java2ws-plugin/pom.xml | 4 +- maven-plugins/pom.xml | 2 +- maven-plugins/wadl2java-plugin/pom.xml | 6 +- maven-plugins/wsdl-validator-plugin/pom.xml | 2 +- osgi/bundle/compatible/pom.xml | 2 +- osgi/bundle/pom.xml | 2 +- osgi/itests/pom.xml | 2 +- osgi/karaf/commands/pom.xml | 2 +- osgi/karaf/features/pom.xml | 2 +- osgi/karaf/pom.xml | 2 +- osgi/pom.xml | 2 +- osgi/repository/pom.xml | 2 +- parent/pom.xml | 33 ++- pom.xml | 4 +- rt/bindings/coloc/pom.xml | 2 +- rt/bindings/corba/pom.xml | 2 +- rt/bindings/pom.xml | 2 +- rt/bindings/soap/pom.xml | 2 +- .../soap/interceptor/SoapActionInInterceptor.java | 7 + .../soap/jms/interceptor/SoapJMSInInterceptor.java | 5 + rt/bindings/xml/pom.xml | 2 +- rt/databinding/aegis/pom.xml | 2 +- rt/databinding/jaxb/pom.xml | 2 +- rt/databinding/pom.xml | 2 +- rt/features/clustering/pom.xml | 2 +- rt/features/logging/pom.xml | 2 +- rt/features/metrics/pom.xml | 2 +- rt/features/pom.xml | 2 +- rt/features/throttling/pom.xml | 2 +- rt/frontend/jaxrs/pom.xml | 2 +- .../cxf/jaxrs/impl/ReaderInterceptorMBR.java | 3 + .../apache/cxf/jaxrs/provider/ProviderFactory.java | 45 ++-- .../cxf/jaxrs/impl/ReaderInterceptorMBRTest.java | 18 +- .../cxf/jaxrs/provider/ProviderFactoryTest.java | 86 ++++++- rt/frontend/jaxws/pom.xml | 2 +- rt/frontend/js/pom.xml | 2 +- rt/frontend/pom.xml | 2 +- rt/frontend/simple/pom.xml | 2 +- rt/javascript/javascript-rt/pom.xml | 2 +- rt/javascript/javascript-tests/pom.xml | 2 +- rt/javascript/pom.xml | 2 +- rt/management/pom.xml | 2 +- .../management/counters/ResponseTimeCounter.java | 4 +- rt/pom.xml | 2 +- rt/rs/client/pom.xml | 2 +- .../apache/cxf/jaxrs/client/ClientProperties.java | 6 +- rt/rs/description-common-openapi/pom.xml | 2 +- rt/rs/description-openapi-v3/pom.xml | 2 +- rt/rs/description-swagger-ui/pom.xml | 2 +- rt/rs/description-swagger/pom.xml | 2 +- rt/rs/description/pom.xml | 2 +- rt/rs/extensions/json-basic/pom.xml | 2 +- rt/rs/extensions/providers/pom.xml | 2 +- rt/rs/extensions/reactivestreams/pom.xml | 2 +- rt/rs/extensions/reactor/pom.xml | 2 +- rt/rs/extensions/rx/pom.xml | 2 +- rt/rs/extensions/rx2/pom.xml | 2 +- rt/rs/extensions/search/pom.xml | 2 +- rt/rs/http-sci/pom.xml | 2 +- rt/rs/microprofile-client/pom.xml | 2 +- rt/rs/pom.xml | 2 +- rt/rs/security/cors/pom.xml | 2 +- rt/rs/security/http-signature/pom.xml | 2 +- .../rs/security/httpsignature/MessageVerifier.java | 67 +++++- .../security/httpsignature/SignatureValidator.java | 3 +- .../httpsignature/TomitribeSignatureCreator.java | 2 +- .../httpsignature/TomitribeSignatureValidator.java | 23 +- .../filters/AbstractSignatureInFilter.java | 23 +- .../httpsignature/MessageVerifierTest.java | 120 ++++++++- .../security/httpsignature/SpecExamplesTest.java | 9 +- rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 2 +- .../jose/jaxrs/AbstractJweDecryptingFilter.java | 7 +- .../jaxrs/AbstractJweJsonDecryptingFilter.java | 7 +- .../cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java | 20 +- .../jose/jaxrs/JweClientResponseFilter.java | 8 +- .../jose/jaxrs/JweContainerRequestFilter.java | 7 +- .../jose/jaxrs/JweJsonClientResponseFilter.java | 7 +- .../jose/jaxrs/JweJsonContainerRequestFilter.java | 7 +- .../jose/jaxrs/JwsClientResponseFilter.java | 7 +- .../jose/jaxrs/JwsContainerRequestFilter.java | 7 +- .../jose/jaxrs/JwsJsonClientResponseFilter.java | 7 +- .../jose/jaxrs/JwsJsonContainerRequestFilter.java | 7 +- rt/rs/security/jose-parent/jose/pom.xml | 2 +- .../jose/cookbook/JwsJoseCookBookTest.java | 2 +- rt/rs/security/jose-parent/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2/pom.xml | 2 +- .../filters/AccessTokenIntrospectionClient.java | 5 +- .../oauth2/filters/JwtAccessTokenValidator.java | 5 +- rt/rs/security/oauth-parent/pom.xml | 2 +- rt/rs/security/pom.xml | 2 +- rt/rs/security/sso/oidc/pom.xml | 2 +- rt/rs/security/sso/saml/pom.xml | 2 +- rt/rs/security/xml/pom.xml | 2 +- rt/rs/sse/pom.xml | 2 +- rt/security-saml/pom.xml | 2 +- rt/security/pom.xml | 2 +- rt/transports/http-hc/pom.xml | 2 +- .../http/asyncclient/AsyncHTTPConduit.java | 8 +- rt/transports/http-jetty/pom.xml | 2 +- .../http_jetty/JettyHTTPServerEngine.java | 4 +- rt/transports/http-netty/netty-client/pom.xml | 2 +- rt/transports/http-netty/netty-server/pom.xml | 2 +- .../server/NettyHttpServletPipelineFactory.java | 2 +- rt/transports/http-undertow/pom.xml | 2 +- rt/transports/http/pom.xml | 2 +- rt/transports/jms/pom.xml | 2 +- rt/transports/local/pom.xml | 2 +- rt/transports/pom.xml | 2 +- rt/transports/udp/pom.xml | 2 +- rt/transports/websocket/pom.xml | 2 +- .../websocket/jetty/JettyWebSocketHandler.java | 2 +- rt/ws/addr/pom.xml | 2 +- rt/ws/eventing/pom.xml | 2 +- rt/ws/mex/pom.xml | 2 +- rt/ws/policy/pom.xml | 2 +- rt/ws/pom.xml | 2 +- rt/ws/rm/pom.xml | 2 +- rt/ws/security/pom.xml | 2 +- rt/ws/transfer/pom.xml | 2 +- rt/wsdl/pom.xml | 2 +- services/pom.xml | 2 +- services/sts/pom.xml | 2 +- services/sts/sts-core/pom.xml | 2 +- .../sts/token/provider/SAMLProviderRealmTest.java | 36 +-- services/sts/systests/advanced/pom.xml | 2 +- services/sts/systests/basic/pom.xml | 2 +- services/sts/systests/pom.xml | 2 +- services/sts/systests/sts-features/pom.xml | 2 +- services/sts/systests/sts-itests/pom.xml | 2 +- services/sts/systests/sts-osgi/pom.xml | 2 +- services/ws-discovery/pom.xml | 2 +- services/ws-discovery/ws-discovery-api/pom.xml | 2 +- services/ws-discovery/ws-discovery-service/pom.xml | 2 +- services/wsn/pom.xml | 2 +- services/wsn/wsn-api/pom.xml | 2 +- services/wsn/wsn-core/pom.xml | 2 +- .../cxf/wsn/services/JaxwsEndpointManager.java | 14 +- services/wsn/wsn-osgi/pom.xml | 2 +- services/xkms/pom.xml | 2 +- services/xkms/xkms-client/pom.xml | 2 +- services/xkms/xkms-common/pom.xml | 2 +- services/xkms/xkms-features/pom.xml | 2 +- services/xkms/xkms-itests/pom.xml | 2 +- services/xkms/xkms-osgi/pom.xml | 2 +- services/xkms/xkms-service/pom.xml | 2 +- services/xkms/xkms-war/pom.xml | 2 +- services/xkms/xkms-x509-handlers/pom.xml | 2 +- services/xkms/xkms-x509-repo-ldap/pom.xml | 2 +- systests/cdi/base/pom.xml | 2 +- systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml | 2 +- systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml | 2 +- systests/cdi/cdi-owb/cdi-producers-owb/pom.xml | 2 +- systests/cdi/cdi-owb/pom.xml | 2 +- .../cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml | 2 +- systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml | 2 +- systests/cdi/cdi-weld/cdi-producers-weld/pom.xml | 2 +- systests/cdi/cdi-weld/pom.xml | 2 +- systests/cdi/pom.xml | 2 +- systests/container-integration/grizzly/pom.xml | 2 +- systests/container-integration/pom.xml | 2 +- systests/container-integration/webapp/pom.xml | 2 +- systests/databinding/pom.xml | 2 +- systests/jaxrs/pom.xml | 14 +- .../org/apache/cxf/systest/jaxrs/BookStore.java | 51 +++- .../systest/jaxrs/JAXRSClientServerBookTest.java | 155 +++++++++++- systests/jaxws/pom.xml | 2 +- systests/kerberos/pom.xml | 2 +- systests/ldap/pom.xml | 2 +- systests/microprofile/client/async/pom.xml | 2 +- systests/microprofile/client/jaxrs/pom.xml | 2 +- systests/microprofile/client/tracing/pom.xml | 2 +- systests/microprofile/client/weld/pom.xml | 3 +- systests/microprofile/pom.xml | 2 +- systests/pom.xml | 2 +- systests/rs-http-sci/pom.xml | 2 +- systests/rs-security/pom.xml | 2 +- .../jose/jwejws/BookServerHTTPHeaders.java | 59 +++++ .../security/jose/jwejws/JwsHTTPHeaderTest.java | 268 +++++++++++++++++++++ .../jaxrs/security/httpsignature/server.xml | 2 + .../security/jose/jwejws/http-headers-server.xml | 79 ++++++ systests/rs-sse/pom.xml | 2 +- systests/rs-sse/rs-sse-base/pom.xml | 2 +- systests/rs-sse/rs-sse-jetty/pom.xml | 2 +- systests/rs-sse/rs-sse-tomcat/pom.xml | 2 +- systests/rs-sse/rs-sse-undertow/pom.xml | 2 +- systests/tracing/pom.xml | 2 +- systests/transport-jms/pom.xml | 2 +- .../apache/cxf/systest/jms/TwoWayJMSImplBase.java | 10 +- .../cxf/systest/jms/action/JMSSoapActionTest.java | 137 +++++++++++ .../org/apache/cxf/systest/jms/action/Server.java | 41 ++-- .../SoapActionGreeterImplTwoWayJMS.java} | 13 +- .../jms/security/SecurityGreeterImplTwoWayJMS.java | 2 + .../systest/jms/security/TwoWayJMSImplBase.java | 117 --------- systests/transport-undertow/pom.xml | 2 +- systests/transports-ssl3/pom.xml | 2 +- systests/transports/pom.xml | 2 +- .../https/ciphersuites/CipherSuitesTest.java | 178 ++++++-------- .../systest/https/clientauth/ClientAuthTest.java | 122 ++++++++++ .../HostnameVerificationDeprecatedTest.java | 55 +++-- .../https/hostname/HostnameVerificationTest.java | 77 +++--- .../cxf/systest/https/trust/TrustManagerTest.java | 53 ++++ systests/uncategorized/pom.xml | 2 +- systests/ws-rm/pom.xml | 2 +- systests/ws-security-examples/pom.xml | 2 +- systests/ws-security/pom.xml | 2 +- systests/ws-specs/pom.xml | 2 +- systests/ws-transfer/pom.xml | 2 +- systests/wsdl_maven/codegen/pom.xml | 2 +- systests/wsdl_maven/java2ws/pom.xml | 2 +- systests/wsdl_maven/pom.xml | 2 +- testutils/pom.xml | 2 +- testutils/src/main/resources/wsdl/jms_test.wsdl | 39 +++ tools/common/pom.xml | 2 +- tools/corba/pom.xml | 2 +- tools/javato/pom.xml | 2 +- tools/javato/ws/pom.xml | 2 +- tools/pom.xml | 2 +- tools/validator/pom.xml | 2 +- tools/wadlto/jaxrs/pom.xml | 2 +- tools/wadlto/pom.xml | 2 +- tools/wsdlto/core/pom.xml | 2 +- tools/wsdlto/databinding/jaxb/pom.xml | 2 +- tools/wsdlto/frontend/javascript/pom.xml | 2 +- tools/wsdlto/frontend/jaxws/pom.xml | 2 +- tools/wsdlto/misc/pom.xml | 2 +- tools/wsdlto/pom.xml | 2 +- tools/wsdlto/test/pom.xml | 2 +- 345 files changed, 2328 insertions(+), 1104 deletions(-) diff --cc parent/pom.xml index 5f86b94,c525e08..af5558c --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -1609,6 -1607,6 +1610,12 @@@ <optional>true</optional> </dependency> <dependency> ++ <groupId>org.apache.johnzon</groupId> ++ <artifactId>johnzon-jsonb</artifactId> ++ <version>${cxf.johnzon.version}</version> ++ <optional>true</optional> ++ </dependency> ++ <dependency> <groupId>org.eclipse.microprofile.rest.client</groupId> <artifactId>microprofile-rest-client-api</artifactId> <version>${cxf.microprofile.rest.client.version}</version>