This is an automated email from the ASF dual-hosted git repository. deki pushed a commit to branch CXF-7910_jakarta_jaxws-api in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 96cdc143498a4935b999616653e4e4ad42f0c0f8 Merge: 4926f24 e72ad77 Author: Dennis Kieselhorst <d...@apache.org> AuthorDate: Tue Jan 7 10:42:38 2020 +0100 Merge remote-tracking branch 'origin/master' into CXF-7910_jakarta_jaxws-api # Conflicts: # parent/pom.xml .../cxf/attachment/AttachmentDeserializer.java | 19 +++--- .../main/java/org/apache/cxf/bus/ManagedBus.java | 9 ++- .../java/org/apache/cxf/bus/spring/SpringBus.java | 2 +- .../cxf/common/injection/ResourceInjector.java | 8 +-- .../org/apache/cxf/common/util/StringUtils.java | 23 ++++--- .../cxf/feature/transform/XSLTOutInterceptor.java | 4 +- .../main/java/org/apache/cxf/helpers/NSDecl.java | 2 +- .../cxf/service/model/BindingOperationInfo.java | 2 +- .../apache/cxf/service/model/MessagePartInfo.java | 2 +- .../apache/cxf/service/model/OperationInfo.java | 2 +- .../apache/cxf/common/util/StringUtilsTest.java | 23 +++++++ .../pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml | 2 +- .../jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../samples/jax_rs/description_swagger2/pom.xml | 2 +- .../jax_rs/description_swagger2_web/pom.xml | 2 +- .../release/samples/jax_rs/minimal_osgi/README.txt | 2 +- .../release/samples/jax_rs/minimal_osgi/pom.xml | 1 - .../release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../spring_boot_scan/eureka-registry/pom.xml | 2 +- distribution/src/main/release/samples/pom.xml | 10 ++- .../apache/cxf/connector/CXFConnectionParam.java | 14 ++-- .../AbstractManagedConnectionImpl.java | 2 +- .../apache/cxf/jca/outbound/CXFConnectionSpec.java | 45 +++---------- .../jca/outbound/ManagedConnectionFactoryImpl.java | 8 +-- .../cxf/maven_plugin/AbstractCodegenMojo.java | 78 +++++++++++++++++++--- osgi/itests/pom.xml | 4 +- parent/pom.xml | 12 ++-- pom.xml | 2 +- .../java/org/apache/cxf/aegis/AegisContext.java | 7 +- .../apache/cxf/aegis/type/AbstractTypeCreator.java | 5 +- .../org/apache/cxf/aegis/type/basic/BeanType.java | 3 +- .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 3 +- .../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 21 +++--- .../model/OperationResourceInfoComparator.java | 78 ++-------------------- ...va => OperationResourceInfoComparatorBase.java} | 55 ++++----------- .../apache/cxf/jaxrs/provider/ProviderFactory.java | 13 ++-- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 3 +- .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 57 +++++++++------- .../test/java/org/apache/cxf/jaxrs/BaseApi.java | 24 +++---- .../java/org/apache/cxf/jaxrs/BaseRequest.java | 25 +++---- .../java/org/apache/cxf/jaxrs/BaseResponse.java | 25 +++---- .../java/org/apache/cxf/jaxrs/CustomerService.java | 26 +++----- .../apache/cxf/jaxrs/CustomerServiceRequest.java | 28 ++++---- .../apache/cxf/jaxrs/CustomerServiceResource.java | 24 ++----- .../apache/cxf/jaxrs/CustomerServiceResponse.java | 20 +----- .../java/org/apache/cxf/jaxrs/CustomizedApi.java | 25 ++++--- .../java/org/apache/cxf/jaxrs/GenericService.java | 21 +----- .../cxf/jaxrs/SelectMethodCandidatesTest.java | 63 +++++++++++++++++ .../org/apache/cxf/jaxrs/client/ClientState.java | 6 +- .../jaxrs/openapi/OpenApiCustomizedResource.java | 13 ++-- .../apache/cxf/jaxrs/openapi/OpenApiFeature.java | 4 +- .../ext/search/AbstractSearchConditionParser.java | 8 +-- .../jaxrs/ext/search/PrimitiveSearchCondition.java | 8 +-- .../visitor/AbstractSearchConditionVisitor.java | 8 +-- .../security/jose/jwe/AbstractJweEncryption.java | 4 +- .../cxf/rs/security/jose/jwe/JweJsonProducer.java | 20 +++++- .../rs/security/jose/jwe/JweJsonProducerTest.java | 5 +- .../cxf/rs/security/oauth2/common/OAuthError.java | 1 - .../rs/security/oauth2/common/OAuthPermission.java | 2 +- .../org/apache/cxf/transport/http/Headers.java | 13 ++-- .../apache/cxf/transport/servlet/CXFServlet.java | 12 ++-- .../apache/cxf/transport/jms/JMSConfiguration.java | 10 ++- .../apache/cxf/transport/jms/uri/JMSEndpoint.java | 31 ++++----- .../org/apache/cxf/transport/jms/util/JMSUtil.java | 6 +- .../apache/cxf/ws/addressing/soap/MAPCodec.java | 21 +++--- .../java/org/apache/cxf/ws/rm/EncoderDecoder.java | 21 +++--- .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 6 +- .../ws/security/tokenstore/TokenStoreUtils.java | 13 ++-- .../policyhandlers/AbstractBindingBuilder.java | 24 +++---- .../xkms/x509/repo/ldap/LdapCertificateRepo.java | 4 +- .../cxf/systests/cdi/base/BookStoreVersioned.java | 2 +- .../systest/jaxrs/JAXRSRequestDispatcherTest.java | 9 ++- .../transform/feature/TransformFeatureTest.java | 31 ++++++++- .../java/org/apache/cxf/tools/util/NameUtil.java | 15 +---- .../internal/SpringServiceBuilderFactory.java | 8 +-- .../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 27 ++------ .../misc/processor/address/AddressFactory.java | 4 +- 79 files changed, 560 insertions(+), 592 deletions(-) diff --cc parent/pom.xml index bdef81c,93e8460..8c139a3 --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -191,8 -191,8 +191,8 @@@ <cxf.servlet-api.version>3.1.0</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>1.2</cxf.specs.jaxws.api.version> + <cxf.specs.jaxws.api.version>2.3_1</cxf.specs.jaxws.api.version> - <cxf.spring.boot.version>2.2.2.RELEASE</cxf.spring.boot.version> + <cxf.spring.boot.version>2.1.11.RELEASE</cxf.spring.boot.version> <cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version> <cxf.spring.mock>spring-test</cxf.spring.mock> <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>