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 1c9258aad04061884076fa817e443f9aad155543
Merge: 009eca5 28dfeaa
Author: Dennis Kieselhorst <d...@apache.org>
AuthorDate: Fri Feb 8 11:35:00 2019 +0100
Merge remote-tracking branch 'origin/master' into
CXF-7601_microProfileOpenApi
.../cxf/common/classloader/ClassLoaderUtils.java | 6 +
.../org/apache/cxf/common/util/PackageUtils.java | 3 +-
.../cxf/common/util/ProxyClassLoaderCache.java | 5 +-
.../org/apache/cxf/common/util/ProxyHelper.java | 3 +-
.../java/org/apache/cxf/helpers/JavaUtils.java | 4 +-
.../java/org/apache/cxf/staxutils/StaxUtils.java | 4 +-
.../apache/cxf/common/util/PackageUtilsTest.java | 2 +
.../jax_rs/description_swagger2_osgi/README.txt | 4 +-
.../samples/jax_rs/websocket_osgi/README.txt | 26 +-
.../src/main/release/samples/sts/README.txt | 16 +-
.../samples/ws_security/sign_enc/README.txt | 16 +-
.../samples/ws_security/sign_enc_policy/README.txt | 16 +-
.../main/release/samples/ws_security/ut/README.txt | 16 +-
.../samples/ws_security/ut_policy/README.txt | 16 +-
parent/pom.xml | 2 +-
.../cxf/jaxrs/model/AbstractResourceInfo.java | 3 +-
.../apache/cxf/jaxrs/swagger/Swagger2Feature.java | 3 +
.../openapi/SwaggerToOpenApiConversionFilter.java | 7 +-
.../cxf/jaxrs/swagger/parse/SwaggerParseUtils.java | 70 +-
.../jaxrs/swagger/parse/SwaggerParseUtilsTest.java | 6 +
.../swagger2petShopWithNullOperations.json | 742 +++++++++++++++++++++
.../microprofile/client/cdi/RestClientBean.java | 20 +-
.../client/proxy/MicroProfileClientProxyImpl.java | 3 +-
.../saml/xacml2/DefaultXACMLRequestBuilder.java | 11 +-
.../JettyHTTPServerEngineFactoryHolder.java | 16 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 16 +-
systests/kerberos/pom.xml | 1 +
.../common/KerberosClientPasswordCallback.java | 35 +-
.../common/KerberosServicePasswordCallback.java | 21 +-
.../kerberos/wssec/kerberos/KerberosTokenTest.java | 55 +-
systests/kerberos/src/test/resources/kerberos.jaas | 8 +
.../kerberos/wssec/kerberos/DoubleItKerberos.wsdl | 3 +
.../cxf/systest/kerberos/wssec/kerberos/client.xml | 14 +
.../cxf/systest/kerberos/wssec/kerberos/server.xml | 20 +
34 files changed, 1053 insertions(+), 140 deletions(-)
