This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 40f5d8d532cfbd973678723783bf48d1a5e29fd9
Merge: 03a6e4f de221ef
Author: Dennis Kieselhorst <d...@apache.org>
AuthorDate: Fri Apr 3 08:32:27 2020 +0200
Merge branch 'master-apache' into CXF-7949_jakarta-servlet
# Conflicts:
# parent/pom.xml
.../org/apache/cxf/endpoint/ClientCallback.java | 79 +++----
.../security/AbstractAuthorizingInInterceptor.java | 20 +-
.../java/org/apache/cxf/message/MessageUtils.java | 15 ++
.../validation/AbstractValidationInterceptor.java | 13 +-
.../apache/cxf/endpoint/ClientCallbackTest.java | 164 +++++++++++++
.../org/apache/cxf/message/MessageUtilsTest.java | 83 +++++++
.../validation/Stax2ValidationUtilsTest.java | 5 -
distribution/manifest/pom.xml | 2 +-
distribution/pom.xml | 2 +-
.../src/main/release/samples/corba/bank/pom.xml | 9 -
.../samples/corba/bank_ws_addressing/pom.xml | 13 +-
.../jax_rs/description_openapi_v3_osgi/README.txt | 2 +-
.../jax_rs/description_swagger2_osgi/README.txt | 2 +-
distribution/src/main/release/samples/pom.xml | 22 +-
.../main/java/demo/throttling/client/Client.java | 1 -
.../main/resources/server-applicationContext.xml | 2 +-
maven-plugins/codegen-plugin/pom.xml | 1 +
.../Cxf7998Service-1.0.0.wsdl | 43 ++++
.../pom.xml | 79 ++++---
.../src/it/jdk-cxf-with-toolchain/pom.xml | 4 +-
.../codegen-plugin/src/it/mark-generated/pom.xml | 58 ++---
.../src/it/wsdl-artifact-resolution/pom.xml | 58 ++---
.../karaf/features/src/main/resources/features.xml | 2 +-
parent/pom.xml | 55 +++--
pom.xml | 2 +-
rt/bindings/corba/pom.xml | 17 ++
.../binding/soap/interceptor/Messages.properties | 1 +
.../binding/soap/interceptor/RPCInInterceptor.java | 5 +
.../cxf/jaxrs/provider/JAXRSDataBinding.java | 16 +-
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 25 +-
.../org/apache/cxf/jaxws/JaxwsClientCallback.java | 22 +-
.../apache/cxf/jaxws/JaxwsClientCallbackTest.java | 162 +++++++++++++
rt/management/pom.xml | 3 +-
.../management/jmx/InstrumentationManagerImpl.java | 52 +----
.../management/jmx/MBServerConnectorFactory.java | 260 ---------------------
.../cxf/management/utils/ManagementConsole.java | 2 +-
.../cxf/management/InstrumentationManagerTest.java | 2 -
.../cxf/management/jmx/BusRegistrationTest.java | 6 -
.../jmx/JMXManagedComponentManagerTest.java | 23 +-
.../jmx/MBServerConnectorFactoryTest.java | 55 -----
.../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 -
.../cxf/jaxrs/client/JaxrsClientCallback.java | 32 ++-
.../cxf/jaxrs/client/JaxrsClientCallbackTest.java | 193 +++++++++++++++
.../microprofile/client/MPRestClientCallback.java | 31 +--
.../client/MPRestClientCallbackTest.java | 161 +++++++++++++
.../cxf/rs/security/jose/jwt/JoseJwtConsumer.java | 2 +-
.../filters/JwsJwksJwtAccessTokenValidator.java | 112 +++++++++
.../oauth2/grants/code/JPACMTCodeDataProvider.java | 20 +-
.../oauth2/grants/code/JPACodeDataProvider.java | 69 +++---
.../oauth2/provider/JPAOAuthDataProvider.java | 214 +++++++----------
.../rs/security/oauth2/services/JwksService.java} | 9 +-
.../JwsJwksJwtAccessTokenValidatorTest.java | 90 +++++++
.../cxf/rs/security/oidc/idp/OidcKeysService.java | 53 +----
.../jaxrs/sse/client/InboundSseEventProcessor.java | 50 +++-
.../interceptor/ClaimsAuthorizingInterceptor.java | 20 +-
.../http_undertow/UndertowHTTPServerEngine.java | 17 ++
.../http/osgi/HttpConduitConfigApplier.java | 10 +-
.../cxf/transport/https/InsecureTrustManager.java | 68 ++++++
.../http/osgi/HttpConduitConfigApplierTest.java | 105 +++++++++
.../org/apache/cxf/ws/rm/managed-manager-bean.xml | 3 -
services/xkms/README.txt | 7 +-
systests/microprofile/client/weld/pom.xml | 10 +-
.../oauth2/filters/OAuth2JwtFiltersTest.java | 11 +
.../oidc/filters/JwsSignatureVerifierProvider.java | 44 ----
.../security/oidc/filters/OIDCFiltersTest.java | 49 ----
.../security/oauth2/filters/filters-serverJwt.xml | 21 +-
.../security/oauth2/filters/oauth20-serverJwt.xml | 5 +-
.../security/oidc/filters/filters-jwks-server.xml | 106 ---------
.../jaxrs/security/oidc/filters/oidc-server.xml | 7 +-
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 28 ++-
.../apache/cxf/systest/jaxrs/sse/BookStore.java | 39 +++-
.../apache/cxf/systest/jaxrs/sse/BookStore2.java | 39 +++-
.../jaxrs/sse/BookStoreClientCloseable.java | 18 +-
systests/spring-boot/pom.xml | 4 +
.../apache/cxf/systest/jaxrs/resources/Book.java | 19 ++
.../jaxrs/spring/boot/SpringSseEmitterTest.java | 132 +++++++++++
.../cxf/systest/jms/action/JMSSoapActionTest.java | 16 +-
.../https/ciphersuites/CipherSuitesTest.java | 39 +---
.../systest/https/clientauth/ClientAuthTest.java | 28 +--
.../cxf/systest/https/trust/TrustManagerTest.java | 56 +++--
.../https/trust/client-trust-manager-ref.xml | 42 ++++
.../cxf/systest/management/ManagedBusTest.java | 4 -
.../cxf/systest/management/counter-spring.xml | 1 -
.../apache/cxf/systest/management/managed-bus.xml | 1 -
.../cxf/systest/management/managed-spring.xml | 1 -
.../cxf/systest/management/persistent-id.xml | 1 -
.../systest/soap/RPCLitSoapActionGreeterImpl.java | 16 +-
.../apache/cxf/systest/soap/SoapActionTest.java | 15 +-
.../apache/cxf/systest/ws/rm/managed-client.xml | 4 +-
.../apache/cxf/systest/ws/rm/managed-server.xml | 3 +-
tck/Jenkinsfile | 2 +-
.../wsdl/hello_world_soap_action_rpc.wsdl | 117 ++++++++++
95 files changed, 2192 insertions(+), 1405 deletions(-)
diff --cc parent/pom.xml
index 4fe5e7b,34ebe0b..0d23919
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -185,10 -185,12 +185,10 @@@
<cxf.reactor.version>3.3.2.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.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.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.29</cxf.slf4j.version>
<cxf.snakeyaml.version>1.25</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
@@@ -204,10 -206,10 +204,10 @@@
<cxf.swagger2.version>1.6.0</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
<cxf.tika.version>1.24</cxf.tika.version>
- <cxf.tomcat.version>8.5.53</cxf.tomcat.version>
+ <cxf.tomcat.version>9.0.33</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
- <cxf.undertow.version>2.0.28.Final</cxf.undertow.version>
+ <cxf.undertow.version>2.0.30.Final</cxf.undertow.version>
<!-- the Export-Package is the same as the Maven artifact
version (with the Final), but we don't want an import package
with a version
with a qualifier. We do want a range. -->
