You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2019/08/14 15:20:34 UTC
[cxf] 01/02: Merge branch 'master-apache' into
CXF-7601_microProfileOpenApi
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 bb6a56e4542ca07981a3e931ec9d5ee490348fc2
Merge: e1b8126 e6d432b
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Wed Aug 14 17:17:31 2019 +0200
Merge branch 'master-apache' into CXF-7601_microProfileOpenApi
core/pom.xml | 2 +-
distribution/javadoc/pom.xml | 2 +-
distribution/manifest/pom.xml | 2 +-
distribution/pom.xml | 2 +-
distribution/src/main/release/release_notes.txt | 102 ++++++++++++++-------
.../src/main/release/samples/aegis/pom.xml | 10 +-
.../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 | 2 +-
.../main/release/samples/in_jvm_transport/pom.xml | 10 +-
.../main/release/samples/java_first_jaxws/pom.xml | 2 +-
.../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 | 2 +-
.../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 | 2 +-
.../main/release/samples/jax_rs/big_query/pom.xml | 2 +-
.../samples/jax_rs/content_negotiation/pom.xml | 10 +-
.../samples/jax_rs/description_openapi_v3/pom.xml | 10 +-
.../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 | 10 +-
.../samples/jax_rs/description_swagger2/pom.xml | 10 +-
.../jax_rs/description_swagger2_osgi/pom.xml | 8 +-
.../jax_rs/description_swagger2_spring/pom.xml | 10 +-
.../jax_rs/description_swagger2_web/pom.xml | 10 +-
.../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 | 4 +-
.../jax_rs/spring_boot_scan/application/pom.xml | 4 +-
.../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 | 2 +-
.../main/release/samples/jax_rs/sse_client/pom.xml | 2 +-
.../main/release/samples/jax_rs/sse_osgi/pom.xml | 2 +-
.../main/release/samples/jax_rs/sse_spring/pom.xml | 2 +-
.../main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +-
.../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 | 4 +-
.../main/release/samples/restful_dispatch/pom.xml | 10 +-
.../release/samples/ruby_spring_support/pom.xml | 2 +-
.../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 | 2 +-
.../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 +-
.../java/org/apache/cxf/jca/cxf/JCABusFactory.java | 12 +--
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 +-
.../cxf/tracing/brave/BraveTracerContext.java | 2 +-
integration/tracing/tracing-opentracing/pom.xml | 2 +-
.../tracing/opentracing/OpenTracingContext.java | 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 | 2 +-
.../cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java | 12 +--
maven-plugins/corba/pom.xml | 2 +-
maven-plugins/java2swagger-plugin/pom.xml | 4 +-
.../java2swagger/Java2SwaggerMojo.java | 57 +++++-------
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 35 +++++++
maven-plugins/java2wadl-plugin/pom.xml | 4 +-
maven-plugins/java2ws-plugin/pom.xml | 2 +-
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 35 +++++++
maven-plugins/pom.xml | 2 +-
maven-plugins/wadl2java-plugin/pom.xml | 2 +-
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 +-
.../karaf/features/src/main/resources/features.xml | 4 +-
osgi/karaf/pom.xml | 2 +-
osgi/pom.xml | 2 +-
osgi/repository/pom.xml | 2 +-
parent/pom.xml | 44 ++++-----
pom.xml | 4 +-
rt/bindings/coloc/pom.xml | 2 +-
rt/bindings/corba/pom.xml | 2 +-
.../apache/cxf/binding/corba/utils/CorbaUtils.java | 20 +---
rt/bindings/pom.xml | 2 +-
rt/bindings/soap/pom.xml | 2 +-
rt/bindings/xml/pom.xml | 2 +-
rt/databinding/aegis/pom.xml | 2 +-
.../org/apache/cxf/aegis/type/XMLTypeCreator.java | 27 +++---
.../apache/cxf/aegis/type/mtom/ByteArrayType.java | 27 +-----
rt/databinding/jaxb/pom.xml | 2 +-
rt/databinding/pom.xml | 2 +-
rt/features/clustering/pom.xml | 2 +-
rt/features/logging/pom.xml | 2 +-
.../cxf/ext/logging/LoggingOutInterceptor.java | 2 +-
.../cxf/ext/logging/LoggingOutputStream.java | 74 +++++++++++++++
rt/features/metrics/pom.xml | 2 +-
rt/features/pom.xml | 2 +-
rt/features/throttling/pom.xml | 2 +-
rt/frontend/jaxrs/pom.xml | 2 +-
.../org/apache/cxf/jaxrs/JAXRSBindingFactory.java | 5 +-
.../jaxrs/blueprint/JAXRSBPNamespaceHandler.java | 38 ++++++++
.../JAXRSServerFactoryBeanDefinitionParser.java | 46 +++++++++-
.../cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 6 ++
.../main/resources/META-INF/cxf/bus-extensions.txt | 1 +
rt/frontend/jaxws/pom.xml | 2 +-
.../org/apache/cxf/jaxws/EndpointImplTest.java | 19 +---
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 8 +-
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 +-
.../cxf/management/InstrumentationManagerTest.java | 16 +---
rt/pom.xml | 2 +-
rt/rs/client/pom.xml | 2 +-
.../apache/cxf/jaxrs/client/ClientProxyImpl.java | 3 +-
rt/rs/description-common-openapi/pom.xml | 2 +-
.../jaxrs/common/openapi/SwaggerProperties.java | 24 ++---
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 +-
.../jaxrs/provider/jsrjsonp/JsrJsonpProvider.java | 16 +---
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 +-
.../jaxrs/ext/search/hbase/HBaseVisitorTest.java | 5 +-
.../tika/TikaLuceneContentExtractorTest.java | 7 +-
rt/rs/http-sci/pom.xml | 2 +-
rt/rs/microprofile-client/pom.xml | 8 +-
.../microprofile/client/MPRestClientCallback.java | 86 +++++++----------
.../client/proxy/MicroProfileClientProxyImpl.java | 3 +-
.../apache/cxf/microprofile/client/AsyncTest.java | 56 +++++++++++
.../cxf/microprofile/client/mock/AsyncClient.java | 35 +++++++
rt/rs/pom.xml | 2 +-
rt/rs/security/cors/pom.xml | 2 +-
rt/rs/security/http-signature/pom.xml | 2 +-
rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 2 +-
rt/rs/security/jose-parent/jose/pom.xml | 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 +-
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 +-
rt/transports/http-jetty/pom.xml | 2 +-
rt/transports/http-netty/netty-client/pom.xml | 2 +-
rt/transports/http-netty/netty-server/pom.xml | 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 +-
.../transport/local/LocalTransportFactoryTest.java | 24 +----
rt/transports/pom.xml | 2 +-
rt/transports/udp/pom.xml | 2 +-
rt/transports/websocket/pom.xml | 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 +-
.../apache/cxf/ws/rm/RMCaptureInInterceptor.java | 13 +--
.../cxf/ws/rm/persistence/PersistenceUtils.java | 2 +-
.../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 61 ++++--------
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 2 +-
.../java/org/apache/cxf/ws/rm/RMManagerTest.java | 10 +-
.../ws/rm/persistence/PersistenceUtilsTest.java | 10 +-
rt/ws/security/pom.xml | 2 +-
.../apache/cxf/ws/security/SecurityConstants.java | 17 +++-
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 17 ++--
.../policyhandlers/AbstractBindingBuilder.java | 3 +-
.../ws/security/wss4j/AbstractSecurityTest.java | 17 +---
.../security/wss4j/SignatureConfirmationTest.java | 34 +------
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 56 +----------
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 30 +-----
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 +-
services/sts/systests/advanced/pom.xml | 2 +-
.../systest/sts/cross_domain/CrossDomainTest.java | 14 +--
.../{cxf-client.xml => cxf-client-mex.xml} | 21 -----
.../cxf/systest/sts/cross_domain/cxf-client.xml | 26 ++----
.../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 4 +-
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 +-
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 +-
.../xkms/x509/repo/ldap/LdapCertificateRepo.java | 21 +++--
.../cxf/xkms/x509/repo/ldap/LdapSchemaConfig.java | 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 | 2 +-
...entServerResourceCreatedSpringProviderTest.java | 11 +--
.../cxf/systest/jaxrs/extraction/BookCatalog.java | 20 +---
.../cxf/systest/jaxrs/logging/LoggingServer.java | 55 +++++++++++
.../cxf/systest/jaxrs/logging/LoggingTest.java | 68 ++++++++++++++
.../cxf/systest/jaxrs/nio/NioBookStoreTest.java | 20 +---
.../cxf/systest/jaxrs/reactor/ReactorServer.java | 3 -
systests/jaxws/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
systests/ldap/pom.xml | 2 +-
.../systest/ldap/xkms/LDAPCertificateRepoTest.java | 19 ++++
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 | 2 +-
systests/microprofile/pom.xml | 2 +-
systests/pom.xml | 2 +-
systests/rs-http-sci/pom.xml | 2 +-
systests/rs-security/pom.xml | 2 +-
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 +-
.../cxf/systest/jms/JMSClientServerTest.java | 6 +-
systests/transport-undertow/pom.xml | 2 +-
systests/transports-ssl3/pom.xml | 2 +-
systests/transports/pom.xml | 2 +-
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 +-
tools/common/pom.xml | 2 +-
.../apache/cxf/tools/common/VelocityGenerator.java | 4 +-
tools/corba/pom.xml | 2 +-
.../corba/processors/idl/IDLToWSDLProcessor.java | 12 +--
.../corba/processors/wsdl/WSDLToCorbaBinding.java | 12 +--
.../idlpreprocessor/IdlPreprocessorReaderTest.java | 6 +-
tools/javato/pom.xml | 2 +-
tools/javato/ws/pom.xml | 2 +-
.../tools/java2js/processor/JavaToJSProcessor.java | 34 +++----
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 +-
.../wsdlto/databinding/jaxb/JAXBDataBinding.java | 2 +-
tools/wsdlto/frontend/javascript/pom.xml | 2 +-
.../javascript/WSDLToJavaScriptProcessor.java | 42 ++++-----
tools/wsdlto/frontend/jaxws/pom.xml | 2 +-
.../jaxws/customization/CustomizationParser.java | 2 +-
tools/wsdlto/misc/pom.xml | 2 +-
tools/wsdlto/pom.xml | 2 +-
tools/wsdlto/test/pom.xml | 2 +-
356 files changed, 1336 insertions(+), 1219 deletions(-)