You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/06/21 01:29:14 UTC
[cxf] branch master updated: CXF-8371: Support Jakarta EE 9.1+ (#912)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new cfe9f430ee CXF-8371: Support Jakarta EE 9.1+ (#912)
cfe9f430ee is described below
commit cfe9f430ee617552eb743140cb78cc5df4c4eb83
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jun 20 21:29:07 2022 -0400
CXF-8371: Support Jakarta EE 9.1+ (#912)
CXF-8371: Support Jakarta EE 9.0+
Co-authored-by: Jim Ma <em...@apache.org>
Co-authored-by: Colm O hEigeartaigh <co...@apache.org>
Co-authored-by: Emmanuel Hugonnet <eh...@redhat.com>
---
.github/workflows/codeql-analysis.yml | 5 +
Jenkinsfile | 2 +-
.../cxf/performance/server/BenchmarkImpl.java | 2 +-
.../cxf/performance/server/BenchmarkServer.java | 2 +-
.../cxf/performance/basic_type/client/Client.java | 2 +-
.../cxf/performance/basic_type/server/Server.java | 2 +-
.../performance/basic_type/server/ServerImpl.java | 2 +-
.../performance/complex_type/server/Server.java | 2 +-
.../complex_type/server/ServerImpl.java | 2 +-
.../performance/complex_type/client/Client.java | 3 +-
.../performance/complex_type/server/Server.java | 2 +-
.../complex_type/server/ServerImpl.java | 4 +-
.../src/main/resources/wsdl/perf.wsdl | 2 +-
core/pom.xml | 21 +-
.../cxf/attachment/AttachmentDataSource.java | 3 +-
.../cxf/attachment/AttachmentDeserializer.java | 3 +-
.../org/apache/cxf/attachment/AttachmentImpl.java | 3 +-
.../cxf/attachment/AttachmentSerializer.java | 6 +-
.../org/apache/cxf/attachment/AttachmentUtil.java | 17 +-
.../org/apache/cxf/attachment/ByteDataSource.java | 2 +-
.../cxf/attachment/ImageDataContentHandler.java | 22 +-
.../cxf/attachment/LazyAttachmentCollection.java | 3 +-
.../org/apache/cxf/attachment/LazyDataSource.java | 3 +-
.../apache/cxf/binding/AbstractBindingFactory.java | 2 +-
.../bus/managers/BindingFactoryManagerImpl.java | 3 +-
.../cxf/bus/managers/CXFBusLifeCycleManager.java | 3 +-
.../bus/managers/ConduitInitiatorManagerImpl.java | 5 +-
.../managers/DestinationFactoryManagerImpl.java | 3 +-
.../apache/cxf/bus/managers/HeaderManagerImpl.java | 3 +-
.../cxf/bus/managers/ServerRegistryImpl.java | 5 +-
.../cxf/bus/managers/WorkQueueManagerImpl.java | 2 +-
.../cxf/bus/resource/ResourceManagerImpl.java | 3 +-
.../apache/cxf/catalog/OASISCatalogManager.java | 3 +-
.../cxf/common/injection/ResourceInjector.java | 12 +-
.../apache/cxf/common/jaxb/JAXBContextCache.java | 61 +----
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 115 ++++----
.../apache/cxf/common/jaxb/NamespaceMapper.java | 2 +-
.../common/jaxb/SchemaCollectionContextProxy.java | 12 +-
.../cxf/common/spi/NamespaceClassGenerator.java | 6 +-
.../blueprint/AbstractBPBeanDefinitionParser.java | 8 +-
.../jsse/TLSClientParametersConfig.java | 6 +-
.../spring/AbstractBeanDefinitionParser.java | 8 +-
.../cxf/configuration/spring/JAXBBeanFactory.java | 6 +-
.../cxf/databinding/AbstractDataBinding.java | 2 +-
.../databinding/source/XMLStreamDataReader.java | 4 +-
.../databinding/source/XMLStreamDataWriter.java | 3 +-
.../java/org/apache/cxf/endpoint/ClientImpl.java | 2 +-
.../org/apache/cxf/feature/AbstractFeature.java | 3 +-
.../AbstractFaultChainInitiatorObserver.java | 6 +-
.../security/SecureAnnotationsInterceptor.java | 2 +-
.../java/org/apache/cxf/io/ReaderInputStream.java | 2 +-
.../java/org/apache/cxf/message/Attachment.java | 2 +-
.../main/java/org/apache/cxf/message/Message.java | 15 +-
.../java/org/apache/cxf/message/MessageUtils.java | 2 +-
.../factory/FactoryBeanListenerManager.java | 3 +-
.../transport/AbstractMultiplexDestination.java | 2 +-
.../AbstractBeanValidationInterceptor.java | 3 +-
.../validation/AbstractValidationInterceptor.java | 5 +-
.../cxf/validation/BeanValidationProvider.java | 25 +-
.../ResponseConstraintViolationException.java | 4 +-
.../cxf/validation/ValidationConfiguration.java | 8 +-
.../apache/cxf/ws/addressing/ContextJAXBUtils.java | 5 +-
.../cxf/ws/addressing/EndpointReferenceUtils.java | 8 +-
.../org/apache/cxf/ws/addressing/FaultAction.java | 2 +-
.../apache/cxf/ws/addressing/JAXWSAConstants.java | 6 +-
.../cxf/ws/addressing/VersionTransformer.java | 10 +-
.../schemas/configuration/parameterized-types.xsd | 4 +-
.../resources/schemas/configuration/security.xjb | 4 +-
.../resources/schemas/configuration/security.xsd | 4 +-
.../src/main/resources/schemas/wsdl/addressing.xjb | 4 +-
.../resources/schemas/wsdl/addressing200403.xjb | 4 +-
core/src/main/resources/schemas/wsdl/http.xjb | 4 +-
.../main/resources/schemas/wsdl/ws-addr-wsdl.xjb | 4 +-
core/src/main/resources/schemas/wsdl/wsdl.xjb | 4 +-
.../ibm/xml/mock/marshaller/MockMarshaller.java | 13 +-
.../cxf/attachment/AttachmentDeserializerTest.java | 2 +-
.../cxf/attachment/AttachmentSerializerTest.java | 15 +-
.../apache/cxf/attachment/LazyDataSourceTest.java | 4 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 3 +-
.../cxf/bus/spring/SpringBusFactoryTest.java | 7 +-
.../common/annotation/AnnotatedGreeterImpl.java | 17 +-
.../common/annotation/AnnotationProcessorTest.java | 10 +-
.../cxf/common/injection/ResourceInjectorTest.java | 9 +-
.../org/apache/cxf/common/jaxb/JAXBUtilsTest.java | 16 +-
.../org/apache/cxf/configuration/foo/Address.java | 8 +-
.../java/org/apache/cxf/configuration/foo/Foo.java | 8 +-
.../cxf/configuration/foo/ObjectFactory.java | 7 +-
.../org/apache/cxf/configuration/foo/Point.java | 6 +-
.../apache/cxf/configuration/foo/package-info.java | 4 +-
.../configuration/spring/ConfigurerImplTest.java | 6 +-
.../cxf/staxutils/W3CDOMStreamReaderTest.java | 6 +-
.../transform/OutTransformWriterTest.java | 8 +-
distribution/javadoc/pom.xml | 25 +-
distribution/pom.xml | 10 -
.../antbuild/src/demo/hw_http/client/Client.java | 2 +
.../src/demo/hw_http/server/GreeterImpl.java | 2 +-
.../antbuild/src/demo/hw_http/server/Server.java | 2 +-
.../java/demo/callback/client/CallbackImpl.java | 2 +-
.../src/main/java/demo/callback/client/Client.java | 8 +-
.../src/main/java/demo/callback/server/Server.java | 2 +-
.../main/java/demo/callback/server/ServerImpl.java | 6 +-
.../samples/clustering/failover_server/pom.xml | 2 +-
.../cxf/samples/failover/jaxws/SampleService.java | 2 +-
.../src/main/java/demo/stream/client/Client.java | 1 +
.../main/java/demo/stream/server/GreeterImpl.java | 2 +-
.../src/main/java/demo/stream/server/Server.java | 2 +-
.../bank/src/main/java/cxf/client/Client.java | 3 +-
.../bank/src/main/java/cxf/server/BankImpl.java | 4 +-
.../bank/src/main/java/cxf/server/Server.java | 2 +-
.../src/main/java/cxf/client/Client.java | 2 +-
.../src/main/java/cxf/server/AccountImpl.java | 2 +-
.../src/main/java/cxf/server/BankImpl.java | 8 +-
.../src/main/java/cxf/server/Server.java | 2 +-
.../src/main/java/cxf/server/HelloWorldImpl.java | 2 +-
.../src/main/java/cxf/server/Server.java | 2 +-
.../src/main/java/demo/spring/HelloWorld.java | 2 +-
.../main/java/demo/colocated/client/Client.java | 1 +
.../colocated/client/DispatchSourceClient.java | 12 +-
.../colocated/common/ThrowFaultInterceptor.java | 2 +-
.../java/demo/colocated/server/GreeterImpl.java | 2 +-
.../main/java/demo/colocated/server/Server.java | 2 +-
.../src/main/java/demo/hw/client/Client.java | 5 +-
.../src/main/java/demo/hw/server/HelloWorld.java | 4 +-
.../main/java/demo/hw/server/HelloWorldImpl.java | 2 +-
.../main/java/demo/hw/server/IntegerUserMap.java | 8 +-
.../java/demo/hw/server/IntegerUserMapAdapter.java | 2 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../src/main/java/demo/hw/server/User.java | 2 +-
.../src/main/java/demo/hw/server/UserAdapter.java | 2 +-
.../src/main/java/demo/hw/server/UserImpl.java | 2 +-
.../src/main/java/demo/hw/server/HelloWorld.java | 4 +-
.../main/release/samples/java_first_jms/pom.xml | 6 +-
.../src/main/java/demo/client/ClientJMS.java | 4 +-
.../src/main/java/demo/server/ServerJMS.java | 39 ++-
.../src/main/java/demo/service/HelloWorld.java | 6 +-
.../java/demo/service/impl/HelloWorldImpl.java | 2 +-
.../main/java/demo/spring/service/HelloWorld.java | 2 +-
.../java/demo/spring/service/HelloWorldImpl.java | 2 +-
.../src/main/java/demo/jaxrs/server/Customer.java | 2 +-
.../java/demo/jaxrs/server/CustomerService.java | 16 +-
.../src/main/java/demo/jaxrs/server/Order.java | 8 +-
.../src/main/java/demo/jaxrs/server/Product.java | 2 +-
.../samples/jax_rs/basic_http2_jetty/pom.xml | 6 +-
.../src/main/java/http2demo/common/Customer.java | 2 +-
.../java/http2demo/common/CustomerService.java | 14 +-
.../java/http2demo/server/CustomerServiceImpl.java | 2 +-
.../src/main/java/http2demo/common/Customer.java | 2 +-
.../java/http2demo/common/CustomerService.java | 14 +-
.../java/http2demo/server/CustomerServiceImpl.java | 2 +-
.../src/main/java/http2demo/common/Customer.java | 2 +-
.../java/http2demo/common/CustomerService.java | 14 +-
.../java/http2demo/server/CustomerServiceImpl.java | 2 +-
.../src/main/java/httpsdemo/client/Client.java | 2 +-
.../src/main/java/httpsdemo/common/Customer.java | 2 +-
.../java/httpsdemo/common/CustomerService.java | 14 +-
.../java/httpsdemo/server/CustomerServiceImpl.java | 2 +-
.../java/demo/jaxrs/server/IdTokenService.java | 12 +-
.../java/demo/jaxrs/server/BigQueryServer.java | 2 +-
.../java/demo/jaxrs/server/BigQueryService.java | 14 +-
.../src/main/java/demo/jaxrs/server/Customer.java | 2 +-
.../java/demo/jaxrs/server/CustomerService.java | 6 +-
.../pom.xml | 1 +
.../java/demo/jaxrs/openapi/server/Sample.java | 34 +--
.../samples/jax_rs/description_openapi_v3/pom.xml | 4 +-
.../demo/jaxrs/openapi/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/openapi/server/Sample.java | 34 +--
.../jax_rs/description_openapi_v3_osgi/pom.xml | 8 +-
.../demo/jaxrs/swagger/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 34 +--
.../jax_rs/description_openapi_v3_spring/pom.xml | 4 +-
.../demo/jaxrs/openapi/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/openapi/server/Sample.java | 34 +--
.../java/demo/jaxrs/openapi/server/Sample2.java | 28 +-
.../jax_rs/description_openapi_v3_web/pom.xml | 6 +-
.../demo/jaxrs/openapi/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/openapi/server/Sample.java | 34 +--
.../samples/jax_rs/description_swagger2/pom.xml | 4 +-
.../demo/jaxrs/swagger/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 32 +--
.../jax_rs/description_swagger2_osgi/pom.xml | 8 +-
.../demo/jaxrs/swagger/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 32 +--
.../jax_rs/description_swagger2_spring/pom.xml | 4 +-
.../demo/jaxrs/swagger/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 32 +--
.../jax_rs/description_swagger2_web/pom.xml | 6 +-
.../demo/jaxrs/swagger/server/ApiOriginFilter.java | 8 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 32 +--
.../java/demo/jaxrs/swagger/server/Sample2.java | 32 +--
.../src/main/java/demo/jaxrs/client/Client.java | 8 +-
.../src/main/java/demo/jaxrs/server/Customer.java | 2 +-
.../java/demo/jaxrs/server/CustomerService.java | 16 +-
.../src/main/java/demo/jaxrs/server/Order.java | 8 +-
.../src/main/java/demo/jaxrs/server/Product.java | 2 +-
.../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +-
.../src/main/java/minimalosgi/Activator.java | 2 +-
.../main/java/minimalosgi/SampleApplication.java | 4 +-
.../src/main/java/minimalosgi/SampleResource.java | 8 +-
.../src/main/java/minimalosgi/SampleServlet.java | 6 +-
.../main/java/odata/server/JaxrsODataService.java | 12 +-
.../src/main/release/samples/jax_rs/search/pom.xml | 2 +-
.../java/demo/jaxrs/search/server/Catalog.java | 42 +--
.../main/java/demo/jaxrs/search/server/Server.java | 2 +-
.../java/sample/rs/service/api/HelloService.java | 10 +-
.../rs/service/hello2/HelloServiceImpl2.java | 2 +-
.../main/java/sample/rs/service/HelloService.java | 10 +-
.../rs/service/hello2/HelloServiceImpl2.java | 2 +-
.../rs/client/SampleRestClientApplication.java | 2 +-
.../main/java/sample/rs/service/HelloService.java | 10 +-
.../src/main/java/demo/jaxrs/client/Client.java | 2 +-
.../service/AbstractCustomerServiceSecured.java | 14 +-
.../src/main/java/demo/jaxrs/service/Customer.java | 2 +-
.../java/demo/jaxrs/service/CustomerService.java | 14 +-
.../demo/jaxrs/service/CustomerServiceImpl.java | 4 +-
.../demo/jaxrs/service/CustomerServiceSecured.java | 2 +-
.../jaxrs/service/CustomerServiceSecuredImpl.java | 4 +-
.../src/main/java/demo/jaxrs/service/Order.java | 8 +-
.../src/main/java/demo/jaxrs/service/Product.java | 2 +-
.../jaxrs/service/SecurityExceptionMapper.java | 4 +-
.../main/release/samples/jax_rs/sse_cdi/pom.xml | 10 +-
.../main/java/demo/jaxrs/sse/StatsApplication.java | 4 +-
.../java/demo/jaxrs/sse/StatsRestServiceImpl.java | 20 +-
.../main/release/samples/jax_rs/sse_client/pom.xml | 6 +-
.../src/main/java/demo/jaxrs/sse/StatsClient.java | 10 +-
.../java/demo/jaxrs/sse/StatsRestServiceImpl.java | 18 +-
.../main/release/samples/jax_rs/sse_osgi/pom.xml | 14 +-
.../demo/jaxrs/server/StatsRestServiceImpl.java | 28 +-
.../main/release/samples/jax_rs/sse_spring/pom.xml | 10 +-
.../main/java/demo/jaxrs/sse/StatsApplication.java | 4 +-
.../src/main/java/demo/jaxrs/sse/StatsConfig.java | 4 +-
.../java/demo/jaxrs/sse/StatsRestServiceImpl.java | 20 +-
.../main/release/samples/jax_rs/sse_tomcat/pom.xml | 4 +-
.../java/demo/jaxrs/sse/StatsRestServiceImpl.java | 20 +-
.../release/samples/jax_rs/tracing_brave/pom.xml | 2 +-
.../java/demo/jaxrs/tracing/client/Client.java | 4 +-
.../java/demo/jaxrs/tracing/server/Catalog.java | 34 +--
.../jaxrs/tracing/server/CatalogApplication.java | 4 +-
.../demo/jaxrs/tracing/server/CatalogStore.java | 8 +-
.../java/demo/jaxrs/tracing/server/Server.java | 2 +-
.../samples/jax_rs/tracing_brave_osgi/pom.xml | 9 +-
.../java/demo/jaxrs/tracing/server/Catalog.java | 32 +--
.../demo/jaxrs/tracing/server/CatalogStore.java | 8 +-
... => jakarta.json.spi.JsonProvider.JsonProvider} | 0
.../samples/jax_rs/tracing_opentracing/pom.xml | 2 +-
.../java/demo/jaxrs/tracing/client/Client.java | 4 +-
.../java/demo/jaxrs/tracing/server/Catalog.java | 34 +--
.../jaxrs/tracing/server/CatalogApplication.java | 4 +-
.../demo/jaxrs/tracing/server/CatalogStore.java | 8 +-
.../java/demo/jaxrs/tracing/server/Server.java | 2 +-
.../jax_rs/tracing_opentracing_camel/pom.xml | 4 +-
.../java/demo/jaxrs/tracing/client/Client.java | 8 +-
.../demo/jaxrs/tracing/server/cxf/Catalog.java | 10 +-
.../jax_rs/tracing_opentracing_osgi/pom.xml | 9 +-
.../java/demo/jaxrs/tracing/server/Catalog.java | 32 +--
.../demo/jaxrs/tracing/server/CatalogStore.java | 8 +-
....JsonProvider => jakarta.json.spi.JsonProvider} | 0
.../main/release/samples/jax_rs/websocket/pom.xml | 35 +--
.../src/main/java/demo/jaxrs/server/Customer.java | 2 +-
.../java/demo/jaxrs/server/CustomerService.java | 26 +-
.../src/main/java/demo/jaxrs/server/Order.java | 8 +-
.../src/main/java/demo/jaxrs/server/Product.java | 2 +-
.../release/samples/jax_rs/websocket_osgi/pom.xml | 10 +-
.../src/main/java/demo/jaxrs/server/Customer.java | 2 +-
.../java/demo/jaxrs/server/CustomerService.java | 26 +-
.../src/main/java/demo/jaxrs/server/Order.java | 8 +-
.../src/main/java/demo/jaxrs/server/Product.java | 2 +-
.../release/samples/jax_rs/websocket_web/pom.xml | 2 +-
.../src/main/java/demo/jaxrs/server/Customer.java | 2 +-
.../java/demo/jaxrs/server/CustomerService.java | 26 +-
.../src/main/java/demo/jaxrs/server/Order.java | 8 +-
.../src/main/java/demo/jaxrs/server/Product.java | 2 +-
.../src/main/java/demo/hw/server/HelloWorld.java | 4 +-
.../src/main/java/demo/hw/client/Client.java | 3 +-
.../main/java/demo/hw/client/TestAsyncHandler.java | 4 +-
.../src/main/java/demo/hw/server/GreeterImpl.java | 6 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../samples/jaxws_async/wsdl/async_binding.xml | 2 +-
.../main/java/demo/hwDispatch/client/Client.java | 9 +-
.../server/GreeterDOMSourceMessageProvider.java | 13 +-
.../server/GreeterDOMSourcePayloadProvider.java | 9 +-
.../server/GreeterSoapMessageProvider.java | 12 +-
.../main/java/demo/hwDispatch/server/Server.java | 2 +-
.../java/demo/jaxws/server/AddNumbersImpl.java | 2 +-
.../src/main/java/demo/jaxws/server/Server.java | 2 +-
.../main/java/org/apache/handlers/AddNumbers.java | 12 +-
.../java/org/apache/handlers/AddNumbersFault.java | 2 +-
.../org/apache/handlers/types/FaultDetail.java | 8 +-
.../org/apache/handlers/types/package-info.java | 2 +-
.../java/demo/jaxws/server/AddNumbersImpl.java | 2 +-
.../src/main/java/demo/jaxws/server/Server.java | 2 +-
.../src/main/java/demo/handlers/client/Client.java | 4 +-
.../java/demo/handlers/common/LoggingHandler.java | 9 +-
.../demo/handlers/common/SmallNumberHandler.java | 21 +-
.../java/demo/handlers/server/AddNumbersImpl.java | 4 +-
.../src/main/java/demo/handlers/server/Server.java | 2 +-
.../java/sample/ws/SampleWsApplicationClient.java | 7 +-
.../src/main/java/sample/ws/WebServiceConfig.java | 2 +-
.../src/main/java/sample/ws/service/Hello.java | 12 +-
.../main/java/sample/ws/service/HelloPortImpl.java | 2 +-
.../samples/jaxws_tracing_brave_osgi/pom.xml | 8 +-
.../java/demo/jaxws/tracing/client/Client.java | 3 +-
.../demo/jaxws/tracing/server/CatalogService.java | 2 +-
.../main/java/demo/jms_greeter/client/Client.java | 2 +
.../demo/jms_greeter/server/GreeterJMSImpl.java | 2 +-
.../main/java/demo/jms_greeter/server/Server.java | 2 +-
.../src/main/release/samples/jms_queue/pom.xml | 6 +-
.../demo/jms_greeter/broker/EmbeddedBroker.java | 20 +-
.../main/java/demo/jms_greeter/client/Client.java | 2 +-
.../demo/jms_greeter/server/GreeterJMSImpl.java | 2 +-
.../main/java/demo/jms_greeter/server/Server.java | 4 +-
.../src/main/release/samples/jms_spec_demo/pom.xml | 6 +-
.../demo/jms_greeter/broker/EmbeddedBroker.java | 19 +-
.../main/java/demo/jms_greeter/client/Client.java | 1 +
.../demo/jms_greeter/server/GreeterJMSImpl.java | 2 +-
.../main/java/demo/jms_greeter/server/Server.java | 2 +-
.../main/release/samples/jms_spring_config/pom.xml | 6 +-
.../jms_spring_config/src/main/config/binding.xml | 2 +-
.../server/CustomerServiceImpl.java | 4 +-
.../main/resources/client-applicationContext.xml | 13 +-
.../main/resources/server-applicationContext.xml | 13 +-
.../java/demo/hw/server/JavascriptExample.java | 8 +-
.../java/demo/hw/server/JavascriptExampleImpl.java | 2 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../java/demo/hw/server/data/package-info.java | 2 +-
.../src/main/java/demo/hw/server/package-info.java | 2 +-
.../src/main/java/demo/hw/client/Client.java | 4 +-
.../src/main/java/demo/hw/server/GreeterImpl.java | 2 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../src/main/java/demo/hw/server/GreeterImpl.java | 2 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../main/java/demo/hwDispatch/client/Client.java | 8 +-
distribution/src/main/release/samples/mtom/pom.xml | 8 +-
.../src/main/java/demo/mtom/client/Client.java | 11 +-
.../src/main/java/demo/mtom/server/Server.java | 6 +-
.../demo/mtom/server/TestMtomPortTypeImpl.java | 8 +-
distribution/src/main/release/samples/pom.xml | 68 +++--
.../src/main/java/demo/restful/client/Client.java | 9 +-
.../restful/server/RestSourcePayloadProvider.java | 15 +-
.../src/main/java/demo/restful/server/Server.java | 4 +-
.../main/java/demo/spring/service/HelloWorld.java | 2 +-
.../main/java/demo/soap_header/client/Client.java | 3 +-
.../demo/soap_header/server/HeaderTesterImpl.java | 4 +-
.../main/java/demo/soap_header/server/Server.java | 2 +-
.../src/main/java/demo/wssec/client/Client.java | 3 +-
.../demo/wssec/client/ClientCallbackHandler.java | 2 +
.../main/java/demo/wssec/server/GreeterImpl.java | 2 +-
.../demo/wssec/server/ServerCallbackHandler.java | 2 +
.../java/demo/wssec/sts/STSCallbackHandler.java | 2 +
.../src/main/release/samples/throttling/pom.xml | 2 +-
.../main/java/demo/throttling/client/Client.java | 4 +-
.../java/demo/throttling/server/GreeterImpl.java | 2 +-
.../main/java/demo/throttling/server/Server.java | 2 +-
.../java/demo/ws_addressing/client/Client.java | 3 +-
.../demo/ws_addressing/server/GreeterImpl.java | 2 +-
.../java/demo/ws_addressing/server/Server.java | 2 +-
.../org/apache/cxf/samples/discovery/Client.java | 2 +-
.../apache/cxf/samples/discovery/GreeterImpl.java | 2 +-
.../org/apache/cxf/samples/discovery/Main.java | 2 +-
.../demo/wseventing/CreateSubscriptionServlet.java | 17 +-
.../demo/wseventing/EarthquakeEventServlet.java | 10 +-
.../java/demo/wseventing/FireEventServlet.java | 10 +-
.../demo/wseventing/NotificatorServiceHolder.java | 6 +-
.../wseventing/eventapi/CatastrophicEventSink.java | 12 +-
.../demo/wseventing/services/TestEventSource.java | 6 +-
.../services/TestSubscriptionManager.java | 2 +-
.../src/main/java/demo/client/Client.java | 2 +-
.../java/demo/ws_policy/server/GreeterImpl.java | 2 +-
.../main/java/demo/ws_policy/server/Server.java | 2 +-
.../main/java/demo/ws_rm/server/GreeterImpl.java | 2 +-
.../src/main/java/demo/ws_rm/server/Server.java | 2 +-
.../main/java/demo/wssec/server/GreeterImpl.java | 2 +-
.../src/main/java/demo/wssec/server/Server.java | 2 +-
.../main/java/demo/wssec/server/StaxServer.java | 2 +-
.../src/main/java/demo/wssec/client/Client.java | 2 +
.../main/java/demo/wssec/server/GreeterImpl.java | 2 +-
.../main/java/demo/wssec/server/GreeterImpl.java | 2 +-
.../ut/src/main/java/demo/wssec/server/Server.java | 2 +-
.../main/java/demo/wssec/server/StaxServer.java | 2 +-
.../src/main/java/demo/wssec/client/Client.java | 2 +
.../main/java/demo/wssec/server/GreeterImpl.java | 2 +-
.../release/samples/ws_transaction/client/pom.xml | 20 +-
.../java/sample/ws/service/BridgeFromJTATest.java | 2 +-
.../test/java/sample/ws/service/FirstClient.java | 7 +-
.../test/java/sample/ws/service/SecondClient.java | 16 +-
.../java/sample/ws/service/WebServiceConfig.java | 2 +-
.../main/release/samples/ws_transaction/pom.xml | 1 -
.../samples/ws_transaction/ws_first/pom.xml | 11 +-
.../src/main/java/sample/ws/WebServiceConfig.java | 2 +-
.../main/java/sample/ws/service/FirstCounter.java | 6 +-
.../java/sample/ws/service/FirstServiceAT.java | 6 +-
.../java/sample/ws/service/FirstServiceATImpl.java | 10 +-
.../samples/ws_transaction/ws_second/pom.xml | 11 +-
.../src/main/java/sample/ws/WebServiceConfig.java | 2 +-
.../main/java/sample/ws/service/SecondCounter.java | 6 +-
.../java/sample/ws/service/SecondServiceAT.java | 6 +-
.../sample/ws/service/SecondServiceATImpl.java | 10 +-
.../server/CustomerServiceImpl.java | 4 +-
.../server/CustomerServiceServer.java | 2 +-
.../wsdl_first/src/main/resources/binding.xml | 2 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../org/apache/cxf/demo/complex/ComplexImpl.java | 2 +-
.../src/main/java/demo/hw_https/client/Client.java | 2 +
.../java/demo/hw_https/server/GreeterImpl.java | 2 +-
.../src/main/java/demo/hw_https/server/Server.java | 2 +-
.../src/main/java/demo/hw/client/Client.java | 1 +
.../src/main/java/demo/hw/server/GreeterImpl.java | 4 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
.../src/main/java/demo/hwRPCLit/client/Client.java | 1 +
.../demo/hwRPCLit/server/GreeterRPCLitImpl.java | 2 +-
.../src/main/java/demo/hwRPCLit/server/Server.java | 2 +-
.../src/main/java/demo/hw/client/Client.java | 4 +-
.../src/main/java/demo/hw/server/GreeterImpl.java | 4 +-
.../src/main/java/demo/hw/client/Client.java | 1 +
.../src/main/java/demo/hw/server/GreeterImpl.java | 4 +-
.../src/main/java/demo/hw/server/Server.java | 2 +-
integration/cdi/pom.xml | 6 +-
.../java/org/apache/cxf/cdi/AbstractCXFBean.java | 14 +-
.../java/org/apache/cxf/cdi/CXFCdiServlet.java | 11 +-
.../main/java/org/apache/cxf/cdi/CdiBusBean.java | 7 +-
.../cxf/cdi/CdiServerConfigurableFactory.java | 13 +-
.../org/apache/cxf/cdi/ContextProducerBean.java | 7 +-
.../java/org/apache/cxf/cdi/ContextResolved.java | 11 +-
.../org/apache/cxf/cdi/DefaultApplication.java | 6 +-
.../org/apache/cxf/cdi/DefaultApplicationBean.java | 6 +-
.../cxf/cdi/DelegateContextAnnotatedType.java | 14 +-
.../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 59 ++--
.../main/java/org/apache/cxf/cdi/Lifecycle.java | 6 +-
.../cxf/cdi/event/DisposableCreationalContext.java | 2 +-
.../cdi/src/main/resources/META-INF/beans.xml | 8 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../apache/cxf/cdi/CdiResourceProviderTest.java | 13 +-
.../cxf/cdi/JAXRSCdiResourceExtensionTest.java | 13 +-
integration/jca/pom.xml | 8 +-
.../apache/cxf/connector/CXFConnectionFactory.java | 2 +-
.../java/org/apache/cxf/connector/Connection.java | 2 +-
.../jca/core/classloader/FireWallClassLoader.java | 4 +-
.../AbstractManagedConnectionFactoryImpl.java | 12 +-
.../AbstractManagedConnectionImpl.java | 16 +-
.../ResourceAdapterInternalException.java | 2 +-
.../cxf/jca/core/resourceadapter/ResourceBean.java | 3 +-
.../AssociatedManagedConnectionFactoryImpl.java | 10 +-
.../cxf/jca/cxf/CXFConnectionRequestInfo.java | 2 +-
.../apache/cxf/jca/cxf/CXFLocalTransaction.java | 2 +-
.../apache/cxf/jca/cxf/CXFManagedConnection.java | 4 +-
.../cxf/jca/cxf/CXFManagedConnectionFactory.java | 2 +-
.../cxf/jca/cxf/CXFManagedConnectionMetaData.java | 4 +-
.../org/apache/cxf/jca/cxf/CXFTransaction.java | 2 +-
.../org/apache/cxf/jca/cxf/CXFWorkAdapter.java | 5 +-
.../apache/cxf/jca/cxf/ConnectionFactoryImpl.java | 10 +-
.../java/org/apache/cxf/jca/cxf/JCABusFactory.java | 9 +-
.../cxf/jca/cxf/ManagedConnectionFactoryImpl.java | 10 +-
.../apache/cxf/jca/cxf/ManagedConnectionImpl.java | 16 +-
.../apache/cxf/jca/cxf/ResourceAdapterImpl.java | 16 +-
.../apache/cxf/jca/cxf/WorkManagerThreadPool.java | 9 +-
.../cxf/handlers/InvokingInvocationHandler.java | 3 +-
.../cxf/jca/inbound/DispatchMDBActivationSpec.java | 2 +-
.../apache/cxf/jca/inbound/DispatchMDBInvoker.java | 5 +-
.../inbound/DispatchMDBMessageListenerImpl.java | 5 +-
.../apache/cxf/jca/inbound/MDBActivationSpec.java | 10 +-
.../apache/cxf/jca/inbound/MDBActivationWork.java | 8 +-
.../org/apache/cxf/jca/inbound/MDBInvoker.java | 7 +-
.../cxf/jca/outbound/CXFConnectionFactory.java | 4 +-
.../apache/cxf/jca/outbound/CXFConnectionSpec.java | 2 +-
.../jca/outbound/CXFManagedConnectionMetaData.java | 4 +-
.../cxf/jca/outbound/ConnectionFactoryImpl.java | 7 +-
.../cxf/jca/outbound/DefaultConnectionManager.java | 15 +-
.../jca/outbound/ManagedConnectionFactoryImpl.java | 16 +-
.../cxf/jca/outbound/ManagedConnectionImpl.java | 18 +-
.../org/apache/cxf/jca/servant/EJBEndpoint.java | 6 +-
.../org/apache/cxf/jca/servant/EJBInvoker.java | 3 +-
.../core/classloader/PlugInClassLoaderTest.java | 2 +-
.../DummyManagedConnectionImpl.java | 6 +-
.../ManagedConnectionFactoryImplTest.java | 14 +-
.../resourceadapter/ManagedConnectionImplTest.java | 6 +-
.../ResourceAdapterInternalExceptionTest.java | 8 +-
...AssociatedManagedConnectionFactoryImplTest.java | 5 +-
.../cxf/jca/cxf/ConnectionFactoryImplTest.java | 9 +-
.../org/apache/cxf/jca/cxf/HelloInterface.java | 4 +-
.../test/java/org/apache/cxf/jca/cxf/Imple.java | 2 +-
.../org/apache/cxf/jca/cxf/JCABusFactoryTest.java | 3 +-
.../jca/cxf/ManagedConnectionFactoryImplTest.java | 7 +-
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 11 +-
.../cxf/jca/cxf/ManagedConnectionTestBase.java | 4 +-
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 8 +-
.../cxf/handlers/InvocationHandlerFactoryTest.java | 3 +-
.../cxf/jca/servant/ThreadContextCheckerHome.java | 10 +-
.../spring/boot/autoconfigure/CxfProperties.java | 5 +-
.../boot/autoconfigure/CxfPropertiesTest.java | 3 +-
.../cxf/spring/boot/jaxrs/SampleJaxRSResource.java | 4 +-
integration/spring-boot/starter-jaxrs/pom.xml | 8 +-
integration/spring-boot/starter-jaxws/pom.xml | 8 +-
.../tracing/brave/jaxrs/BraveClientProvider.java | 11 +-
.../cxf/tracing/brave/jaxrs/BraveFeature.java | 7 +-
.../cxf/tracing/brave/jaxrs/BraveProvider.java | 17 +-
.../org/apache/cxf/tracing/brave/MyService.java | 2 +-
.../jaxrs/OpenTracingClientProvider.java | 11 +-
.../opentracing/jaxrs/OpenTracingFeature.java | 6 +-
.../opentracing/jaxrs/OpenTracingProvider.java | 17 +-
.../src/main/java/HelloWorld.java | 14 +-
.../src/test/java/HelloWorldIT.java | 2 +-
.../src/main/java/HelloWorld.java | 2 +-
.../src/main/java/HelloWorldImpl.java | 2 +-
.../src/main/java/HelloWorldPortTypeImpl.java | 2 +-
.../src/it/jaxb-xjc-runtime-sources/pom.xml | 8 +-
.../src/it/jdk-cxf-with-toolchain/pom.xml | 8 +-
.../codegen-plugin/src/it/mark-generated/pom.xml | 8 +-
.../src/it/mark-generated/verify.groovy | 2 +-
.../src/it/wsdl-artifact-resolution/pom.xml | 8 +-
.../cxf/maven_plugin/AbstractCodegenMojo.java | 2 +-
.../cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 3 +-
.../javatowadl/ResourceMapJavaDocProvider.java | 3 +-
.../org/apache/cxf/maven_plugin/Java2WSMojo.java | 2 -
maven-plugins/pom.xml | 14 +-
.../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 1 -
osgi/bundle/compatible/pom.xml | 24 +-
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 4 +-
.../apache/cxf/osgi/itests/OSGiTestSupport.java | 3 +-
osgi/itests/pom.xml | 8 +-
.../cxf/osgi/itests/AbstractServerActivator.java | 2 +-
.../apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 3 +-
.../org/apache/cxf/osgi/itests/jaxrs/Book.java | 6 +-
.../apache/cxf/osgi/itests/jaxrs/BookStore.java | 39 ++-
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 11 +-
.../org/apache/cxf/osgi/itests/soap/Greeter.java | 2 +-
.../cxf/osgi/itests/soap/JmsServiceTest.java | 7 +-
.../cxf/osgi/itests/soap/JmsTestActivator.java | 7 +-
.../cxf/karaf/commands/ListEndpointsCommand.java | 2 +-
osgi/karaf/features/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 4 +-
parent/pom.xml | 298 ++++++++++++---------
pom.xml | 43 ++-
rt/bindings/coloc/pom.xml | 2 +-
.../cxf/binding/coloc/WebFaultInInterceptor.java | 2 +-
rt/bindings/corba/pom.xml | 6 +-
.../cxf/binding/corba/CorbaBindingException.java | 2 +-
.../CorbaStreamFaultOutInterceptor.java | 4 +-
.../cxf/binding/corba/runtime/OrbConfigurer.java | 5 +-
.../corba/types/CorbaOctetSequenceHandler.java | 2 +-
.../corba/utils/CorbaObjectReferenceHelper.java | 2 +-
.../binding/corba/wsdl/WSDLExtensionRegister.java | 3 +-
.../main/resources/schemas/wsdl/corba-binding.xjb | 4 +-
.../main/resources/schemas/wsdl/corba-binding.xsd | 4 +-
rt/bindings/soap/pom.xml | 17 +-
.../apache/cxf/binding/soap/SOAPBindingUtil.java | 12 +-
.../binding/soap/jms/interceptor/JMSFaultType.java | 7 +-
.../cxf/binding/soap/saaj/SAAJFactoryResolver.java | 8 +-
.../cxf/binding/soap/saaj/SAAJInInterceptor.java | 18 +-
.../cxf/binding/soap/saaj/SAAJOutInterceptor.java | 13 +-
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 14 +-
.../apache/cxf/binding/soap/saaj/SAAJUtils.java | 14 +-
.../soap/MustUnderstandInterceptorTest.java | 4 +-
.../apache/cxf/binding/soap/MyComplexStruct.java | 8 +-
.../binding/soap/ReadHeaderInterceptorTest.java | 4 +-
.../cxf/binding/soap/ServiceModelUtilTest.java | 1 -
.../java/org/apache/cxf/binding/soap/TestUtil.java | 5 +-
.../java/org/apache/cxf/binding/soap/XopType.java | 12 +-
.../soap/interceptor/SoapFaultSerializerTest.java | 4 +-
.../cxf/binding/soap/saaj/ParseBodyTest.java | 8 +-
.../binding/soap/saaj/SAAJInInterceptorTest.java | 10 +-
.../binding/soap/saaj/SAAJOutInterceptorTest.java | 2 +-
rt/bindings/xml/pom.xml | 2 +-
.../binding/xml/wsdl11/XMLWSDLExtensionLoader.java | 3 +-
.../main/resources/schemas/wsdl/xml-binding.xjb | 4 +-
.../main/resources/schemas/wsdl/xml-binding.xsd | 2 +-
.../cxf/binding/xml/interceptor/TestBase.java | 2 +-
.../interceptor/XMLFaultOutInterceptorTest.java | 4 +-
rt/databinding/aegis/pom.xml | 8 +-
.../apache/cxf/aegis/type/AbstractTypeCreator.java | 2 +-
.../apache/cxf/aegis/type/DefaultTypeMapping.java | 4 +-
.../cxf/aegis/type/java5/AnnotationReader.java | 19 +-
.../apache/cxf/aegis/type/mtom/AttachmentUtil.java | 5 +-
.../apache/cxf/aegis/type/mtom/ByteArrayType.java | 3 +-
.../cxf/aegis/type/mtom/DataHandlerType.java | 7 +-
.../apache/cxf/aegis/type/mtom/DataSourceType.java | 7 +-
.../cxf/aegis/type/mtom/StreamDataSource.java | 2 +-
.../cxf/aegis/client/ClientServiceConfigTest.java | 5 +-
.../java/org/apache/cxf/aegis/client/Echo.java | 8 +-
.../java/org/apache/cxf/aegis/client/EchoImpl.java | 2 +-
.../apache/cxf/aegis/custom/service/Service.java | 2 +-
.../cxf/aegis/exception/ExceptionService.java | 4 +-
.../cxf/aegis/namespaces/impl/NameServiceImpl.java | 3 +-
.../cxf/aegis/namespaces/intf/NameService.java | 5 +-
.../apache/cxf/aegis/services/ArrayService.java | 4 +-
.../apache/cxf/aegis/services/AttributeBean.java | 2 +-
.../org/apache/cxf/aegis/services/BeanWithDOM.java | 2 -
.../java/org/apache/cxf/aegis/services/Echo.java | 4 +-
.../aegis/type/array/DuplicateArrayService.java | 4 +-
.../type/array/DuplicateArrayServiceBean.java | 4 +-
.../org/apache/cxf/aegis/type/basic/BeanTest.java | 2 +-
.../cxf/aegis/type/java5/DualOutService.java | 8 +-
.../org/apache/cxf/aegis/type/java5/JaxbBean1.java | 4 +-
.../org/apache/cxf/aegis/type/java5/JaxbBean2.java | 6 +-
.../org/apache/cxf/aegis/type/java5/JaxbBean3.java | 2 +-
.../org/apache/cxf/aegis/type/java5/JaxbBean4.java | 4 +-
.../apache/cxf/aegis/type/java5/JaxbTestEnum.java | 4 +-
.../cxf/aegis/type/java5/JaxbXmlParamTypeTest.java | 5 +-
.../cxf/aegis/type/java5/OperationNSTest.java | 10 +-
.../cxf/aegis/type/java5/map/StudentService.java | 4 +-
.../type/java5/map/StudentServiceDocLiteral.java | 2 +-
.../org/apache/cxf/aegis/type/map/MapsTest.java | 2 -
.../apache/cxf/aegis/type/map/fortest/MapTest.java | 3 +-
.../apache/cxf/aegis/type/missing/MissingType.java | 4 +-
.../cxf/aegis/type/missing/MissingTypeImpl.java | 4 +-
.../cxf/aegis/type/mtom/DataSourceTypeTest.java | 2 +-
.../java/org/apache/cxf/doclitbare/University.java | 10 +-
.../org/apache/cxf/doclitbare/UniversityImpl.java | 4 +-
rt/databinding/jaxb/pom.xml | 4 +-
.../apache/cxf/jaxb/JAXBContextInitializer.java | 31 +--
.../java/org/apache/cxf/jaxb/JAXBDataBase.java | 14 +-
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 20 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 38 +--
.../org/apache/cxf/jaxb/JAXBSchemaInitializer.java | 20 +-
.../org/apache/cxf/jaxb/JAXBWrapperHelper.java | 5 +-
.../apache/cxf/jaxb/MarshallerAwareXMLWriter.java | 2 +-
.../apache/cxf/jaxb/MarshallerEventHandler.java | 2 +-
.../cxf/jaxb/UnmarshallerAwareXMLReader.java | 2 +-
.../apache/cxf/jaxb/UnmarshallerEventHandler.java | 2 +-
.../src/main/java/org/apache/cxf/jaxb/Utils.java | 12 +-
.../cxf/jaxb/WrapperHelperClassGenerator.java | 5 +-
.../jaxb/attachment/JAXBAttachmentMarshaller.java | 4 +-
.../attachment/JAXBAttachmentUnmarshaller.java | 5 +-
.../org/apache/cxf/jaxb/io/DataReaderImpl.java | 16 +-
.../org/apache/cxf/jaxb/io/DataWriterImpl.java | 19 +-
.../apache/cxf/endpoint/dynamic/simple-binding.xjb | 2 +-
.../src/test/java/SampleClassInDefaultPackage.java | 2 +-
.../org/apache/cxf/jaxb/BareInInterceptorTest.java | 2 +-
.../jaxb/DataBindingMarshallerPropertiesTest.java | 2 -
.../cxf/jaxb/DocLiteralInInterceptorTest.java | 2 +-
.../cxf/jaxb/FixNamespacesXMLEventReader.java | 3 +-
.../cxf/jaxb/FixNamespacesXMLEventWriter.java | 3 +-
.../cxf/jaxb/FixNamespacesXMLStreamReader.java | 3 +-
.../cxf/jaxb/FixNamespacesXMLStreamWriter.java | 2 +-
.../org/apache/cxf/jaxb/JAXBDataBindingTest.java | 30 +--
.../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 20 +-
.../java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 5 +-
.../org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 11 +-
.../java/org/apache/cxf/jaxb/OrderException.java | 6 +-
.../test/java/org/apache/cxf/jaxb/TestBase.java | 3 +-
.../test/java/org/apache/cxf/jaxb/UtilsTest.java | 2 +-
.../org/apache/cxf/jaxb/fortest/QualifiedBean.java | 4 +-
.../jaxb/fortest/unqualified/UnqualifiedBean.java | 2 +-
.../org/apache/cxf/jaxb/io/MyCustomHandler.java | 4 +-
.../cxf/jaxb/io/MyCustomMarshallerHandler.java | 9 +-
.../cxf/jaxb/io/XMLStreamDataReaderTest.java | 4 +-
.../cxf/jaxb/io/XMLStreamDataWriterTest.java | 4 +-
.../org/apache/cxf/jaxb_misc/TestJAXBClass.java | 8 +-
.../jaxb/src/test/resources/schema/jms.xsd | 2 +-
.../cxf/clustering/FailoverTargetSelector.java | 2 +-
rt/frontend/jaxrs/pom.xml | 33 ++-
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 15 +-
.../apache/cxf/jaxrs/JAXRSServerFactoryBean.java | 3 +-
.../apache/cxf/jaxrs/JAXRSServiceFactoryBean.java | 2 +-
.../org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 2 +-
.../org/apache/cxf/jaxrs/blueprint/Activator.java | 3 +-
.../jaxrs/blueprint/BlueprintResourceFactory.java | 3 +-
.../ext/AbstractStreamingResponseExtension.java | 3 +-
.../org/apache/cxf/jaxrs/ext/DefaultMethod.java | 2 +-
.../org/apache/cxf/jaxrs/ext/MessageContext.java | 18 +-
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 27 +-
.../main/java/org/apache/cxf/jaxrs/ext/PATCH.java | 2 +-
.../org/apache/cxf/jaxrs/ext/ProtocolHeaders.java | 2 +-
.../apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java | 3 +-
.../org/apache/cxf/jaxrs/ext/ResponseStatus.java | 2 +-
.../main/java/org/apache/cxf/jaxrs/ext/TRACE.java | 2 +-
.../apache/cxf/jaxrs/ext/multipart/Attachment.java | 13 +-
.../cxf/jaxrs/ext/multipart/AttachmentBuilder.java | 5 +-
.../jaxrs/ext/multipart/InputStreamDataSource.java | 2 +-
.../apache/cxf/jaxrs/ext/multipart/Multipart.java | 2 +-
.../cxf/jaxrs/ext/multipart/MultipartBody.java | 3 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 6 +-
.../cxf/jaxrs/impl/AbstractRequestContextImpl.java | 9 +-
.../jaxrs/impl/AbstractResponseContextImpl.java | 17 +-
.../apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 17 +-
.../cxf/jaxrs/impl/CacheControlHeaderProvider.java | 5 +-
.../apache/cxf/jaxrs/impl/ConfigurableImpl.java | 21 +-
.../apache/cxf/jaxrs/impl/ConfigurationImpl.java | 7 +-
.../jaxrs/impl/ContainerRequestContextImpl.java | 15 +-
.../jaxrs/impl/ContainerResponseContextImpl.java | 5 +-
.../cxf/jaxrs/impl/CookieHeaderProvider.java | 4 +-
.../apache/cxf/jaxrs/impl/DateHeaderProvider.java | 3 +-
.../cxf/jaxrs/impl/EntityTagHeaderProvider.java | 4 +-
.../apache/cxf/jaxrs/impl/FeatureContextImpl.java | 6 +-
.../org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 9 +-
.../cxf/jaxrs/impl/HttpServletRequestFilter.java | 11 +-
.../cxf/jaxrs/impl/HttpServletResponseFilter.java | 7 +-
.../org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java | 7 +-
.../apache/cxf/jaxrs/impl/LinkHeaderProvider.java | 5 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 5 +-
.../org/apache/cxf/jaxrs/impl/MetadataMap.java | 2 +-
.../cxf/jaxrs/impl/NewCookieHeaderProvider.java | 7 +-
.../org/apache/cxf/jaxrs/impl/PathSegmentImpl.java | 5 +-
.../cxf/jaxrs/impl/PropertyHolderFactory.java | 3 +-
.../org/apache/cxf/jaxrs/impl/ProvidersImpl.java | 13 +-
.../jaxrs/impl/ReaderInterceptorContextImpl.java | 11 +-
.../cxf/jaxrs/impl/ReaderInterceptorMBR.java | 12 +-
.../org/apache/cxf/jaxrs/impl/RequestImpl.java | 19 +-
.../apache/cxf/jaxrs/impl/RequestPreprocessor.java | 7 +-
.../apache/cxf/jaxrs/impl/ResourceContextImpl.java | 3 +-
.../apache/cxf/jaxrs/impl/ResourceInfoImpl.java | 3 +-
.../apache/cxf/jaxrs/impl/ResponseBuilderImpl.java | 23 +-
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 28 +-
.../cxf/jaxrs/impl/RetryAfterHeaderProvider.java | 3 +-
.../apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java | 23 +-
.../apache/cxf/jaxrs/impl/SecurityContextImpl.java | 5 +-
.../cxf/jaxrs/impl/ServletOutputStreamFilter.java | 5 +-
.../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 11 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 9 +-
.../cxf/jaxrs/impl/VariantListBuilderImpl.java | 6 +-
.../jaxrs/impl/WebApplicationExceptionMapper.java | 11 +-
.../jaxrs/impl/WriterInterceptorContextImpl.java | 11 +-
.../cxf/jaxrs/impl/WriterInterceptorMBW.java | 17 +-
.../cxf/jaxrs/impl/tl/RequestDispatcherImpl.java | 9 +-
.../jaxrs/impl/tl/ThreadLocalContextResolver.java | 2 +-
.../cxf/jaxrs/impl/tl/ThreadLocalHttpHeaders.java | 8 +-
.../impl/tl/ThreadLocalHttpServletRequest.java | 28 +-
.../impl/tl/ThreadLocalHttpServletResponse.java | 6 +-
.../jaxrs/impl/tl/ThreadLocalMessageContext.java | 19 +-
.../jaxrs/impl/tl/ThreadLocalProtocolHeaders.java | 3 +-
.../cxf/jaxrs/impl/tl/ThreadLocalProviders.java | 13 +-
.../cxf/jaxrs/impl/tl/ThreadLocalRequest.java | 8 +-
.../jaxrs/impl/tl/ThreadLocalSecurityContext.java | 2 +-
.../jaxrs/impl/tl/ThreadLocalServletConfig.java | 4 +-
.../jaxrs/impl/tl/ThreadLocalServletContext.java | 28 +-
.../cxf/jaxrs/impl/tl/ThreadLocalUriInfo.java | 8 +-
.../interceptor/AttachmentInputInterceptor.java | 3 +-
.../JAXRSDefaultFaultOutInterceptor.java | 2 +-
.../cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 13 +-
.../cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 18 +-
.../lifecycle/PerRequestResourceProvider.java | 7 +-
.../cxf/jaxrs/model/AbstractResourceInfo.java | 5 +-
.../apache/cxf/jaxrs/model/ApplicationInfo.java | 3 +-
.../apache/cxf/jaxrs/model/ClassResourceInfo.java | 13 +-
.../cxf/jaxrs/model/OperationResourceInfo.java | 13 +-
.../model/OperationResourceInfoComparator.java | 3 +-
.../model/OperationResourceInfoComparatorBase.java | 5 +-
.../org/apache/cxf/jaxrs/model/URITemplate.java | 7 +-
.../cxf/jaxrs/model/doc/JavaDocProvider.java | 3 +-
.../org/apache/cxf/jaxrs/nio/NioInputStream.java | 2 +-
.../apache/cxf/jaxrs/nio/NioMessageBodyWriter.java | 17 +-
.../org/apache/cxf/jaxrs/nio/NioReadEntity.java | 5 +-
.../apache/cxf/jaxrs/nio/NioReadListenerImpl.java | 7 +-
.../apache/cxf/jaxrs/nio/NioWriteListenerImpl.java | 3 +-
.../provider/AbstractCachingMessageProvider.java | 5 +-
.../provider/AbstractConfigurableProvider.java | 7 +-
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 38 +--
.../provider/AbstractResponseViewProvider.java | 15 +-
.../cxf/jaxrs/provider/BinaryDataProvider.java | 17 +-
.../jaxrs/provider/CachingMessageBodyReader.java | 11 +-
.../jaxrs/provider/CachingMessageBodyWriter.java | 11 +-
.../cxf/jaxrs/provider/DataBindingProvider.java | 14 +-
.../cxf/jaxrs/provider/DataSourceProvider.java | 17 +-
.../cxf/jaxrs/provider/FormEncodingProvider.java | 25 +-
.../apache/cxf/jaxrs/provider/FormValidator.java | 2 +-
.../jaxrs/provider/JAXBAttachmentMarshaller.java | 5 +-
.../jaxrs/provider/JAXBAttachmentUnmarshaller.java | 5 +-
.../cxf/jaxrs/provider/JAXBElementProvider.java | 30 +--
.../jaxrs/provider/JAXBElementTypedProvider.java | 10 +-
.../cxf/jaxrs/provider/JAXRSDataBinding.java | 14 +-
.../JavaTimeTypesParamConverterProvider.java | 6 +-
.../cxf/jaxrs/provider/MultipartProvider.java | 23 +-
.../cxf/jaxrs/provider/PrimitiveTextProvider.java | 13 +-
.../apache/cxf/jaxrs/provider/ProviderCache.java | 7 +-
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 31 ++-
.../jaxrs/provider/RequestDispatcherProvider.java | 17 +-
.../jaxrs/provider/ServerConfigurableFactory.java | 4 +-
.../cxf/jaxrs/provider/ServerProviderFactory.java | 31 ++-
.../apache/cxf/jaxrs/provider/SourceProvider.java | 16 +-
.../jaxrs/provider/StreamingResponseProvider.java | 15 +-
.../cxf/jaxrs/provider/StringTextProvider.java | 9 +-
.../apache/cxf/jaxrs/provider/XPathProvider.java | 13 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 20 +-
.../jaxrs/security/ClaimsAuthorizingFilter.java | 7 +-
.../jaxrs/security/JAASAuthenticationFilter.java | 20 +-
.../security/KerberosAuthenticationFilter.java | 12 +-
.../jaxrs/security/SimpleAuthorizingFilter.java | 11 +-
.../servlet/CXFJaxrsRuntimeDelegateServlet.java | 2 +-
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 11 +-
.../spring/AbstractJaxrsClassesScanServer.java | 5 +-
.../spring/AbstractSpringComponentScanServer.java | 9 +-
.../JAXRSServerFactoryBeanDefinitionParser.java | 4 +-
.../cxf/jaxrs/spring/SpringResourceFactory.java | 3 +-
.../springmvc/SpringViewResolverProvider.java | 5 +-
.../cxf/jaxrs/utils/AccumulatingIntersector.java | 2 +-
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 33 ++-
.../org/apache/cxf/jaxrs/utils/ExceptionUtils.java | 7 +-
.../java/org/apache/cxf/jaxrs/utils/FormUtils.java | 15 +-
.../java/org/apache/cxf/jaxrs/utils/HttpUtils.java | 27 +-
.../org/apache/cxf/jaxrs/utils/InjectionUtils.java | 61 +++--
.../java/org/apache/cxf/jaxrs/utils/JAXBUtils.java | 13 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 70 ++---
.../cxf/jaxrs/utils/MimeTypesIntersector.java | 2 +-
.../jaxrs/utils/NonAccumulatingIntersector.java | 2 +-
.../org/apache/cxf/jaxrs/utils/ResourceUtils.java | 66 ++---
.../org/apache/cxf/jaxrs/utils/SpecExceptions.java | 28 +-
.../cxf/jaxrs/utils/multipart/AttachmentUtils.java | 5 +-
.../JAXRSBeanValidationInInterceptor.java | 9 +-
.../validation/JAXRSBeanValidationInvoker.java | 3 +-
.../JAXRSBeanValidationOutInterceptor.java | 11 +-
.../validation/JAXRSParameterNameProvider.java | 3 +-
.../validation/ValidationExceptionMapper.java | 17 +-
...eDelegate => jakarta.ws.rs.ext.RuntimeDelegate} | 0
.../org/apache/cxf/jaxrs/AbstractCustomer.java | 10 +-
.../test/java/org/apache/cxf/jaxrs/BaseApi.java | 18 +-
.../test/java/org/apache/cxf/jaxrs/Customer.java | 73 +++--
.../org/apache/cxf/jaxrs/CustomerApplication.java | 6 +-
.../java/org/apache/cxf/jaxrs/CustomerInfo.java | 8 +-
.../apache/cxf/jaxrs/CustomerParameterHandler.java | 4 +-
.../java/org/apache/cxf/jaxrs/CustomerService.java | 10 +-
.../apache/cxf/jaxrs/CustomerServiceRequest.java | 2 +-
.../java/org/apache/cxf/jaxrs/CustomizedApi.java | 18 +-
.../apache/cxf/jaxrs/DefaultMethodResource.java | 7 +-
.../org/apache/cxf/jaxrs/JAXBContextProvider.java | 6 +-
.../org/apache/cxf/jaxrs/JAXBContextProvider2.java | 6 +-
.../cxf/jaxrs/JAXRSServerFactoryBeanTest.java | 5 +-
.../cxf/jaxrs/JAXRSServiceFactoryBeanTest.java | 3 +-
.../jaxrs/PriorityCustomerParameterHandler.java | 8 +-
.../cxf/jaxrs/SelectMethodCandidatesTest.java | 25 +-
.../test/java/org/apache/cxf/jaxrs/Timezone.java | 6 +-
.../cxf/jaxrs/ext/MessageContextImplTest.java | 29 +-
.../org/apache/cxf/jaxrs/ext/form/FormTest.java | 3 +-
.../cxf/jaxrs/ext/multipart/AttachmentTest.java | 5 +-
.../cxf/jaxrs/ext/multipart/MultipartBodyTest.java | 5 +-
.../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java | 4 +-
.../apache/cxf/jaxrs/fortest/AbstractEntity.java | 4 +-
.../cxf/jaxrs/fortest/AbstractRestController.java | 6 +-
.../org/apache/cxf/jaxrs/fortest/BookEntity.java | 3 +-
.../org/apache/cxf/jaxrs/fortest/BookEntity2.java | 3 +-
.../cxf/jaxrs/fortest/ConcreteRestResource.java | 2 +-
.../apache/cxf/jaxrs/fortest/GenericEntity.java | 2 +-
.../cxf/jaxrs/fortest/GenericEntityImpl.java | 3 +-
.../cxf/jaxrs/fortest/GenericEntityImpl2.java | 5 +-
.../cxf/jaxrs/fortest/GenericEntityImpl3.java | 5 +-
.../cxf/jaxrs/fortest/GenericEntityImpl4.java | 5 +-
.../org/apache/cxf/jaxrs/fortest/jaxb/Book.java | 2 +-
.../cxf/jaxrs/fortest/jaxb/ObjectFactory.java | 7 +-
.../cxf/jaxrs/fortest/jaxb/index/SuperBook3.java | 3 +-
.../fortest/jaxb/jaxbelement/ObjectFactory.java | 7 +-
.../fortest/jaxb/jaxbelement/ParamJAXBElement.java | 3 +-
.../jaxrs/fortest/jaxb/jaxbelement/ParamType.java | 8 +-
.../fortest/jaxb/jaxbelement/package-info.java | 4 +-
.../cxf/jaxrs/fortest/jaxb/packageinfo/Book2.java | 2 +-
.../jaxb/packageinfo/Book2NoRootElement.java | 2 +-
.../fortest/jaxb/packageinfo/package-info.java | 4 +-
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 9 +-
.../jaxrs/impl/CacheControlHeaderProviderTest.java | 5 +-
.../cxf/jaxrs/impl/ConfigurationImplTest.java | 33 ++-
.../cxf/jaxrs/impl/CookieHeaderProviderTest.java | 2 +-
.../cxf/jaxrs/impl/DateHeaderProviderTest.java | 3 +-
.../jaxrs/impl/EntityTagHeaderProviderTest.java | 2 +-
.../cxf/jaxrs/impl/EvaluatePreconditionsTest.java | 11 +-
.../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 11 +-
.../apache/cxf/jaxrs/impl/LinkBuilderImplTest.java | 12 +-
.../cxf/jaxrs/impl/LinkHeaderProviderTest.java | 2 +-
.../jaxrs/impl/MediaTypeHeaderProviderTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/MetadataMapTest.java | 2 +-
.../jaxrs/impl/NewCookieHeaderProviderTest.java | 3 +-
.../apache/cxf/jaxrs/impl/PathSegmentImplTest.java | 4 +-
.../org/apache/cxf/jaxrs/impl/RequestImplTest.java | 15 +-
.../cxf/jaxrs/impl/ResponseBuilderImplTest.java | 19 +-
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 48 ++--
.../cxf/jaxrs/impl/RuntimeDelegateImplTest.java | 18 +-
.../org/apache/cxf/jaxrs/impl/SimpleService.java | 8 +-
.../apache/cxf/jaxrs/impl/UriBuilderImplTest.java | 14 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 13 +-
.../cxf/jaxrs/impl/VariantListBuilderImplTest.java | 4 +-
.../lifecycle/PerRequestResourceProviderTest.java | 3 +-
.../cxf/jaxrs/model/ClassResourceInfoTest.java | 27 +-
.../cxf/jaxrs/model/OperationResourceInfoTest.java | 7 +-
.../apache/cxf/jaxrs/model/URITemplateTest.java | 3 +-
.../cxf/jaxrs/model/wadl/petstore/PetStore.java | 12 +-
.../cxf/jaxrs/provider/BinaryDataProviderTest.java | 9 +-
.../cxf/jaxrs/provider/CustomJaxbProvider.java | 14 +-
.../cxf/jaxrs/provider/DataSourceProviderTest.java | 9 +-
.../jaxrs/provider/FormEncodingProviderTest.java | 13 +-
.../jaxrs/provider/JAXBElementProviderTest.java | 36 +--
.../JavaTimeTypesParamConverterProviderTest.java | 2 +-
.../jaxrs/provider/PrimitiveTextProviderTest.java | 11 +-
.../ProviderFactoryExceptionMapperTest.java | 5 +-
...iderFactoryHierarchicalExceptionMapperTest.java | 5 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 52 ++--
.../cxf/jaxrs/provider/SourceProviderTest.java | 4 +-
.../cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 8 +-
.../java/org/apache/cxf/jaxrs/resources/Book.java | 10 +-
.../apache/cxf/jaxrs/resources/BookInterface.java | 10 +-
.../cxf/jaxrs/resources/BookNoSubResource.java | 8 +-
.../org/apache/cxf/jaxrs/resources/BookStore.java | 12 +-
.../cxf/jaxrs/resources/BookStoreConstructor.java | 2 +-
.../jaxrs/resources/BookStoreNoSubResource.java | 16 +-
.../jaxrs/resources/BookStoreSubresourcesOnly.java | 4 +-
.../cxf/jaxrs/resources/BookStoreTemplates.java | 14 +-
.../apache/cxf/jaxrs/resources/BookSuperClass.java | 10 +-
.../org/apache/cxf/jaxrs/resources/Chapter.java | 2 +-
.../cxf/jaxrs/resources/CollectionsResource.java | 6 +-
.../org/apache/cxf/jaxrs/resources/ManyTags.java | 2 +-
.../org/apache/cxf/jaxrs/resources/SuperBook.java | 2 +-
.../java/org/apache/cxf/jaxrs/resources/TagVO.java | 2 +-
.../org/apache/cxf/jaxrs/resources/TagVO2.java | 2 +-
.../java/org/apache/cxf/jaxrs/resources/Tags.java | 5 +-
.../apache/cxf/jaxrs/resources/TestResource.java | 6 +-
.../cxf/jaxrs/resources/TestResourceTemplate1.java | 4 +-
.../cxf/jaxrs/resources/TestResourceTemplate2.java | 4 +-
.../cxf/jaxrs/resources/TestResourceTemplate3.java | 4 +-
.../cxf/jaxrs/resources/TestResourceTemplate4.java | 4 +-
.../resources/UriBuilderWrongAnnotations.java | 2 +-
.../security/JAASAuthenticationFilterTest.java | 5 +-
.../jaxrs/spring/JAXRSServerFactoryBeanTest.java | 2 +-
.../springmvc/SpringViewResolverProviderTest.java | 15 +-
.../cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 5 +-
.../apache/cxf/jaxrs/utils/ExceptionUtilsTest.java | 9 +-
.../org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 5 +-
.../org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 9 +-
.../apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 17 +-
.../org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java | 10 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 41 ++-
.../cxf/jaxrs/utils/LocalDateXmlAdapter.java} | 18 +-
.../apache/cxf/jaxrs/utils/ResourceUtilsTest.java | 17 +-
rt/frontend/jaxws/pom.xml | 25 +-
.../cxf/jaxws/AbstractJAXWSMethodInvoker.java | 13 +-
.../main/java/org/apache/cxf/jaxws/CXFService.java | 8 +-
.../java/org/apache/cxf/jaxws/DispatchImpl.java | 42 +--
.../java/org/apache/cxf/jaxws/EndpointImpl.java | 36 +--
.../apache/cxf/jaxws/EndpointReferenceBuilder.java | 8 +-
.../java/org/apache/cxf/jaxws/EndpointUtils.java | 7 +-
.../apache/cxf/jaxws/JAXWSMethodDispatcher.java | 3 +-
.../org/apache/cxf/jaxws/JAXWSMethodInvoker.java | 15 +-
.../cxf/jaxws/JAXWSProviderMethodDispatcher.java | 3 +-
.../apache/cxf/jaxws/JaxWsClientFactoryBean.java | 3 +-
.../org/apache/cxf/jaxws/JaxWsClientProxy.java | 28 +-
.../apache/cxf/jaxws/JaxWsProxyFactoryBean.java | 4 +-
.../apache/cxf/jaxws/JaxWsServerFactoryBean.java | 7 +-
.../org/apache/cxf/jaxws/JaxwsClientCallback.java | 5 +-
.../apache/cxf/jaxws/JaxwsResponseCallback.java | 3 +-
.../org/apache/cxf/jaxws/ServerAsyncResponse.java | 2 +-
.../java/org/apache/cxf/jaxws/ServiceImpl.java | 24 +-
.../apache/cxf/jaxws/WrapperClassGenerator.java | 50 ++--
.../cxf/jaxws/binding/AbstractBindingImpl.java | 5 +-
.../cxf/jaxws/binding/http/HTTPBindingImpl.java | 9 +-
.../soap/JaxWsSoapBindingConfiguration.java | 7 +-
.../cxf/jaxws/binding/soap/SOAPBindingImpl.java | 11 +-
.../cxf/jaxws/context/WebServiceContextImpl.java | 15 +-
.../context/WebServiceContextResourceResolver.java | 5 +-
.../cxf/jaxws/context/WrappedAttachments.java | 3 +-
.../cxf/jaxws/context/WrappedMessageContext.java | 7 +-
.../handler/AbstractJAXWSHandlerInterceptor.java | 2 +-
.../AbstractProtocolHandlerInterceptor.java | 7 +-
.../handler/AnnotationHandlerChainBuilder.java | 8 +-
.../cxf/jaxws/handler/BaseHandlerChainBuilder.java | 4 +-
.../handler/DelegatingHandlerChainBuilder.java | 3 +-
.../cxf/jaxws/handler/HandlerChainBuilder.java | 7 +-
.../cxf/jaxws/handler/HandlerChainInvoker.java | 20 +-
.../cxf/jaxws/handler/HandlerResolverImpl.java | 10 +-
.../handler/JakartaeeHandlerChainBuilder.java | 6 +-
.../jaxws/handler/JavaeeHandlerChainBuilder.java | 6 +-
.../org/apache/cxf/jaxws/handler/PortInfoImpl.java | 3 +-
.../cxf/jaxws/handler/jakartaee/CString.java | 16 +-
.../jaxws/handler/jakartaee/DescriptionType.java | 8 +-
.../jaxws/handler/jakartaee/DisplayNameType.java | 8 +-
.../handler/jakartaee/FullyQualifiedClassType.java | 6 +-
.../cxf/jaxws/handler/jakartaee/IconType.java | 16 +-
.../jaxws/handler/jakartaee/ParamValueType.java | 16 +-
.../cxf/jaxws/handler/jakartaee/PathType.java | 6 +-
.../jakartaee/PortComponentHandlerType.java | 16 +-
.../cxf/jaxws/handler/jakartaee/XsdQNameType.java | 17 +-
.../cxf/jaxws/handler/jakartaee/XsdStringType.java | 16 +-
.../cxf/jaxws/handler/jakartaee/package-info.java | 4 +-
.../logical/LogicalHandlerFaultInInterceptor.java | 3 +-
.../logical/LogicalHandlerFaultOutInterceptor.java | 4 +-
.../logical/LogicalHandlerInInterceptor.java | 2 +-
.../logical/LogicalHandlerOutInterceptor.java | 4 +-
.../handler/logical/LogicalMessageContextImpl.java | 7 +-
.../jaxws/handler/logical/LogicalMessageImpl.java | 16 +-
.../soap/SOAPHandlerFaultInInterceptor.java | 12 +-
.../soap/SOAPHandlerFaultOutInterceptor.java | 18 +-
.../jaxws/handler/soap/SOAPHandlerInterceptor.java | 22 +-
.../jaxws/handler/soap/SOAPMessageContextImpl.java | 18 +-
.../apache/cxf/jaxws/handler/types/CString.java | 16 +-
.../cxf/jaxws/handler/types/DescriptionType.java | 8 +-
.../cxf/jaxws/handler/types/DisplayNameType.java | 8 +-
.../handler/types/FullyQualifiedClassType.java | 6 +-
.../apache/cxf/jaxws/handler/types/IconType.java | 16 +-
.../cxf/jaxws/handler/types/ParamValueType.java | 16 +-
.../apache/cxf/jaxws/handler/types/PathType.java | 6 +-
.../handler/types/PortComponentHandlerType.java | 16 +-
.../cxf/jaxws/handler/types/XsdQNameType.java | 17 +-
.../cxf/jaxws/handler/types/XsdStringType.java | 16 +-
.../cxf/jaxws/handler/types/package-info.java | 4 +-
.../jaxws/interceptors/HolderInInterceptor.java | 3 +-
.../jaxws/interceptors/HolderOutInterceptor.java | 3 +-
.../interceptors/MessageModeInInterceptor.java | 6 +-
.../interceptors/MessageModeOutInterceptor.java | 16 +-
.../cxf/jaxws/interceptors/SwAInInterceptor.java | 2 +-
.../cxf/jaxws/interceptors/SwAOutInterceptor.java | 6 +-
.../jaxws/interceptors/WebFaultOutInterceptor.java | 4 +-
.../interceptors/WrapperClassInInterceptor.java | 2 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 26 +-
.../JaxWsWebServicePublisherBeanPostProcessor.java | 13 +-
.../org/apache/cxf/jaxws/support/BindingID.java | 3 +-
.../org/apache/cxf/jaxws/support/DummyImpl.java | 4 +-
.../cxf/jaxws/support/JaxWsClientEndpointImpl.java | 3 +-
.../cxf/jaxws/support/JaxWsEndpointImpl.java | 20 +-
.../cxf/jaxws/support/JaxWsImplementorInfo.java | 16 +-
.../jaxws/support/JaxWsServiceConfiguration.java | 32 +--
.../cxf/jaxws/support/JaxWsServiceFactoryBean.java | 40 +--
.../cxf/jaxws/support/ServiceDelegateAccessor.java | 5 +-
.../support/WebServiceProviderConfiguration.java | 4 +-
.../java/org/apache/cxf/jaxws22/EndpointImpl.java | 3 +-
.../org/apache/cxf/jaxws22/JAXWS22Invoker.java | 2 +-
.../transport/http_jaxws_spi/HttpHandlerImpl.java | 7 +-
.../http_jaxws_spi/HttpServletRequestAdapter.java | 34 +--
.../http_jaxws_spi/HttpServletResponseAdapter.java | 10 +-
.../http_jaxws_spi/JAXWSHttpSpiDestination.java | 5 +-
.../JAXWSHttpSpiTransportFactory.java | 3 +-
.../resources/META-INF/cxf/cxf-extension-jaxws.xml | 2 +-
...ws.spi.Provider => jakarta.xml.ws.spi.Provider} | 0
...ws.spi.Provider => jakarta.xml.ws.spi.Provider} | 0
.../java/org/apache/cxf/jaxws/CodeFirstTest.java | 18 +-
.../org/apache/cxf/jaxws/CodeFirstWSDLTest.java | 10 +-
.../apache/cxf/jaxws/ConfiguredEndpointTest.java | 8 +-
.../org/apache/cxf/jaxws/EndpointImplTest.java | 6 +-
.../apache/cxf/jaxws/EndpointReferenceTest.java | 14 +-
.../test/java/org/apache/cxf/jaxws/HelloWsa.java | 4 +-
.../apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 2 +-
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 36 +--
.../apache/cxf/jaxws/JaxwsClientCallbackTest.java | 5 +-
.../org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 3 +-
.../java/org/apache/cxf/jaxws/SOAPBindingTest.java | 6 +-
.../java/org/apache/cxf/jaxws/ServiceImplTest.java | 16 +-
.../jaxws/WrapperNamespaceClassGeneratorTest.java | 5 +-
.../jaxws/context/WebServiceContextImplTest.java | 5 +-
.../cxf/jaxws/context/WrappedAttachmentsTest.java | 5 +-
.../jaxws/context/WrappedMessageContextTest.java | 9 +-
.../apache/cxf/jaxws/dispatch/DispatchOpTest.java | 10 +-
.../apache/cxf/jaxws/dispatch/DispatchTest.java | 14 +-
.../AbstractProtocolHandlerInterceptorTest.java | 7 +-
.../cxf/jaxws/handler/HandlerChainBuilderTest.java | 9 +-
.../cxf/jaxws/handler/HandlerChainInvokerTest.java | 18 +-
.../JakartaAnnotationHandlerChainBuilderTest.java | 13 +-
.../JavaxAnnotationHandlerChainBuilderTest.java | 13 +-
.../handler/LogicalHandlerInterceptorTest.java | 13 +-
.../cxf/jaxws/handler/LogicalMessageImplTest.java | 5 +-
.../handler/soap/SOAPHandlerInterceptorTest.java | 26 +-
.../cxf/jaxws/header/HeaderClientServerTest.java | 4 +-
.../header/ProviderHeaderClientServerTest.java | 12 +-
.../cxf/jaxws/header/TestRPCHeaderProvider.java | 12 +-
.../org/apache/cxf/jaxws/holder/HolderService.java | 8 +-
.../apache/cxf/jaxws/holder/HolderServiceImpl.java | 4 +-
.../org/apache/cxf/jaxws/holder/HolderTest.java | 3 +-
.../WebFaultOutInterceptorTestCase.java | 13 +-
.../apache/cxf/jaxws/logging/SOAPLoggingTest.java | 4 +-
.../org/apache/cxf/jaxws/logging/TestService.java | 2 +-
.../jaxws/provider/DOMSourcePayloadProvider.java | 11 +-
.../apache/cxf/jaxws/provider/PayloadProvider.java | 5 +-
.../apache/cxf/jaxws/provider/SAAJProvider.java | 10 +-
.../jaxws/provider/SOAPSourcePayloadProvider.java | 9 +-
.../cxf/jaxws/provider/SourceMessageProvider.java | 9 +-
.../provider/StreamSourcePayloadProvider.java | 11 +-
.../org/apache/cxf/jaxws/service/AddNumbers.java | 8 +-
.../org/apache/cxf/jaxws/service/AddNumbers2.java | 8 +-
.../apache/cxf/jaxws/service/AddNumbers2Impl.java | 2 +-
.../cxf/jaxws/service/AddNumbersException.java | 2 +-
.../apache/cxf/jaxws/service/AddNumbersImpl.java | 2 +-
.../cxf/jaxws/service/AddNumbersSubException.java | 2 +-
.../jaxws/service/AnnotationInterceptorTest.java | 3 +-
.../org/apache/cxf/jaxws/service/ArrayService.java | 8 +-
.../apache/cxf/jaxws/service/ArrayServiceImpl.java | 4 +-
.../java/org/apache/cxf/jaxws/service/EchoFoo.java | 2 +-
.../java/org/apache/cxf/jaxws/service/Foo.java | 2 +-
.../org/apache/cxf/jaxws/service/FooService.java | 10 +-
.../apache/cxf/jaxws/service/FooServiceImpl.java | 2 +-
.../apache/cxf/jaxws/service/GenericsService.java | 2 +-
.../apache/cxf/jaxws/service/GenericsService2.java | 2 +-
.../apache/cxf/jaxws/service/GreeterImplDoc.java | 3 +-
.../java/org/apache/cxf/jaxws/service/Hello.java | 6 +-
.../java/org/apache/cxf/jaxws/service/Hello2.java | 4 +-
.../java/org/apache/cxf/jaxws/service/Hello3.java | 4 +-
.../apache/cxf/jaxws/service/HelloExcludeImpl.java | 2 +-
.../cxf/jaxws/service/HelloExcludeOnInterface.java | 4 +-
.../apache/cxf/jaxws/service/HelloInterface.java | 4 +-
.../java/org/apache/cxf/jaxws/service/SayHi.java | 6 +-
.../org/apache/cxf/jaxws/service/SayHiImpl.java | 2 +-
.../apache/cxf/jaxws/service/SayHiInterface.java | 7 +-
.../org/apache/cxf/jaxws/spi/ProviderImplTest.java | 2 +-
.../cxf/jaxws/spring/PostConstructCalledCount.java | 10 +-
.../apache/cxf/jaxws/spring/SpringBeansTest.java | 7 +-
.../support/ContextPropertiesMappingTest.java | 12 +-
.../jaxws/support/JaxWsImplementorInfoTest.java | 5 +-
.../support/JaxWsServiceConfigurationTest.java | 18 +-
.../jaxws/support/JaxWsServiceFactoryBeanTest.java | 12 +-
.../apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 4 +-
.../http_jaxws_spi/HttpHandlerImplTest.java | 8 +-
.../JAXWSHttpSpiDestinationTest.java | 5 +-
.../JAXWSHttpSpiTransportFactoryTest.java | 5 +-
rt/frontend/js/pom.xml | 2 +-
.../apache/cxf/js/rhino/AbstractDOMProvider.java | 2 +-
.../apache/cxf/js/rhino/DOMMessageProvider.java | 6 +-
.../apache/cxf/js/rhino/DOMPayloadProvider.java | 2 +-
.../org/apache/cxf/js/rhino/ProviderFactory.java | 3 +-
.../apache/cxf/js/rhino/ProviderFactoryTest.java | 3 +-
rt/frontend/simple/pom.xml | 6 +-
.../cxf/endpoint/dynamic/DynamicClientFactory.java | 6 +-
.../factory/ReflectionServiceFactoryTest.java | 2 +-
.../org/apache/cxf/javascript/fortest/AnEnum.java | 4 +-
.../cxf/javascript/fortest/AttributeTestBean.java | 8 +-
.../javascript/fortest/AttributeTestService.java | 2 +-
.../BasicTypeFunctionReturnStringWrapper.java | 4 +-
.../cxf/javascript/fortest/BeanRequestWrapper.java | 4 +-
.../javascript/fortest/GenericGenericClass.java | 2 +-
.../javascript/fortest/InheritanceTestBase.java | 4 +-
.../javascript/fortest/InheritanceTestDerived.java | 4 +-
.../org/apache/cxf/javascript/fortest/MtoM.java | 6 +-
.../apache/cxf/javascript/fortest/MtoMImpl.java | 7 +-
.../fortest/MtoMParameterBeanNoDataHandler.java | 4 +-
.../fortest/MtoMParameterBeanWithDataHandler.java | 6 +-
.../cxf/javascript/fortest/SimpleDocLitBare.java | 10 +-
.../javascript/fortest/SimpleDocLitBareImpl.java | 6 +-
.../javascript/fortest/SimpleDocLitWrapped.java | 12 +-
.../fortest/SimpleDocLitWrappedImpl.java | 8 +-
.../apache/cxf/javascript/fortest/SimpleRPC.java | 8 +-
.../cxf/javascript/fortest/SimpleRPCImpl.java | 2 +-
.../javascript/fortest/SpecificGenericClass.java | 2 +-
.../cxf/javascript/fortest/StringWrapper.java | 4 +-
.../apache/cxf/javascript/fortest/TestBean1.java | 6 +-
.../apache/cxf/javascript/fortest/TestBean2.java | 2 +-
.../apache/cxf/javascript/fortest/TestBean3.java | 6 +-
.../cxf/javascript/fortest/package-info.java | 2 +-
.../apache/cxf/javascript/hwdemo/GreeterImpl.java | 2 +-
rt/management/pom.xml | 4 +-
.../src/main/build-resources/instrumentation.xjb | 4 +-
.../management/jmx/InstrumentationManagerImpl.java | 2 +-
.../schemas/configuration/instrumentation.xsd | 4 +-
rt/rs/client/pom.xml | 2 +-
.../apache/cxf/jaxrs/client/AbstractClient.java | 32 +--
.../apache/cxf/jaxrs/client/AsyncInvokerImpl.java | 12 +-
.../java/org/apache/cxf/jaxrs/client/Client.java | 10 +-
.../cxf/jaxrs/client/ClientProviderFactory.java | 11 +-
.../apache/cxf/jaxrs/client/ClientProxyImpl.java | 33 ++-
.../org/apache/cxf/jaxrs/client/ClientState.java | 6 +-
.../jaxrs/client/CompletionStageRxInvokerImpl.java | 10 +-
.../cxf/jaxrs/client/JAXRSClientFactory.java | 3 +-
.../cxf/jaxrs/client/JAXRSClientFactoryBean.java | 19 +-
.../cxf/jaxrs/client/JaxrsClientCallback.java | 3 +-
.../apache/cxf/jaxrs/client/LocalClientState.java | 7 +-
.../cxf/jaxrs/client/ResponseExceptionMapper.java | 2 +-
.../apache/cxf/jaxrs/client/SyncInvokerImpl.java | 10 +-
.../cxf/jaxrs/client/ThreadLocalClientState.java | 6 +-
.../jaxrs/client/UrlEncodingParamConverter.java | 3 +-
.../org/apache/cxf/jaxrs/client/WebClient.java | 45 ++--
.../cache/CacheControlClientReaderInterceptor.java | 20 +-
.../cache/CacheControlClientRequestFilter.java | 14 +-
.../jaxrs/client/cache/CacheControlFeature.java | 9 +-
.../org/apache/cxf/jaxrs/client/cache/Entry.java | 4 +-
.../cxf/jaxrs/client/spec/ClientBuilderImpl.java | 10 +-
.../jaxrs/client/spec/ClientConfigurableImpl.java | 7 +-
.../apache/cxf/jaxrs/client/spec/ClientImpl.java | 20 +-
.../client/spec/ClientRequestContextImpl.java | 15 +-
.../spec/ClientRequestFilterInterceptor.java | 9 +-
.../client/spec/ClientResponseContextImpl.java | 5 +-
.../spec/ClientResponseFilterInterceptor.java | 13 +-
.../jaxrs/client/spec/InvocationBuilderImpl.java | 39 ++-
.../spring/AbstractJaxRsClientConfiguration.java | 3 +-
.../JAXRSClientFactoryBeanDefinitionParser.java | 6 +-
.../spring/JaxRsProxyClientConfiguration.java | 5 +-
.../client/spring/JaxRsWebClientConfiguration.java | 3 +-
...tBuilder => jakarta.ws.rs.client.ClientBuilder} | 0
.../jaxrs/client/ClientProviderFactoryTest.java | 9 +-
.../cxf/jaxrs/client/CustomerParameterHandler.java | 4 +-
.../jaxrs/client/JAXRSClientFactoryBeanTest.java | 9 +-
.../cxf/jaxrs/client/JaxrsClientCallbackTest.java | 3 +-
.../client/PriorityCustomerParameterHandler.java | 8 +-
.../org/apache/cxf/jaxrs/client/WebClientTest.java | 7 +-
.../jaxrs/client/cache/CXFCacheControlFeature.java | 2 +-
.../cxf/jaxrs/client/cache/ClientCacheTest.java | 21 +-
.../apache/cxf/jaxrs/client/cache/ClientTest.java | 6 +-
.../cxf/jaxrs/client/logging/TestServiceRest.java | 6 +-
.../client/logging/TestServiceRestBinary.java | 8 +-
.../jaxrs/client/spec/ClientBuilderImplTest.java | 3 +-
.../cxf/jaxrs/client/spec/ClientImplTest.java | 9 +-
.../jaxrs/client/spec/ClientRequestFilterTest.java | 10 +-
.../client/spec/ClientResponseFilterTest.java | 25 +-
.../client/spec/InvocationBuilderImplTest.java | 16 +-
.../client/spring/JAXRSClientFactoryBeanTest.java | 4 +-
.../client/spring/SpringParameterHandler.java | 5 +-
.../java/org/apache/cxf/jaxrs/resources/Book.java | 8 +-
.../apache/cxf/jaxrs/resources/BookInterface.java | 10 +-
.../org/apache/cxf/jaxrs/resources/BookStore.java | 16 +-
.../jaxrs/resources/BookStoreSubresourcesOnly.java | 4 +-
.../apache/cxf/jaxrs/resources/BookSuperClass.java | 10 +-
.../org/apache/cxf/jaxrs/resources/Chapter.java | 2 +-
.../org/apache/cxf/jaxrs/resources/SuperBook.java | 2 +-
.../apache/cxf/jaxrs/resources/SuperBookStore.java | 16 +-
rt/rs/description-common-openapi/pom.xml | 4 +-
.../common/openapi/DefaultApplicationFactory.java | 3 +-
.../common/openapi/DelegatingServletConfig.java | 4 +-
.../common/openapi/SyntheticServletConfig.java | 4 +-
.../microprofile/openapi/OpenApiEndpoint.java | 9 +-
.../jaxrs/microprofile/openapi/OpenApiFeature.java | 3 +-
rt/rs/description-openapi-v3/pom.xml | 10 +-
.../apache/cxf/jaxrs/openapi/JaxRs2Extension.java | 20 +-
.../jaxrs/openapi/OpenApiCustomizedResource.java | 22 +-
.../cxf/jaxrs/openapi/OpenApiCustomizer.java | 3 +-
.../apache/cxf/jaxrs/openapi/OpenApiFeature.java | 16 +-
.../cxf/jaxrs/openapi/ServletConfigProvider.java | 5 +-
rt/rs/description-swagger-ui/pom.xml | 2 +-
.../jaxrs/swagger/ui/SwaggerUiResourceFilter.java | 14 +-
.../cxf/jaxrs/swagger/ui/SwaggerUiService.java | 19 +-
.../jaxrs/swagger/ui/SwaggerUiServiceFilter.java | 14 +-
rt/rs/description-swagger/pom.xml | 6 +-
.../cxf/jaxrs/swagger/ApplicationBeanConfig.java | 2 +-
.../apache/cxf/jaxrs/swagger/JaxRs2Extension.java | 20 +-
.../jaxrs/swagger/Swagger2ApiListingResource.java | 10 +-
.../apache/cxf/jaxrs/swagger/Swagger2Feature.java | 19 +-
.../openapi/SwaggerToOpenApiConversionFilter.java | 13 +-
rt/rs/description/pom.xml | 4 +-
.../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 47 ++--
.../apache/cxf/jaxrs/model/wadl/AbstractStore.java | 4 +-
.../apache/cxf/jaxrs/model/wadl/BookChapters.java | 8 +-
.../org/apache/cxf/jaxrs/model/wadl/BookStore.java | 41 ++-
.../jaxrs/model/wadl/BookStoreWithSingleSlash.java | 13 +-
.../org/apache/cxf/jaxrs/model/wadl/Chapter.java | 11 +-
.../apache/cxf/jaxrs/model/wadl/FormInterface.java | 19 +-
.../org/apache/cxf/jaxrs/model/wadl/Orders.java | 6 +-
.../model/wadl/ServerProviderFactoryTest.java | 7 +-
.../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 7 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 17 +-
.../org/apache/cxf/jaxrs/model/wadl/jaxb/Book.java | 17 +-
.../apache/cxf/jaxrs/model/wadl/jaxb/Chapter.java | 11 +-
.../cxf/jaxrs/model/wadl/jaxb/ObjectFactory.java | 7 +-
.../jaxrs/model/wadl/jaxb/packageinfo/Book2.java | 2 +-
.../model/wadl/jaxb/packageinfo/package-info.java | 4 +-
.../cxf/jaxrs/model/wadl/petstore/PetStore.java | 12 +-
rt/rs/extensions/providers/pom.xml | 20 +-
.../provider/aegis/AbstractAegisProvider.java | 11 +-
.../jaxrs/provider/aegis/AegisElementProvider.java | 10 +-
.../cxf/jaxrs/provider/dom4j/DOM4JProvider.java | 19 +-
.../cxf/jaxrs/provider/json/JSONProvider.java | 24 +-
.../jaxrs/provider/json/JsonMapObjectProvider.java | 17 +-
.../provider/json/SimpleTypeJsonProvider.java | 19 +-
.../jsonp/AbstractJsonpOutInterceptor.java | 3 +-
.../jsonp/JsonpJaxrsWriterInterceptor.java | 7 +-
.../provider/jsonp/JsonpPreStreamInterceptor.java | 9 +-
.../jaxrs/provider/jsrjsonb/JsrJsonbProvider.java | 23 +-
.../jaxrs/provider/jsrjsonp/JsrJsonpProvider.java | 31 ++-
.../cxf/jaxrs/provider/ProviderFactoryAllTest.java | 7 +-
.../provider/aegis/AegisElementProviderTest.java | 7 +-
.../jaxrs/provider/dom4j/DOM4JProviderTest.java | 7 +-
.../cxf/jaxrs/provider/json/JSONProviderTest.java | 36 +--
.../jaxrs/provider/jsonp/JsonpInterceptorTest.java | 3 +-
.../provider/jsrjsonb/JsrJsonbProviderTest.java | 5 +-
.../provider/jsrjsonp/JsrJsonpProviderTest.java | 14 +-
.../java/org/apache/cxf/jaxrs/resources/Book.java | 8 +-
.../cxf/jaxrs/resources/CollectionsResource.java | 4 +-
.../org/apache/cxf/jaxrs/resources/ManyTags.java | 2 +-
.../org/apache/cxf/jaxrs/resources/SuperBook.java | 2 +-
.../java/org/apache/cxf/jaxrs/resources/TagVO.java | 4 +-
.../org/apache/cxf/jaxrs/resources/TagVO2.java | 2 +-
.../java/org/apache/cxf/jaxrs/resources/Tags.java | 5 +-
.../org/apache/cxf/jaxrs/resources/jaxb/Book2.java | 2 +-
.../jaxrs/resources/jaxb/Book2NoRootElement.java | 2 +-
.../cxf/jaxrs/resources/jaxb/package-info.java | 4 +-
.../server/AbstractReactiveInvoker.java | 5 +-
.../reactivestreams/server/AbstractSubscriber.java | 3 +-
.../server/JsonStreamingAsyncSubscriber.java | 2 +-
.../server/ResponseStatusOnlyExceptionMapper.java | 7 +-
.../server/StreamingAsyncSubscriber.java | 5 +-
.../cxf/jaxrs/reactor/client/ReactorInvoker.java | 9 +-
.../jaxrs/reactor/client/ReactorInvokerImpl.java | 9 +-
.../reactor/client/ReactorInvokerProvider.java | 7 +-
.../cxf/jaxrs/rx/client/ObservableRxInvoker.java | 9 +-
.../jaxrs/rx/client/ObservableRxInvokerImpl.java | 9 +-
.../rx/client/ObservableRxInvokerProvider.java | 7 +-
.../cxf/jaxrs/rx2/client/FlowableRxInvoker.java | 8 +-
.../jaxrs/rx2/client/FlowableRxInvokerImpl.java | 10 +-
.../rx2/client/FlowableRxInvokerProvider.java | 6 +-
.../cxf/jaxrs/rx2/client/ObservableRxInvoker.java | 8 +-
.../jaxrs/rx2/client/ObservableRxInvokerImpl.java | 10 +-
.../rx2/client/ObservableRxInvokerProvider.java | 6 +-
.../cxf/jaxrs/rx3/client/FlowableRxInvoker.java | 8 +-
.../jaxrs/rx3/client/FlowableRxInvokerImpl.java | 10 +-
.../rx3/client/FlowableRxInvokerProvider.java | 6 +-
.../cxf/jaxrs/rx3/client/ObservableRxInvoker.java | 8 +-
.../jaxrs/rx3/client/ObservableRxInvokerImpl.java | 10 +-
.../rx3/client/ObservableRxInvokerProvider.java | 6 +-
rt/rs/extensions/search/pom.xml | 22 +-
.../ext/search/DefaultParamConverterProvider.java | 5 +-
.../cxf/jaxrs/ext/search/ParamConverterUtils.java | 4 +-
.../cxf/jaxrs/ext/search/QueryContextProvider.java | 3 +-
.../cxf/jaxrs/ext/search/SearchContextImpl.java | 3 +-
.../jaxrs/ext/search/SearchContextProvider.java | 3 +-
.../search/jpa/AbstractJPATypedQueryVisitor.java | 21 +-
.../ext/search/jpa/JPACriteriaQueryVisitor.java | 18 +-
.../jaxrs/ext/search/jpa/JPATypedQueryVisitor.java | 4 +-
.../ext/search/tika/LuceneDocumentMetadata.java | 3 +-
.../ext/search/tika/TikaContentExtractor.java | 12 +-
.../search/tika/TikaLuceneContentExtractor.java | 3 +-
.../visitor/AbstractSearchConditionVisitor.java | 3 +-
.../java/org/apache/cxf/jaxrs/ext/search/Book.java | 4 +-
.../jpa/AbstractJPATypedQueryVisitorTest.java | 15 +-
.../org/apache/cxf/jaxrs/ext/search/jpa/Book.java | 12 +-
.../cxf/jaxrs/ext/search/jpa/BookReview.java | 8 +-
.../org/apache/cxf/jaxrs/ext/search/jpa/Book_.java | 6 +-
.../search/jpa/JPATypedQueryVisitorFiqlTest.java | 3 +-
.../search/jpa/JPATypedQueryVisitorODataTest.java | 3 +-
.../apache/cxf/jaxrs/ext/search/jpa/Library.java | 6 +-
.../org/apache/cxf/jaxrs/ext/search/jpa/Name.java | 4 +-
.../cxf/jaxrs/ext/search/jpa/OwnerAddress.java | 2 +-
.../apache/cxf/jaxrs/ext/search/jpa/OwnerInfo.java | 4 +-
...=> jakarta.servlet.ServletContainerInitializer} | 0
rt/rs/http-sci/pom.xml | 2 +-
.../sci/JaxrsServletContainerInitializer.java | 25 +-
rt/rs/microprofile-client/pom.xml | 2 +-
.../client/CxfTypeSafeClientBuilder.java | 6 +-
.../client/DefaultResponseExceptionMapper.java | 9 +-
.../microprofile/client/MPRestClientCallback.java | 3 +-
.../client/MicroProfileClientConfigurableImpl.java | 19 +-
.../client/MicroProfileClientFactoryBean.java | 9 +-
.../client/MicroProfileClientProviderFactory.java | 5 +-
.../client/MicroProfileServiceFactoryBean.java | 3 +-
.../apache/cxf/microprofile/client/Validator.java | 7 +-
.../cxf/microprofile/client/cdi/CDIFacade.java | 2 +-
.../client/cdi/CDIInterceptorWrapperImpl.java | 13 +-
.../cxf/microprofile/client/cdi/CDIUtils.java | 9 +-
.../client/cdi/InterceptorInvoker.java | 6 +-
.../cdi/MPRestClientInvocationContextImpl.java | 2 +-
.../microprofile/client/cdi/RestClientBean.java | 20 +-
.../client/cdi/RestClientExtension.java | 15 +-
.../client/proxy/MicroProfileClientProxyImpl.java | 11 +-
.../client/spi/CxfRestClientBuilderResolver.java | 3 +-
.../microprofile/client/sse/SseEventBuilder.java | 14 +-
.../client/sse/SseMessageBodyReader.java | 19 +-
.../cxf/microprofile/client/sse/SsePublisher.java | 5 +-
.../microprofile/client/sse/SseSubscription.java | 3 +-
.../client/sse/SseTypeSafeProcessor.java | 5 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../client/CxfTypeSafeClientBuilderTest.java | 11 +-
.../client/MPRestClientCallbackTest.java | 3 +-
.../client/MicroProfileClientFactoryBeanTest.java | 5 +-
.../cxf/microprofile/client/ValidatorTest.java | 21 +-
.../microprofile/client/cdi/RestClientCdiTest.java | 19 +-
.../cxf/microprofile/client/mock/AsyncClient.java | 8 +-
.../client/mock/EchoClientReqFilter.java | 8 +-
.../client/mock/ExceptionMappingClient.java | 6 +-
.../mock/HeaderCaptureClientRequestFilter.java | 8 +-
.../client/mock/HeadersFactoryClient.java | 7 +-
.../client/mock/HeadersOnInterfaceClient.java | 5 +-
.../client/mock/HeadersOnMethodClient.java | 5 +-
.../client/mock/HighPriorityClientReqFilter.java | 8 +-
.../microprofile/client/mock/HighPriorityMBW.java | 10 +-
.../mock/InvokedMethodClientRequestFilter.java | 10 +-
.../client/mock/LowPriorityClientReqFilter.java | 8 +-
.../cxf/microprofile/client/mock/MyClient.java | 6 +-
.../client/mock/MyClientHeadersFactory.java | 5 +-
.../client/mock/NotFoundClientReqFilter.java | 8 +-
.../client/mock/NotFoundExceptionMapper.java | 5 +-
.../client/sse/SseSubscriptionTest.java | 7 +-
rt/rs/pom.xml | 14 +-
rt/rs/security/cors/pom.xml | 2 +-
.../cors/CrossOriginResourceSharingFilter.java | 29 +-
.../filters/AbstractSignatureInFilter.java | 5 +-
.../filters/AbstractSignatureOutFilter.java | 3 +-
.../filters/CreateSignatureInterceptor.java | 27 +-
.../filters/VerifySignatureClientFilter.java | 13 +-
.../filters/VerifySignatureFilter.java | 13 +-
.../security/httpsignature/SpecExamplesTest.java | 11 +-
rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 4 +-
.../jose/jaxrs/AbstractJweDecryptingFilter.java | 3 +-
.../jaxrs/AbstractJweJsonDecryptingFilter.java | 3 +-
.../jose/jaxrs/AbstractJwsJsonReaderProvider.java | 3 +-
.../jose/jaxrs/AbstractJwsReaderProvider.java | 3 +-
.../jaxrs/AbstractJwtAuthenticationFilter.java | 11 +-
.../cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java | 5 +-
.../security/jose/jaxrs/JsonWebKeysProvider.java | 11 +-
.../jose/jaxrs/JweClientResponseFilter.java | 13 +-
.../jose/jaxrs/JweContainerRequestFilter.java | 11 +-
.../jose/jaxrs/JweJsonClientResponseFilter.java | 13 +-
.../jose/jaxrs/JweJsonContainerRequestFilter.java | 11 +-
.../jose/jaxrs/JweJsonWriterInterceptor.java | 11 +-
.../security/jose/jaxrs/JweWriterInterceptor.java | 11 +-
.../jose/jaxrs/JwsClientResponseFilter.java | 13 +-
.../jose/jaxrs/JwsContainerRequestFilter.java | 11 +-
.../jose/jaxrs/JwsDetachedSignatureProvider.java | 9 +-
.../jose/jaxrs/JwsJsonClientResponseFilter.java | 13 +-
.../jose/jaxrs/JwsJsonContainerRequestFilter.java | 11 +-
.../jose/jaxrs/JwsJsonWriterInterceptor.java | 11 +-
.../security/jose/jaxrs/JwsWriterInterceptor.java | 13 +-
.../jose/jaxrs/JwtAuthenticationClientFilter.java | 11 +-
.../jose/jaxrs/JwtAuthenticationFilter.java | 5 +-
.../jose/jaxrs/JwtCookieAuthenticationFilter.java | 5 +-
.../AbstractJwsMultipartVerificationFilter.java | 3 +-
.../multipart/JwsMultipartClientRequestFilter.java | 9 +-
.../JwsMultipartClientResponseFilter.java | 9 +-
.../JwsMultipartContainerRequestFilter.java | 9 +-
.../JwsMultipartContainerResponseFilter.java | 11 +-
.../multipart/JwsMultipartSignatureOutFilter.java | 3 +-
.../oauth2/auth/saml/Saml2BearerAuthHandler.java | 7 +-
.../auth/saml/Saml2BearerAuthOutInterceptor.java | 3 +-
.../grants/saml/AbstractSaml2BearerGrant.java | 3 +-
.../oauth2/grants/saml/Saml2BearerGrant.java | 3 +-
.../grants/saml/Saml2BearerGrantHandler.java | 3 +-
.../saml/SamlBearerClientCredentialsGrant.java | 3 +-
.../security/oauth2/saml/SamlOAuthValidator.java | 8 +-
rt/rs/security/oauth-parent/oauth2/pom.xml | 25 +-
.../oauth2/client/AccessTokenClientFilter.java | 7 +-
.../oauth2/client/AccessTokenGrantWriter.java | 13 +-
.../oauth2/client/ClientCodeRequestFilter.java | 25 +-
.../oauth2/client/ClientCodeStateManager.java | 3 +-
.../security/oauth2/client/ClientTokenContext.java | 3 +-
.../oauth2/client/ClientTokenContextImpl.java | 3 +-
.../oauth2/client/JoseClientCodeStateManager.java | 3 +-
.../client/MemoryClientCodeStateManager.java | 3 +-
.../security/oauth2/client/OAuthClientUtils.java | 17 +-
.../rs/security/oauth2/client/OAuthInvoker.java | 3 +-
.../cxf/rs/security/oauth2/common/AccessToken.java | 12 +-
.../security/oauth2/common/AccessTokenGrant.java | 2 +-
.../oauth2/common/AccessTokenValidation.java | 2 +-
.../cxf/rs/security/oauth2/common/Client.java | 18 +-
.../oauth2/common/OAuthAuthorizationData.java | 3 +-
.../rs/security/oauth2/common/OAuthPermission.java | 14 +-
.../security/oauth2/common/ServerAccessToken.java | 15 +-
.../cxf/rs/security/oauth2/common/UserSubject.java | 15 +-
.../filters/AccessTokenIntrospectionClient.java | 5 +-
.../oauth2/filters/AccessTokenValidatorClient.java | 5 +-
.../filters/JwsJwksJwtAccessTokenValidator.java | 3 +-
.../oauth2/filters/JwtAccessTokenValidator.java | 3 +-
.../oauth2/filters/OAuthRequestFilter.java | 23 +-
.../security/oauth2/filters/OAuthScopesFilter.java | 11 +-
.../rs/security/oauth2/grants/AbstractGrant.java | 3 +-
.../oauth2/grants/AbstractGrantHandler.java | 5 +-
.../grants/clientcred/ClientCredentialsGrant.java | 3 +-
.../clientcred/ClientCredentialsGrantHandler.java | 3 +-
.../oauth2/grants/code/AuthorizationCodeGrant.java | 9 +-
.../grants/code/AuthorizationCodeGrantHandler.java | 3 +-
.../oauth2/grants/code/JPACMTCodeDataProvider.java | 9 +-
.../oauth2/grants/code/JPACodeDataProvider.java | 7 +-
.../oauth2/grants/code/JwtRequestCodeFilter.java | 3 +-
.../oauth2/grants/code/JwtRequestCodeGrant.java | 3 +-
.../grants/code/ServerAuthorizationCodeGrant.java | 13 +-
.../oauth2/grants/jwt/AbstractJwtBearerGrant.java | 3 +-
.../oauth2/grants/jwt/JwtBearerAuthHandler.java | 9 +-
.../jwt/JwtBearerClientCredentialsGrant.java | 3 +-
.../security/oauth2/grants/jwt/JwtBearerGrant.java | 2 +-
.../oauth2/grants/jwt/JwtBearerGrantHandler.java | 3 +-
.../oauth2/grants/owner/ResourceOwnerGrant.java | 3 +-
.../grants/owner/ResourceOwnerGrantHandler.java | 3 +-
.../oauth2/grants/refresh/RefreshTokenGrant.java | 3 +-
.../grants/refresh/RefreshTokenGrantHandler.java | 3 +-
.../oauth2/provider/AbstractOAuthDataProvider.java | 3 +-
.../oauth2/provider/AccessTokenGrantHandler.java | 3 +-
.../oauth2/provider/AccessTokenValidator.java | 3 +-
.../provider/AuthorizationRequestFilter.java | 3 +-
.../oauth2/provider/DefaultSubjectCreator.java | 3 +-
.../oauth2/provider/JPAOAuthDataProvider.java | 9 +-
.../oauth2/provider/JoseSessionTokenProvider.java | 3 +-
.../oauth2/provider/OAuthContextProvider.java | 3 +-
.../oauth2/provider/OAuthJSONProvider.java | 17 +-
.../provider/OAuthServiceExceptionMapper.java | 4 +-
.../oauth2/provider/OOBResponseDeliverer.java | 3 +-
.../provider/SessionAuthenticityTokenProvider.java | 3 +-
.../security/oauth2/provider/SubjectCreator.java | 3 +-
.../services/AbstractAccessTokenValidator.java | 5 +-
.../services/AbstractImplicitGrantService.java | 3 +-
.../oauth2/services/AbstractOAuthService.java | 9 +-
.../oauth2/services/AbstractTokenService.java | 13 +-
.../oauth2/services/AccessTokenService.java | 17 +-
.../services/AccessTokenValidatorService.java | 19 +-
.../services/AuthorizationCodeGrantService.java | 9 +-
.../services/AuthorizationMetadataService.java | 15 +-
.../oauth2/services/AuthorizationService.java | 19 +-
.../services/DirectAuthorizationService.java | 13 +-
.../services/DynamicRegistrationService.java | 31 ++-
.../services/ImplicitConfidentialGrantService.java | 3 +-
.../oauth2/services/ImplicitGrantService.java | 5 +-
.../rs/security/oauth2/services/JwksService.java | 9 +-
.../services/RedirectionBasedGrantService.java | 19 +-
.../oauth2/services/TokenIntrospectionService.java | 19 +-
.../oauth2/services/TokenRevocationService.java | 13 +-
.../security/oauth2/services/WellKnownService.java | 2 +-
.../oauth2/tokens/bearer/BearerAccessToken.java | 3 +-
.../hawk/AbstractHawkAccessTokenValidator.java | 3 +-
.../tokens/hawk/HawkAccessTokenValidator.java | 3 +-
.../hawk/HawkAccessTokenValidatorClient.java | 3 +-
.../oauth2/tokens/refresh/RefreshToken.java | 9 +-
.../security/oauth2/utils/AuthorizationUtils.java | 5 +-
.../cxf/rs/security/oauth2/utils/OAuthUtils.java | 6 +-
.../oauth2/client/OAuthClientUtilsTest.java | 7 +-
.../oauth2/grants/TokenGrantHandlerTest.java | 5 +-
.../grants/code/JPACodeDataProviderTest.java | 5 +-
.../oauth2/grants/jwt/AbstractJwtHandlerTest.java | 3 +-
.../oauth2/provider/JPAOAuthDataProviderTest.java | 4 +-
.../oauth2/provider/OAuthJSONProviderTest.java | 3 +-
.../oauth2/provider/TestingUserSubject.java | 3 +-
.../tokens/hawk/HawkAccessTokenValidatorTest.java | 5 +-
.../oauth2/utils/AuthorizationUtilsTest.java | 7 +-
.../oauth2/utils/crypto/CryptoUtilsTest.java | 2 +-
rt/rs/security/sso/oidc/pom.xml | 21 +-
.../oidc/idp/OidcAuthorizationCodeService.java | 5 +-
.../oidc/idp/OidcConfigurationService.java | 13 +-
.../rs/security/oidc/idp/OidcHybridService.java | 3 +-
.../rs/security/oidc/idp/OidcImplicitService.java | 5 +-
.../cxf/rs/security/oidc/idp/OidcUserSubject.java | 9 +-
.../cxf/rs/security/oidc/idp/UserInfoService.java | 13 +-
.../oidc/rp/OidcClientCodeRequestFilter.java | 11 +-
.../security/oidc/rp/OidcIdTokenRequestFilter.java | 11 +-
.../oidc/rp/OidcRpAuthenticationFilter.java | 23 +-
.../oidc/rp/OidcRpAuthenticationService.java | 19 +-
.../rs/security/oidc/rp/OidcSecurityContext.java | 3 +-
.../cxf/rs/security/oidc/rp/UserInfoClient.java | 3 +-
.../cxf/rs/security/oidc/utils/OidcUtils.java | 9 +-
.../security/oidc/idp/JPAOidcUserSubjectTest.java | 5 +-
rt/rs/security/sso/saml/pom.xml | 8 +-
.../AbstractRequestAssertionConsumerHandler.java | 9 +-
.../rs/security/saml/sso/AbstractSSOSpHandler.java | 2 +-
.../saml/sso/AbstractServiceProviderFilter.java | 17 +-
.../cxf/rs/security/saml/sso/LogoutService.java | 15 +-
.../cxf/rs/security/saml/sso/MetadataService.java | 6 +-
.../saml/sso/RequestAssertionConsumerFilter.java | 17 +-
.../saml/sso/RequestAssertionConsumerService.java | 16 +-
.../saml/sso/SAMLProtocolResponseValidator.java | 6 +-
.../saml/sso/SAMLSSOResponseValidator.java | 13 +-
.../security/saml/sso/SamlPostBindingFilter.java | 6 +-
.../saml/sso/SamlRedirectBindingFilter.java | 8 +-
.../saml/sso/SamlpRequestComponentBuilder.java | 8 +-
.../saml/sso/state/HTTPSPStateManager.java | 16 +-
.../rs/security/saml/sso/state/RequestState.java | 6 +-
.../rs/security/saml/sso/state/ResponseState.java | 6 +-
.../saml/sso/AbstractSAMLCallbackHandler.java | 14 +-
.../security/saml/sso/CombinedValidatorTest.java | 9 +-
.../saml/sso/SAML2PResponseComponentBuilder.java | 8 +-
.../saml/sso/SAMLResponseValidatorTest.java | 23 +-
.../saml/sso/SAMLSSOResponseValidatorTest.java | 47 ++--
.../rs/security/saml/sso/SPStateManagerTest.java | 4 +-
.../rs/security/saml/AbstractSamlInHandler.java | 7 +-
.../rs/security/saml/SamlEnvelopedInHandler.java | 4 +-
.../cxf/rs/security/saml/SamlFormInHandler.java | 9 +-
.../rs/security/saml/SamlFormOutInterceptor.java | 7 +-
.../cxf/rs/security/saml/SamlHeaderInHandler.java | 7 +-
.../rs/security/xml/AbstractXmlSecInHandler.java | 2 +-
.../security/xml/AbstractXmlSecOutInterceptor.java | 4 +-
.../cxf/rs/security/xml/XmlEncInHandler.java | 7 +-
.../cxf/rs/security/xml/XmlSecInInterceptor.java | 8 +-
.../cxf/rs/security/xml/XmlSecOutInterceptor.java | 2 +-
.../cxf/rs/security/xml/XmlSigInHandler.java | 7 +-
rt/rs/sse/pom.xml | 2 +-
.../cxf/jaxrs/sse/OutboundSseEventBodyWriter.java | 15 +-
.../apache/cxf/jaxrs/sse/OutboundSseEventImpl.java | 6 +-
.../apache/cxf/jaxrs/sse/SseBroadcasterImpl.java | 12 +-
.../apache/cxf/jaxrs/sse/SseContextProvider.java | 3 +-
.../cxf/jaxrs/sse/SseEventSinkContextProvider.java | 11 +-
.../org/apache/cxf/jaxrs/sse/SseEventSinkImpl.java | 15 +-
.../java/org/apache/cxf/jaxrs/sse/SseImpl.java | 6 +-
.../cxf/jaxrs/sse/client/InboundSseEventImpl.java | 13 +-
.../jaxrs/sse/client/InboundSseEventListener.java | 2 +-
.../jaxrs/sse/client/InboundSseEventProcessor.java | 7 +-
.../sse/client/SseEventSourceBuilderImpl.java | 8 +-
.../cxf/jaxrs/sse/client/SseEventSourceImpl.java | 17 +-
.../cxf/jaxrs/sse/interceptor/SseInterceptor.java | 9 +-
...er => jakarta.ws.rs.sse.SseEventSource$Builder} | 0
.../cxf/jaxrs/sse/OutboundSseEventImplTest.java | 8 +-
.../cxf/jaxrs/sse/SseBroadcasterImplTest.java | 9 +-
.../jaxrs/sse/SseEventSinkContextProviderTest.java | 5 +-
.../jaxrs/sse/client/SseEventSourceImplTest.java | 27 +-
.../saml/xacml2/DefaultXACMLRequestBuilder.java | 5 +-
.../saml/xacml2/SamlRequestComponentBuilder.java | 4 +-
.../saml/xacml2/RequestComponentBuilderTest.java | 9 +-
rt/transports/http-hc/pom.xml | 2 +-
.../http/asyncclient/AsyncHTTPConduitTest.java | 11 +-
.../http/asyncclient/hc5/AsyncHTTPConduitTest.java | 11 +-
rt/transports/http-jetty/pom.xml | 10 +-
.../transport/http_jetty/JettyHTTPDestination.java | 21 +-
.../cxf/transport/http_jetty/JettyHTTPHandler.java | 9 +-
.../http_jetty/JettyHTTPServerEngine.java | 25 +-
.../http_jetty/JettyHTTPServerEngineFactory.java | 2 +-
.../JettyHTTPServerEngineFactoryHolder.java | 7 +-
.../continuations/JettyContinuationProvider.java | 69 -----
.../JettyContinuationProviderFactory.java | 76 ------
.../continuations/JettyContinuationWrapper.java | 159 -----------
.../JettyHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../http_jetty/spring/JettySpringTypesFactory.java | 8 +-
.../main/resources/META-INF/cxf/bus-extensions.txt | 1 -
.../resources/schemas/configuration/http-jetty.xsd | 4 +-
.../http_jetty/JettyHTTPDestinationTest.java | 14 +-
.../http_jetty/JettyHTTPServerEngineTest.java | 2 -
.../transport/http_jetty/JettyHTTPTestHandler.java | 7 +-
rt/transports/http-netty/netty-client/pom.xml | 4 +-
.../http/netty/client/NettyHttpConduitTest.java | 11 +-
.../netty/client/integration/NettyClientTest.java | 7 +-
.../client/integration/SSLNettyClientTest.java | 6 +-
rt/transports/http-netty/netty-server/pom.xml | 13 +-
.../http/netty/server/NettyHttpContextHandler.java | 9 +-
.../http/netty/server/NettyHttpDestination.java | 7 +-
.../http/netty/server/NettyHttpHandler.java | 9 +-
.../http/netty/server/NettyHttpServerEngine.java | 3 +-
.../netty/server/NettyHttpServerEngineFactory.java | 3 +-
.../NettyHttpServerEngineFactoryHolder.java | 9 +-
.../server/servlet/NettyHttpServletRequest.java | 100 ++++++-
.../netty/server/servlet/NettyHttpSession.java | 11 +-
.../netty/server/servlet/NettyServletContext.java | 191 ++++++++++++-
.../server/servlet/NettyServletInputStream.java | 17 +-
.../server/servlet/NettyServletOutputStream.java | 12 +-
.../netty/server/servlet/NettyServletResponse.java | 32 ++-
.../NettyHttpServerEngineBeanDefinitionParser.java | 5 +-
.../server/spring/NettySpringTypesFactory.java | 8 +-
.../schemas/configuration/http-netty-server.xsd | 4 +-
.../netty/server/NettyHttpDestinationTest.java | 14 +-
.../http/netty/server/NettyHttpTestHandler.java | 7 +-
.../netty/server/integration/NettyServerTest.java | 3 +-
.../server/integration/SSLNettyServerTest.java | 2 +-
.../integration/SSLNettySpringServerTest.java | 3 +-
rt/transports/http-undertow/pom.xml | 8 +-
.../http_undertow/CxfUndertowServlet.java | 13 +-
.../http_undertow/UndertowHTTPDestination.java | 7 +-
.../http_undertow/UndertowHTTPHandler.java | 9 +-
.../http_undertow/UndertowHTTPServerEngine.java | 4 +-
.../UndertowHTTPServerEngineFactory.java | 2 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 7 +-
...dertowHTTPServerEngineBeanDefinitionParser.java | 5 +-
.../spring/UndertowSpringTypesFactory.java | 8 +-
.../schemas/configuration/http-undertow.xsd | 4 +-
.../http_undertow/UndertowHTTPDestinationTest.java | 14 +-
rt/transports/http/pom.xml | 32 ++-
.../transport/http/AbstractHTTPDestination.java | 14 +-
.../http/ContinuationProviderFactory.java | 5 +-
.../transport/http/DestinationRegistryImpl.java | 5 +-
.../org/apache/cxf/transport/http/HTTPSession.java | 5 +-
.../transport/http/HTTPWSDLExtensionLoader.java | 3 +-
.../org/apache/cxf/transport/http/Headers.java | 5 +-
.../http/HttpAuthenticationFaultHandler.java | 3 +-
.../transport/http/HttpServletRequestSnapshot.java | 8 +-
.../http/Servlet3ContinuationProvider.java | 17 +-
.../http/osgi/HttpServiceTrackerCust.java | 3 +-
.../cxf/transport/http/osgi/ServletExporter.java | 3 +-
.../http/policy/HTTPClientAssertionBuilder.java | 2 +-
.../http/policy/HTTPServerAssertionBuilder.java | 2 +-
.../https/AliasedX509ExtendedKeyManager.java | 2 +-
.../cxf/transport/servlet/AbstractHTTPServlet.java | 27 +-
.../cxf/transport/servlet/BaseUrlHelper.java | 3 +-
.../cxf/transport/servlet/CXFNonSpringServlet.java | 21 +-
.../apache/cxf/transport/servlet/CXFServlet.java | 5 +-
.../cxf/transport/servlet/ServletConfigAware.java | 4 +-
.../servlet/ServletContextResourceResolver.java | 3 +-
.../cxf/transport/servlet/ServletController.java | 11 +-
.../servlet/blueprint/CXFBlueprintServlet.java | 3 +-
.../servicelist/ServiceListGeneratorServlet.java | 11 +-
.../servicelist/ServiceListJAASAuthenticator.java | 4 +-
.../resources/schemas/configuration/http-conf.xsd | 4 +-
.../src/main/resources/schemas/wsdl/http-conf.xjb | 4 +-
.../src/main/resources/schemas/wsdl/http-conf.xsd | 4 +-
.../org/apache/cxf/transport/http/HeadersTest.java | 3 +-
.../cxf/transport/https/CertConstraintsTest.java | 9 +-
.../cxf/transport/servlet/BaseUrlHelperTest.java | 2 +-
.../HttpServletRequestXForwardedFilterTest.java | 15 +-
.../transport/servlet/ServletControllerTest.java | 9 +-
rt/transports/jms/pom.xml | 48 ++--
.../cxf/transport/jms/BackChannelConduit.java | 25 +-
.../transport/jms/ConnectionFactoryFeature.java | 3 +-
.../org/apache/cxf/transport/jms/JMSConduit.java | 21 +-
.../apache/cxf/transport/jms/JMSConfigFactory.java | 6 +-
.../apache/cxf/transport/jms/JMSConfiguration.java | 14 +-
.../apache/cxf/transport/jms/JMSDestination.java | 17 +-
.../org/apache/cxf/transport/jms/JMSFactory.java | 7 +-
.../cxf/transport/jms/JMSMessageHeadersType.java | 11 +-
.../apache/cxf/transport/jms/JMSMessageUtils.java | 13 +-
.../cxf/transport/jms/SecurityContextFactory.java | 5 +-
.../apache/cxf/transport/jms/uri/JMSEndpoint.java | 5 +-
.../jms/util/AbstractMessageListenerContainer.java | 10 +-
.../transport/jms/util/DestinationResolver.java | 6 +-
.../transport/jms/util/JMSDestinationResolver.java | 7 +-
.../transport/jms/util/JMSMessageConverter.java | 20 +-
.../apache/cxf/transport/jms/util/JMSSender.java | 10 +-
.../org/apache/cxf/transport/jms/util/JMSUtil.java | 38 +--
.../jms/util/MessageListenerContainer.java | 16 +-
.../jms/util/PollingMessageListenerContainer.java | 23 +-
.../cxf/transport/jms/util/ResourceCloser.java | 9 +-
.../UserCredentialsConnectionFactoryAdapter.java | 26 +-
.../jms/wsdl11/JMSWSDLExtensionLoader.java | 3 +-
.../resources/schemas/wsdl/spec/jms-spec-wsdl.xjb | 4 +-
.../cxf/transport/jms/AbstractJMSTester.java | 74 +++--
...QueueTest.java => ConnectionTempQueueTest.java} | 99 +++----
.../cxf/transport/jms/JMSConfigFactoryTest.java | 5 +-
.../cxf/transport/jms/JMSDestinationTest.java | 140 +++++++---
.../cxf/transport/jms/JMSHeaderTypeTest.java | 35 +--
.../MessageIdAsCorrelationIdJMSConduitTest.java | 14 +-
.../cxf/transport/jms/ThrottlingCounterTest.java | 3 +-
.../cxf/transport/jms/uri/JMSEndpointTest.java | 10 +-
.../jms/uri/URIConfiguredConduitTest.java | 13 +-
.../apache/cxf/transport/jms/util/JMSUtilTest.java | 18 +-
.../transport/jms/util/MessageListenerTest.java | 214 +++++++++++----
.../cxf/transport/jms/util/TestReceiver.java | 20 +-
rt/transports/jms/src/test/resources/jms_test.wsdl | 8 +-
rt/transports/pom.xml | 14 +-
.../apache/cxf/transport/udp/UDPTransportTest.java | 3 +-
rt/transports/websocket/pom.xml | 28 +-
.../websocket/WebSocketDestinationService.java | 8 +-
.../websocket/atmosphere/AtmosphereUtils.java | 3 +-
.../AtmosphereWebSocketJettyDestination.java | 11 +-
.../AtmosphereWebSocketServletDestination.java | 13 +-
.../AtmosphereWebSocketUndertowDestination.java | 11 +-
.../atmosphere/DefaultProtocolInterceptor.java | 7 +-
.../websocket/jetty/JettyWebSocketHandler.java | 7 +-
.../websocket/jetty/WebSocketServletHolder.java | 4 +-
.../jetty/WebSocketVirtualServletRequest.java | 31 ++-
.../jetty/WebSocketVirtualServletResponse.java | 9 +-
.../jetty9/Jetty9WebSocketDestination.java | 11 +-
.../websocket/jetty9/JettyWebSocketHandler.java | 7 +-
.../undertow/UndertowWebSocketDestination.java | 9 +-
.../undertow/WebSocketUndertowServletRequest.java | 31 ++-
.../undertow/WebSocketUndertowServletResponse.java | 9 +-
rt/ws/addr/pom.xml | 4 +-
.../impl/AddressingWSDLExtensionLoader.java | 3 +-
.../ws/addressing/impl/InternalContextUtils.java | 10 +-
.../cxf/ws/addressing/impl/MAPAggregatorImpl.java | 2 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 8 +-
.../cxf/ws/addressing/soap/VersionTransformer.java | 6 +-
.../cxf/ws/addressing/impl/ContextUtilsTest.java | 2 +-
.../cxf/ws/addressing/impl/MAPAggregatorTest.java | 4 +-
.../cxf/ws/addressing/soap/MAPCodecTest.java | 6 +-
rt/ws/eventing/pom.xml | 10 +-
.../backend/database/SubscriptionTicket.java | 2 +-
.../backend/manager/SubscriptionManagerImpl.java | 2 +-
.../EventSinkInterfaceNotificationTask.java | 6 +-
.../backend/notification/FilteringInterceptor.java | 2 +-
.../eventing/backend/notification/WrappedSink.java | 15 +-
.../cxf/ws/eventing/client/EndToEndpoint.java | 11 +-
.../eventing/eventsource/AbstractEventSource.java | 5 +-
.../eventing/eventsource/EventSourceEndpoint.java | 13 +-
.../manager/AbstractSubscriptionManager.java | 5 +-
.../manager/SubscriptionManagerEndpoint.java | 15 +-
.../handlers/ReferenceParametersAddingHandler.java | 12 +-
.../SubscriptionReferenceParsingHandler.java | 8 +-
.../ws/eventing/shared/utils/FilteringUtil.java | 4 +-
.../src/main/resources/schemas/eventing.xjb | 2 +-
...ubscription-reference-parsing-handler-chain.xml | 2 +-
.../base/SimpleEventingIntegrationTest.java | 3 +-
.../eventing/base/services/TestingEventSource.java | 3 +-
.../base/services/TestingSubscriptionManager.java | 3 +-
.../ws/eventing/integration/NotificationTest.java | 2 +-
.../eventing/integration/SubscriptionEndTest.java | 2 +-
.../integration/SubscriptionGrantingTest.java | 2 +-
.../integration/SubscriptionManagementTest.java | 2 +-
.../eventsink/TestingEndToEndpointImpl.java | 3 +-
.../eventsink/TestingWrappedEventSinkImpl.java | 5 +-
.../notificationapi/CatastrophicEventSink.java | 12 +-
.../CatastrophicEventSinkWrapped.java | 13 +-
.../notificationapi/EarthquakeEvent.java | 2 +-
.../integration/notificationapi/FireEvent.java | 2 +-
.../ReferenceParametersAssertingHandler.java | 10 +-
.../assertions/WSAActionAssertingHandler.java | 8 +-
rt/ws/mex/pom.xml | 6 +-
.../java/org/apache/cxf/ws/mex/MEXEndpoint.java | 11 +-
.../org/apache/cxf/ws/mex/MetadataExchange.java | 16 +-
rt/ws/mex/src/main/model/binding-2004.xjb | 4 +-
rt/ws/mex/src/main/model/binding.xjb | 4 +-
.../test/java/org/apache/cxf/ws/mex/MEXTest.java | 5 +-
rt/ws/policy/pom.xml | 4 +-
.../ws/policy/AssertionBuilderRegistryImpl.java | 3 +-
.../org/apache/cxf/ws/policy/PolicyEngineImpl.java | 2 +-
.../PolicyInterceptorProviderRegistryImpl.java | 2 +-
.../external/DomainExpressionBuilderRegistry.java | 2 +-
.../EndpointReferenceDomainExpressionBuilder.java | 6 +-
.../cxf/ws/policy/builder/jaxb/JaxbAssertion.java | 6 +-
.../policy/builder/jaxb/JaxbAssertionBuilder.java | 8 +-
.../main/resources/schemas/ws-policy-200409.xjb | 4 +-
.../main/resources/schemas/ws-policy-200607.xjb | 4 +-
.../main/resources/schemas/ws-policy-200702.xjb | 4 +-
.../cxf/ws/policy/PolicyEngineImplInitTest.java | 4 +-
rt/ws/rm/pom.xml | 6 +-
.../java/org/apache/cxf/ws/rm/EncoderDecoder.java | 4 +-
.../apache/cxf/ws/rm/EncoderDecoder10AImpl.java | 10 +-
.../org/apache/cxf/ws/rm/EncoderDecoder10Impl.java | 10 +-
.../org/apache/cxf/ws/rm/EncoderDecoder11Impl.java | 10 +-
.../apache/cxf/ws/rm/RMCaptureInInterceptor.java | 4 +-
.../main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 4 +-
.../main/java/org/apache/cxf/ws/rm/RMManager.java | 6 +-
.../cxf/ws/rm/persistence/PersistenceUtils.java | 6 +-
.../cxf/ws/rm/policy/RM10AssertionBuilder.java | 2 +-
.../apache/cxf/ws/rm/soap/RMSoapInInterceptor.java | 4 +-
.../cxf/ws/rm/soap/RMSoapOutInterceptor.java | 5 +-
.../org/apache/cxf/ws/rm/v200502/package-info.java | 6 +-
.../cxf/ws/rm/v200502wsa15/package-info.java | 6 +-
.../org/apache/cxf/ws/rm/v200702/package-info.java | 6 +-
.../schemas/configuration/wsrm-policy.xjb | 4 +-
.../src/main/resources/schemas/wsdl/wsmc-1.1.xjb | 4 +-
.../main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb | 24 +-
.../src/main/resources/schemas/wsdl/wsrm-1.0.xjb | 24 +-
.../src/main/resources/schemas/wsdl/wsrm-1.1.xjb | 28 +-
.../ws/rm/persistence/PersistenceUtilsTest.java | 5 +-
.../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java | 6 +-
rt/ws/security/pom.xml | 13 +-
.../SecureConversationInInterceptor.java | 4 +-
.../SecureConversationOutInterceptor.java | 8 +-
.../SpnegoContextTokenOutInterceptor.java | 4 +-
.../sts/provider/SecurityTokenService.java | 15 +-
.../sts/provider/SecurityTokenServiceImpl.java | 11 +-
.../sts/provider/SecurityTokenServiceProvider.java | 22 +-
.../ws/security/trust/STSStaxTokenValidator.java | 2 +-
.../cxf/ws/security/trust/STSTokenRetriever.java | 4 +-
.../org/apache/cxf/ws/security/trust/STSUtils.java | 2 +-
...ractUsernameTokenAuthenticatingInterceptor.java | 2 +-
.../security/wss4j/AttachmentCallbackHandler.java | 2 +-
.../ws/security/wss4j/CryptoCoverageChecker.java | 6 +-
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 2 +-
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 5 +-
.../security/wss4j/StaxCryptoCoverageChecker.java | 2 +-
.../cxf/ws/security/wss4j/StaxSerializer.java | 4 +-
.../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 4 +-
.../cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 3 +-
.../policyhandlers/AbstractBindingBuilder.java | 6 +-
.../policyhandlers/AbstractStaxBindingHandler.java | 2 +-
.../policyhandlers/AsymmetricBindingHandler.java | 4 +-
.../StaxAsymmetricBindingHandler.java | 2 +-
.../StaxSymmetricBindingHandler.java | 2 +-
.../StaxTransportBindingHandler.java | 2 +-
.../policyhandlers/SymmetricBindingHandler.java | 4 +-
.../policyhandlers/TransportBindingHandler.java | 4 +-
.../AbstractSupportingTokenPolicyValidator.java | 4 +-
rt/ws/security/src/main/model/binding.xjb | 4 +-
rt/ws/security/src/main/model/binding14.xjb | 4 +-
rt/ws/security/src/main/model/xmlsig.xjb | 4 +-
.../apache/cxf/ws/security/sts/STSClientTest.java | 6 +-
.../security/wss4j/AbstractPolicySecurityTest.java | 2 +-
.../ws/security/wss4j/AbstractSecurityTest.java | 8 +-
.../wss4j/AttachmentCallbackHandlerTest.java | 4 +-
.../ws/security/wss4j/DOMToStaxRoundTripTest.java | 8 +-
.../org/apache/cxf/ws/security/wss4j/Echo.java | 6 +-
.../org/apache/cxf/ws/security/wss4j/EchoImpl.java | 2 +-
.../security/wss4j/SignatureConfirmationTest.java | 3 +-
.../wss4j/StaxCryptoCoverageCheckerTest.java | 12 +-
.../ws/security/wss4j/StaxRoundTripActionTest.java | 12 +-
.../cxf/ws/security/wss4j/StaxRoundTripTest.java | 16 +-
.../ws/security/wss4j/StaxToDOMRoundTripTest.java | 18 +-
.../wss4j/UserNameTokenAuthorizationTest.java | 3 +-
.../cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 4 +-
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 2 +-
.../ws/security/wss4j/WSS4JOutInterceptorTest.java | 3 +-
.../ws/security/wss4j/saml/DOMToStaxSamlTest.java | 6 +-
.../cxf/ws/security/wss4j/saml/SamlTokenTest.java | 2 +-
.../ws/security/wss4j/saml/StaxToDOMSamlTest.java | 12 +-
.../transfer/dialect/fragment/FragmentDialect.java | 7 +-
.../ws/transfer/manager/MemoryResourceManager.java | 6 +-
.../apache/cxf/ws/transfer/resource/Resource.java | 15 +-
.../cxf/ws/transfer/resource/ResourceLocal.java | 5 +-
.../transfer/resourcefactory/ResourceFactory.java | 15 +-
.../XSDResourceTypeIdentifier.java | 4 +-
.../XSDResourceValidator.java | 4 +-
.../XSLTResourceTransformer.java | 4 +-
.../handler-chains/reference-parameter-parsing.xml | 2 +-
.../src/main/resources/schemas/transfer.xjb | 2 +-
.../transfer/integration/FragmentGetQNameTest.java | 4 +-
.../integration/FragmentGetXPath10Test.java | 2 +-
.../transfer/integration/FragmentPutAddTest.java | 2 +-
.../integration/FragmentPutInsertAfterTest.java | 2 +-
.../integration/FragmentPutInsertBeforeTest.java | 2 +-
.../integration/FragmentPutReplaceTest.java | 2 +-
.../transfer/integration/IntegrationBaseTest.java | 2 +-
.../cxf/ws/transfer/integration/ResourceTest.java | 3 +-
rt/wsdl/pom.xml | 4 +-
.../apache/cxf/wsdl/ExtensionClassGenerator.java | 2 +-
.../org/apache/cxf/wsdl/JAXBExtensionHelper.java | 28 +-
.../apache/cxf/wsdl/TExtensibilityElementImpl.java | 5 +-
.../factory/ReflectionServiceFactoryBean.java | 20 +-
.../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 2 +-
.../src/test/resources/schemas/wsdl/test-conf.xjb | 4 +-
services/sts/sts-core/pom.xml | 7 +-
.../org/apache/cxf/sts/event/map/EventMapper.java | 3 +-
.../cxf/sts/operation/AbstractOperation.java | 2 +-
.../cxf/sts/operation/TokenCancelOperation.java | 3 +-
.../cxf/sts/operation/TokenIssueOperation.java | 3 +-
.../cxf/sts/operation/TokenRenewOperation.java | 3 +-
.../operation/TokenRequestCollectionOperation.java | 2 +-
.../cxf/sts/operation/TokenValidateOperation.java | 3 +-
.../org/apache/cxf/sts/request/ReceivedToken.java | 2 +-
.../org/apache/cxf/sts/request/RequestParser.java | 2 +-
.../cxf/sts/rest/RESTSecurityTokenService.java | 21 +-
.../cxf/sts/rest/RESTSecurityTokenServiceImpl.java | 9 +-
.../cxf/sts/token/provider/SAMLTokenProvider.java | 10 +-
.../cxf/sts/token/provider/TokenProviderUtils.java | 2 +-
.../cxf/sts/token/renewer/SAMLTokenRenewer.java | 22 +-
.../sts/token/validator/SAMLTokenValidator.java | 15 +-
.../token/validator/UsernameTokenValidator.java | 8 +-
.../sts/claims/mapper/JexlIssueSamlClaimsTest.java | 2 +-
.../cxf/sts/operation/CancelSCTUnitTest.java | 2 +-
.../cxf/sts/operation/IssueEncryptedUnitTest.java | 3 +-
.../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 2 +-
.../sts/operation/IssueJWTOnbehalfofUnitTest.java | 2 +-
.../cxf/sts/operation/IssueJWTRealmUnitTest.java | 2 +-
.../apache/cxf/sts/operation/IssueJWTUnitTest.java | 2 +-
.../cxf/sts/operation/IssueOnbehalfofUnitTest.java | 2 +-
.../apache/cxf/sts/operation/IssueSCTUnitTest.java | 2 +-
.../cxf/sts/operation/IssueSamlClaimsUnitTest.java | 2 +-
.../cxf/sts/operation/IssueSamlRealmUnitTest.java | 2 +-
.../cxf/sts/operation/IssueSamlUnitTest.java | 2 +-
.../apache/cxf/sts/operation/IssueUnitTest.java | 3 +-
.../cxf/sts/operation/RenewSamlUnitTest.java | 2 +-
.../operation/ValidateJWTTransformationTest.java | 2 +-
.../cxf/sts/operation/ValidateJWTUnitTest.java | 2 +-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 2 +-
.../cxf/sts/operation/ValidateSamlUnitTest.java | 2 +-
.../ValidateTokenTransformationUnitTest.java | 2 +-
.../apache/cxf/sts/operation/ValidateUnitTest.java | 2 +-
.../operation/ValidateUsernameTokenUnitTest.java | 2 +-
.../sts/operation/ValidateX509TokenUnitTest.java | 2 +-
.../cxf/sts/request/RequestParserUnitTest.java | 6 +-
.../sts/token/provider/JWTProviderActAsTest.java | 3 +-
.../token/provider/JWTProviderOnBehalfOfTest.java | 3 +-
.../sts/token/provider/SAMLProviderActAsTest.java | 3 +-
.../token/provider/SAMLProviderOnBehalfOfTest.java | 3 +-
.../validator/UsernameTokenValidatorTest.java | 2 +-
.../token/validator/X509TokenValidatorTest.java | 3 +-
services/sts/systests/advanced/pom.xml | 5 +-
.../sts/basic_auth/DoubleItPortTypeImpl.java | 3 +-
.../systest/sts/basic_auth/JaxrsBasicAuthTest.java | 3 +-
.../systest/sts/basic_auth/JaxwsBasicAuthTest.java | 4 +-
.../BinarySecurityTokenTest.java | 4 +-
.../cxf/systest/sts/caching/CachingTest.java | 6 +-
.../systest/sts/caching/DoubleItPortTypeImpl.java | 9 +-
.../cxf/systest/sts/caching/ServerCachingTest.java | 4 +-
.../apache/cxf/systest/sts/claims/ClaimsTest.java | 4 +-
.../systest/sts/common/DoubleItPortTypeImpl.java | 7 +-
.../cxf/systest/sts/common/SecurityTestUtil.java | 3 +-
.../systest/sts/cross_domain/CrossDomainTest.java | 4 +-
.../systest/sts/custom/CustomParameterTest.java | 8 +-
.../cxf/systest/sts/custom/CustomUTValidator.java | 4 +-
.../custom_onbehalfof/CustomOnBehalfOfTest.java | 4 +-
.../DistributedCachingTest.java | 2 +-
.../cxf/systest/sts/jwt/DoubleItPortTypeImpl.java | 3 +-
.../apache/cxf/systest/sts/jwt/JaxrsJWTTest.java | 7 +-
.../systest/sts/kerberos/DoubleItPortTypeImpl.java | 7 +-
.../sts/kerberos/IntermediaryPortTypeImpl.java | 12 +-
.../kerberos/JAXRSIntermediaryPortTypeImpl.java | 6 +-
.../sts/kerberos/KerberosDelegationTokenTest.java | 4 +-
.../cxf/systest/sts/realms/DifferentRealmTest.java | 2 +-
.../cxf/systest/sts/renew/SAMLRenewTest.java | 4 +-
.../sts/secure_conv/SecureConversationTest.java | 2 +-
.../apache/cxf/systest/sts/soap12/Soap12Test.java | 4 +-
.../sts_sender_vouches/STSSenderVouchesTest.java | 4 +-
.../sts/transformation/DoubleItPortTypeImpl.java | 9 +-
.../sts/transformation/TransformationTest.java | 2 +-
.../sts/usernametoken/UsernameTokenTest.java | 6 +-
.../org/apache/cxf/systest/sts/custom/cxf-sts.xml | 2 +-
services/sts/systests/basic/pom.xml | 5 +-
.../sts/asymmetric/AsymmetricBindingTest.java | 4 +-
.../apache/cxf/systest/sts/bearer/BearerTest.java | 4 +-
.../systest/sts/common/DoubleItPortTypeImpl.java | 7 +-
.../cxf/systest/sts/common/SecurityTestUtil.java | 3 +-
.../cxf/systest/sts/common/TokenTestUtils.java | 2 +-
.../DoubleItPortTypeImpl.java | 7 +-
.../IntermediaryCachingPortTypeImpl.java | 10 +-
.../IntermediaryPortTypeImpl.java | 10 +-
.../IntermediaryTransformationCachingTest.java | 6 +-
.../IntermediaryTransformationTest.java | 4 +-
.../apache/cxf/systest/sts/issuer/IssuerTest.java | 2 +-
.../cxf/systest/sts/jaas/DoubleItPortTypeImpl.java | 3 +-
.../org/apache/cxf/systest/sts/jaas/JAASTest.java | 6 +-
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 6 +-
.../sts/sendervouches/DoubleItPortTypeImpl.java | 10 +-
.../sts/sendervouches/SenderVouchesTest.java | 2 +-
.../cxf/systest/sts/stsclient/STSClientTest.java | 2 +-
.../sts/symmetric/SymmetricBindingTest.java | 8 +-
.../cxf/systest/sts/template/TemplateTest.java | 4 +-
.../sts/transport/TransportBindingTest.java | 10 +-
.../username_actas/UsernameActAsCachingTest.java | 4 +-
.../sts/username_actas/UsernameActAsTest.java | 4 +-
.../UsernameOnBehalfOfCachingTest.java | 4 +-
.../UsernameOnBehalfOfTest.java | 4 +-
.../sts/x509/X509AsymmetricBindingTest.java | 4 +-
.../systest/sts/x509/X509SymmetricBindingTest.java | 4 +-
.../apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 2 +-
services/sts/systests/pom.xml | 12 +-
services/ws-discovery/ws-discovery-api/pom.xml | 6 +-
.../org/apache/cxf/ws/discovery/WSDVersion.java | 2 +-
.../apache/cxf/ws/discovery/WSDiscoveryClient.java | 28 +-
.../cxf/ws/discovery/WSDiscoveryService.java | 3 +-
.../discovery/internal/WSDiscoveryServiceImpl.java | 24 +-
.../cxf/ws/discovery/WSDiscoveryClientTest.java | 9 +-
services/wsn/pom.xml | 2 +-
services/wsn/wsn-api/pom.xml | 6 +-
.../java/org/apache/cxf/wsn/client/Consumer.java | 14 +-
.../org/apache/cxf/wsn/client/CreatePullPoint.java | 3 +-
.../apache/cxf/wsn/client/NotificationBroker.java | 8 +-
.../java/org/apache/cxf/wsn/client/Publisher.java | 10 +-
.../java/org/apache/cxf/wsn/client/PullPoint.java | 3 +-
.../org/apache/cxf/wsn/client/Referencable.java | 2 +-
.../org/apache/cxf/wsn/client/Registration.java | 3 +-
.../org/apache/cxf/wsn/client/Subscription.java | 3 +-
.../java/org/apache/cxf/wsn/util/CXFWSNHelper.java | 7 +-
.../java/org/apache/cxf/wsn/util/WSNHelper.java | 15 +-
services/wsn/wsn-core/pom.xml | 23 +-
.../apache/cxf/wsn/AbstractCreatePullPoint.java | 8 +-
.../java/org/apache/cxf/wsn/AbstractEndpoint.java | 4 +-
.../apache/cxf/wsn/AbstractNotificationBroker.java | 12 +-
.../java/org/apache/cxf/wsn/AbstractPublisher.java | 11 +-
.../java/org/apache/cxf/wsn/AbstractPullPoint.java | 11 +-
.../org/apache/cxf/wsn/AbstractSubscription.java | 12 +-
.../java/org/apache/cxf/wsn/EndpointManager.java | 4 +-
.../org/apache/cxf/wsn/jms/JmsCreatePullPoint.java | 5 +-
.../apache/cxf/wsn/jms/JmsNotificationBroker.java | 6 +-
.../java/org/apache/cxf/wsn/jms/JmsPublisher.java | 115 ++++----
.../java/org/apache/cxf/wsn/jms/JmsPullPoint.java | 20 +-
.../org/apache/cxf/wsn/jms/JmsSubscription.java | 20 +-
.../cxf/wsn/jms/JmsTopicExpressionConverter.java | 22 +-
.../cxf/wsn/services/JaxwsCreatePullPoint.java | 9 +-
.../cxf/wsn/services/JaxwsEndpointManager.java | 11 +-
.../cxf/wsn/services/JaxwsNotificationBroker.java | 9 +-
.../apache/cxf/wsn/services/JaxwsPublisher.java | 9 +-
.../apache/cxf/wsn/services/JaxwsPullPoint.java | 3 +-
.../apache/cxf/wsn/services/JaxwsSubscription.java | 3 +-
.../cxf/wsn/services/OSGiJaxwsEndpointManager.java | 2 +-
.../java/org/apache/cxf/wsn/services/Service.java | 2 +-
.../java/org/apache/cxf/wsn/WsnBrokerTest.java | 40 ++-
.../java/org/apache/cxf/wsn/types/CustomType.java | 10 +-
services/wsn/wsn-osgi/pom.xml | 8 +-
services/xkms/pom.xml | 12 +-
services/xkms/xkms-client/pom.xml | 5 +-
.../org/apache/cxf/xkms/client/XKMSInvoker.java | 2 +-
services/xkms/xkms-common/pom.xml | 10 +-
.../cxf/xkms/model/extensions/ResultDetails.java | 11 +-
.../xkms/xkms-common/src/main/model/binding.xjb | 4 +-
.../cxf/xkms/itests/BasicIntegrationTest.java | 3 +-
.../handlers/validator/ValidatorCRLTest.java | 3 +-
.../itests/handlers/validator/ValidatorTest.java | 5 +-
services/xkms/xkms-x509-handlers/pom.xml | 2 +-
.../apache/cxf/xkms/x509/handlers/X509Locator.java | 3 +-
.../cxf/xkms/x509/handlers/X509Register.java | 3 +-
.../org/apache/cxf/xkms/x509/utils/X509Utils.java | 2 +-
.../xkms/x509/validator/ValidateRequestParser.java | 3 +-
.../apache/cxf/xkms/x509/utils/X509UtilsTest.java | 5 +-
.../xkms/x509/validator/BasicValidationTest.java | 7 +-
.../cxf/xkms/x509/validator/DateValidatorTest.java | 5 +-
.../validator/TrustedAuthorityValidatorTest.java | 5 +-
systests/cdi/base/pom.xml | 8 +-
.../systests/cdi/base/AbstractCdiMultiAppTest.java | 9 +-
.../cdi/base/AbstractCdiSingleAppTest.java | 9 +-
.../cxf/systests/cdi/base/AtomFeedProvider.java | 14 +-
.../org/apache/cxf/systests/cdi/base/Book.java | 4 +-
.../apache/cxf/systests/cdi/base/BookStore.java | 27 +-
.../systests/cdi/base/BookStoreAuthenticator.java | 4 +-
.../cxf/systests/cdi/base/BookStoreByIds.java | 14 +-
.../base/BookStorePreMatchingRequestFilter.java | 14 +-
.../systests/cdi/base/BookStoreRequestFilter.java | 14 +-
.../systests/cdi/base/BookStoreResponseFilter.java | 12 +-
.../cxf/systests/cdi/base/BookStoreService.java | 6 +-
.../cxf/systests/cdi/base/BookStoreVersion.java | 13 +-
.../cxf/systests/cdi/base/BookStoreVersioned.java | 12 +-
.../systests/cdi/base/CustomScopedBookStore.java | 19 +-
.../apache/cxf/systests/cdi/base/Injections.java | 31 ++-
.../systests/cdi/base/RequestScopedBookStore.java | 21 +-
.../cxf/systests/cdi/base/bindings/Logged.java | 2 +-
.../systests/cdi/base/bindings/LoggingFilter.java | 6 +-
.../cdi/base/context/CustomContextFeature.java | 7 +-
.../cxf/systests/cdi/base/contract/BookStore.java | 14 +-
.../systests/cdi/base/contract/BookStoreImpl.java | 7 +-
.../cdi/base/jetty/AbstractJettyServer.java | 6 +-
.../cxf/systests/cdi/base/scope/CustomContext.java | 8 +-
.../cdi/base/scope/CustomScopeExtension.java | 10 +-
.../cxf/systests/cdi/base/scope/CustomScoped.java | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../cxf/systest/jaxrs/BookStoreApplication.java | 4 +-
.../systest/jaxrs/BookStoreCustomApplication.java | 7 +-
.../systest/jaxrs/BookStoreScopedApplication.java | 5 +-
.../src/test/resources/META-INF/beans.xml | 9 +-
.../src/test/resources/jaxrs_cdi/WEB-INF/web.xml | 2 +-
.../src/test/resources/META-INF/beans.xml | 9 +-
.../src/test/resources/jaxrs_cdi/WEB-INF/web.xml | 2 +-
.../cxf/systest/jaxrs/cdi/BookStoreFeed.java | 11 +-
.../jaxrs/cdi/BookStoreProducerApplication.java | 11 +-
.../systest/jaxrs/cdi/BookStoreValidatingFeed.java | 18 +-
.../cxf/systest/jaxrs/cdi/SampleFeature.java | 5 +-
.../cxf/systest/jaxrs/cdi/SampleNestedFeature.java | 5 +-
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 5 +-
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 5 +-
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 5 +-
.../jaxrs/cdi/unwrapper/ClassUnwrapperTest.java | 9 +-
.../src/test/resources/META-INF/beans.xml | 12 +-
.../src/test/resources/jaxrs_cdi/WEB-INF/web.xml | 2 +-
systests/cdi/cdi-owb/pom.xml | 43 ++-
.../cxf/systest/jaxrs/BookStoreApplication.java | 4 +-
.../systest/jaxrs/BookStoreCustomApplication.java | 7 +-
.../systest/jaxrs/BookStoreScopedApplication.java | 5 +-
.../src/test/resources/META-INF/beans.xml | 9 +-
.../src/test/resources/jaxrs_cdi/WEB-INF/web.xml | 2 +-
.../src/test/resources/META-INF/beans.xml | 9 +-
.../src/test/resources/jaxrs_cdi/WEB-INF/web.xml | 2 +-
.../jaxrs/cdi/AbstractBookStoreCdiTest.java | 5 +-
.../cxf/systest/jaxrs/cdi/BookStoreFeed.java | 14 +-
.../jaxrs/cdi/BookStoreProducerApplication.java | 11 +-
.../systest/jaxrs/cdi/BookStoreValidatingFeed.java | 18 +-
.../cxf/systest/jaxrs/cdi/SampleFeature.java | 5 +-
.../cxf/systest/jaxrs/cdi/SampleNestedFeature.java | 5 +-
.../src/test/resources/META-INF/beans.xml | 12 +-
.../src/test/resources/jaxrs_cdi/WEB-INF/web.xml | 2 +-
systests/cdi/cdi-weld/pom.xml | 13 +-
systests/cdi/pom.xml | 2 +-
systests/container-integration/grizzly/pom.xml | 11 +-
.../org/apache/cxf/systest/grizzly/DHRequest.java | 6 +-
.../org/apache/cxf/systest/grizzly/DHResponse.java | 6 +-
.../cxf/systest/grizzly/EndpointAPITest.java | 12 +-
.../apache/cxf/systest/grizzly/EndpointBean.java | 12 +-
.../cxf/systest/grizzly/EndpointInterface.java | 4 +-
systests/container-integration/pom.xml | 12 +-
.../src/main/java/demo/spring/HelloWorld.java | 2 +-
.../src/main/java/demo/spring/HelloWorldImpl.java | 2 +-
.../org/apache/cxf/systest/aegis/AegisJaxWs.java | 7 +-
.../apache/cxf/systest/aegis/AegisJaxWsImpl.java | 3 +-
.../apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java | 5 +-
.../cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java | 2 +-
.../apache/cxf/systest/aegis/AttributeBean.java | 2 +-
.../apache/cxf/systest/aegis/SportsService.java | 2 +-
.../apache/cxf/systest/aegis/mtom/MtomTest.java | 2 +-
.../aegis/mtom/fortest/DataHandlerBean.java | 2 +-
.../systest/aegis/mtom/fortest/MtomTestImpl.java | 6 +-
.../aegis/mtom/fortest/MtomTestService.java | 7 +-
.../apache/cxf/systest/jaxb/HashMapAdapter.java | 12 +-
.../apache/cxf/systest/jaxb/MTOMBase64Test.java | 12 +-
.../java/org/apache/cxf/systest/jaxb/MTOMTest.java | 12 +-
.../apache/cxf/systest/jaxb/TestServiceTest.java | 2 +-
.../cxf/systest/jaxb/model/ExtendedWidget.java | 11 +-
.../systest/jaxb/model/ExtendedWidgetWithMime.java | 10 +-
.../org/apache/cxf/systest/jaxb/model/Widget.java | 13 +-
.../apache/cxf/systest/jaxb/service/ErrorData.java | 2 +-
.../jaxb/service/PropertyOrderException.java | 6 +-
.../cxf/systest/jaxb/service/TestService.java | 7 +-
.../cxf/systest/jaxb/service/TestServiceImpl.java | 5 +-
.../jaxb/shareclasses/model/NameElement.java | 5 +-
.../jaxb/shareclasses/model/bar/BarName.java | 3 +-
.../jaxb/shareclasses/model/foo/FooName.java | 3 +-
.../jaxb/shareclasses/service/bar/BarService.java | 3 +-
.../jaxb/shareclasses/service/foo/FooService.java | 3 +-
.../cxf/systest/jaxb/validators/HelloWorld.java | 6 +-
.../systest/jaxb/validators/HelloWorldImpl.java | 2 +-
.../systest/jaxb/validators/MyCustomHandler.java | 4 +-
.../cxf/systest/jaxb/validators/PassedObject.java | 8 +-
.../org/apache/cxf/systest/source/GreeterImpl.java | 2 +-
.../cxf/systest/source/PutLastTradePriceImpl.java | 4 +-
.../java/org/apache/cxf/systest/source/Server.java | 4 +-
.../DispatchClientServerWithHugeResponseTest.java | 16 +-
.../cxf/systests/forked/ssl3/GreeterImpl.java | 3 +-
.../apache/cxf/systests/forked/ssl3/SSLv3Test.java | 2 +-
systests/jaxrs/pom.xml | 53 ++--
.../jaxrs/AbstractGenericBookStoreSpring.java | 14 +-
.../jaxrs/AbstractJAXRSContinuationsTest.java | 5 +-
.../cxf/systest/jaxrs/AbstractNameServiceImpl.java | 2 +-
.../cxf/systest/jaxrs/ApplicationController.java | 12 +-
.../systest/jaxrs/ApplicationInfoJaxrsFilter.java | 10 +-
.../apache/cxf/systest/jaxrs/AsyncResource.java | 20 +-
.../apache/cxf/systest/jaxrs/AsyncResource2.java | 10 +-
.../cxf/systest/jaxrs/BadgerFishProvider.java | 28 +-
.../java/org/apache/cxf/systest/jaxrs/Book.java | 16 +-
.../java/org/apache/cxf/systest/jaxrs/Book2.java | 28 +-
.../apache/cxf/systest/jaxrs/BookApplication.java | 22 +-
.../apache/cxf/systest/jaxrs/BookApplication2.java | 6 +-
.../systest/jaxrs/BookApplicationNonSpring.java | 9 +-
.../cxf/systest/jaxrs/BookAsyncInterface.java | 10 +-
.../org/apache/cxf/systest/jaxrs/BookBean.java | 12 +-
.../cxf/systest/jaxrs/BookContinuationFilter.java | 6 +-
.../cxf/systest/jaxrs/BookContinuationStore.java | 25 +-
.../systest/jaxrs/BookCxfContinuationStore.java | 13 +-
.../cxf/systest/jaxrs/BookExceptionMapper.java | 9 +-
.../apache/cxf/systest/jaxrs/BookInterface.java | 10 +-
.../cxf/systest/jaxrs/BookNoXmlRootElement.java | 8 +-
.../cxf/systest/jaxrs/BookNotFoundDetails.java | 2 +-
.../cxf/systest/jaxrs/BookNotFoundFault.java | 2 +-
.../org/apache/cxf/systest/jaxrs/BookServer.java | 37 ++-
.../org/apache/cxf/systest/jaxrs/BookServer20.java | 59 ++--
.../cxf/systest/jaxrs/BookServerAsyncClient.java | 15 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 96 +++----
.../cxf/systest/jaxrs/BookStoreDispatch.java | 6 +-
.../cxf/systest/jaxrs/BookStoreNoAnnotations.java | 4 +-
.../systest/jaxrs/BookStoreNoAnnotationsImpl.java | 11 +-
.../cxf/systest/jaxrs/BookStoreNonSpring.java | 4 +-
.../cxf/systest/jaxrs/BookStorePerRequest.java | 14 +-
.../apache/cxf/systest/jaxrs/BookStoreRegex.java | 10 +-
.../apache/cxf/systest/jaxrs/BookStoreSimple.java | 12 +-
.../apache/cxf/systest/jaxrs/BookStoreSpring.java | 42 +--
.../apache/cxf/systest/jaxrs/BookStoreSpring2.java | 10 +-
.../apache/cxf/systest/jaxrs/BookStoreStorage.java | 6 +-
.../cxf/systest/jaxrs/BookStoreSubObject.java | 7 +-
.../cxf/systest/jaxrs/BookStoreWithInterface2.java | 6 +-
.../apache/cxf/systest/jaxrs/BookSubresource.java | 28 +-
.../cxf/systest/jaxrs/BookSubresourceImpl.java | 2 +-
.../org/apache/cxf/systest/jaxrs/BookType.java | 16 +-
.../org/apache/cxf/systest/jaxrs/BookWrapper.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/Books.java | 6 +-
.../test/java/org/apache/cxf/systest/jaxrs/CD.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/CDs.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/Chapter.java | 16 +-
.../cxf/systest/jaxrs/ChapterNoAnnotations.java | 2 +-
.../cxf/systest/jaxrs/ContentTypeModifyingMBW.java | 8 +-
.../org/apache/cxf/systest/jaxrs/ContextAware.java | 3 +-
.../systest/jaxrs/CustomFaultInInterceptor.java | 3 +-
.../systest/jaxrs/CustomInFaultyInterceptor.java | 3 +-
.../cxf/systest/jaxrs/CustomJAXRSInvoker.java | 3 +-
.../systest/jaxrs/CustomJaxbElementProvider.java | 9 +-
.../systest/jaxrs/CustomOutFaultInterceptor.java | 3 +-
.../cxf/systest/jaxrs/CustomOutInterceptor.java | 7 +-
.../apache/cxf/systest/jaxrs/CustomResponse.java | 16 +-
.../jaxrs/CustomWebApplicationExceptionMapper.java | 7 +-
.../apache/cxf/systest/jaxrs/DocumentResource.java | 8 +-
.../cxf/systest/jaxrs/FaultyRequestHandler.java | 11 +-
.../cxf/systest/jaxrs/FormatResponseHandler.java | 11 +-
.../cxf/systest/jaxrs/GenericBookInterface.java | 6 +-
.../cxf/systest/jaxrs/GenericBookStoreSpring2.java | 11 +-
.../cxf/systest/jaxrs/GenericHandlerWriter.java | 9 +-
.../cxf/systest/jaxrs/GlobalNameBinding.java | 2 +-
.../cxf/systest/jaxrs/HttpHeadersContext.java | 4 +-
.../org/apache/cxf/systest/jaxrs/IRestService.java | 8 +-
.../jaxrs/InternalServerErrorExceptionMapper.java | 6 +-
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 64 ++---
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 51 ++--
.../systest/jaxrs/JAXRSClientServerBookTest.java | 48 ++--
.../jaxrs/JAXRSClientServerNonSpringBookTest.java | 7 +-
.../JAXRSClientServerProxySpringBookTest.java | 3 +-
.../jaxrs/JAXRSClientServerQueryParamBookTest.java | 7 +-
...RSClientServerQueryParamCollectionBookTest.java | 7 +-
...entServerResourceJacksonSpringProviderTest.java | 5 +-
.../jaxrs/JAXRSClientServerSpringBookTest.java | 17 +-
.../jaxrs/JAXRSClientServerStreamingTest.java | 10 +-
.../jaxrs/JAXRSClientServerThrottledTest.java | 3 +-
.../JAXRSClientServerUserResourceAsteriskTest.java | 5 +-
.../JAXRSClientServerUserResourceDefaultTest.java | 28 +-
.../jaxrs/JAXRSClientServerUserResourceTest.java | 5 +-
.../jaxrs/JAXRSContinuationsServlet3Test.java | 15 +-
.../cxf/systest/jaxrs/JAXRSLocalTransportTest.java | 3 +-
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 22 +-
.../jaxrs/JAXRSMultithreadedClientTest.java | 5 +-
.../jaxrs/JAXRSOverlappingDestinationsTest.java | 13 +-
.../cxf/systest/jaxrs/JAXRSPathRegexTest.java | 9 +-
.../systest/jaxrs/JAXRSRequestDispatcherTest.java | 5 +-
.../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 20 +-
.../systest/jaxrs/JAXRSSoapRestBlueprintTest.java | 4 +-
.../apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java | 7 +-
.../cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java | 15 +-
.../apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java | 13 +-
.../org/apache/cxf/systest/jaxrs/JMSBookStore.java | 40 +--
.../apache/cxf/systest/jaxrs/MultipartStore.java | 36 +--
.../org/apache/cxf/systest/jaxrs/NameService.java | 14 +-
.../apache/cxf/systest/jaxrs/NameServiceImpl.java | 2 +-
.../org/apache/cxf/systest/jaxrs/OrderBean.java | 2 +-
.../org/apache/cxf/systest/jaxrs/PetStore.java | 25 +-
.../org/apache/cxf/systest/jaxrs/RETRIEVE.java | 2 +-
.../org/apache/cxf/systest/jaxrs/RETRIEVE_get.java | 2 +-
.../systest/jaxrs/ResponseCheckInterceptor.java | 5 +-
.../cxf/systest/jaxrs/RuntimeExceptionMapper.java | 10 +-
.../apache/cxf/systest/jaxrs/SimpleBookStore.java | 8 +-
.../systest/jaxrs/SpringServletConfigStore.java | 13 +-
.../apache/cxf/systest/jaxrs/StringTextWriter.java | 13 +-
.../org/apache/cxf/systest/jaxrs/SuperBook.java | 2 +-
.../org/apache/cxf/systest/jaxrs/SuperBook2.java | 2 +-
.../cxf/systest/jaxrs/XForwardedServletFilter.java | 16 +-
.../cxf/systest/jaxrs/XmlStreamReaderProvider.java | 8 +-
.../cxf/systest/jaxrs/XmlStreamWriterProvider.java | 6 +-
.../java/org/apache/cxf/systest/jaxrs/XopType.java | 12 +-
.../systest/jaxrs/cors/AnnotatedCorsServer.java | 25 +-
.../systest/jaxrs/cors/AnnotatedCorsServer2.java | 25 +-
.../cxf/systest/jaxrs/cors/ConfigServer.java | 11 +-
.../systest/jaxrs/cors/UnannotatedCorsServer.java | 17 +-
.../AbstractSwagger2ServiceDescriptionTest.java | 9 +-
.../description/BookStoreStylesheetsSwagger2.java | 6 +-
.../jaxrs/description/BookStoreSwagger2.java | 19 +-
.../SwaggerToOpenApiConversionTest.java | 3 +-
.../description/SwaggerUiConfigurationTest.java | 5 +-
.../jaxrs/description/group1/BookStore.java | 19 +-
.../group1/BookStoreStylesheetsOpenApi.java | 6 +-
.../jaxrs/description/group2/BookStore.java | 13 +-
.../AbstractOpenApiServiceDescriptionTest.java | 7 +-
.../description/openapi/BookStoreApplication.java | 4 +-
.../description/openapi/BookStoreOpenApi.java | 19 +-
.../openapi/BookStoreStylesheetsOpenApi.java | 6 +-
...enApiContextBasedConfigApplicationOnlyTest.java | 5 +-
.../openapi/OpenApiContextBasedConfigTest.java | 3 +-
.../description/openapi/OpenApiCustomizerTest.java | 3 +-
.../cxf/systest/jaxrs/discovery/BookStore.java | 15 +-
.../discovery/JAXRSServerSpringDiscoveryTest.java | 7 +-
.../jaxrs/discovery/sub/BookStoreInterface.java | 2 +-
.../cxf/systest/jaxrs/extraction/BookCatalog.java | 21 +-
.../extraction/JAXRSClientServerTikaTest.java | 3 +-
.../jaxrs/failover/AbstractFailoverTest.java | 7 +-
.../jaxrs/failover/CircuitBreakerFailoverTest.java | 3 +-
.../systest/jaxrs/failover/FailoverBookStore.java | 9 +-
.../jaxrs/failover/LoadDistributorTest.java | 3 +-
.../cxf/systest/jaxrs/form/FormBehaviorTest.java | 13 +-
.../cxf/systest/jaxrs/form/FormReaderFilter.java | 13 +-
.../systest/jaxrs/form/FormReaderInterceptor.java | 9 +-
.../cxf/systest/jaxrs/form/FormResource.java | 11 +-
.../cxf/systest/jaxrs/jaxws/BookSoapService.java | 7 +-
.../cxf/systest/jaxrs/jaxws/BookStoreJaxrs.java | 4 +-
.../systest/jaxrs/jaxws/BookStoreJaxrsJaxws.java | 21 +-
.../cxf/systest/jaxrs/jaxws/BookStoreJaxws.java | 4 +-
.../systest/jaxrs/jaxws/BookStoreSoapRestImpl.java | 19 +-
.../apache/cxf/systest/jaxrs/jaxws/HelloWorld.java | 20 +-
.../cxf/systest/jaxrs/jaxws/HelloWorldImpl.java | 2 +-
.../cxf/systest/jaxrs/jaxws/IntegerUserMap.java | 10 +-
.../systest/jaxrs/jaxws/IntegerUserMapAdapter.java | 2 +-
.../org/apache/cxf/systest/jaxrs/jaxws/User.java | 2 +-
.../cxf/systest/jaxrs/jaxws/UserAdapter.java | 2 +-
.../apache/cxf/systest/jaxrs/jaxws/UserImpl.java | 4 +-
.../apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 50 ++--
.../apache/cxf/systest/jaxrs/jms/JMSServer.java | 14 +-
.../cxf/systest/jaxrs/jms/jms_server_config.xml | 2 +-
.../cxf/systest/jaxrs/logging/LoggingTest.java | 5 +-
.../jaxrs/metrics/JAXRSClientMetricsTest.java | 11 +-
.../jaxrs/metrics/JAXRSServerMetricsTest.java | 11 +-
.../apache/cxf/systest/jaxrs/metrics/Library.java | 12 +-
.../apache/cxf/systest/jaxrs/nio/NioBookStore.java | 19 +-
.../cxf/systest/jaxrs/nio/NioBookStoreTest.java | 5 +-
.../systest/jaxrs/nonspring/BookStoreOpenAPI.java | 5 +-
.../nonspring/JAXRSNonSpringJaxrsServletTest.java | 3 +-
.../cxf/systest/jaxrs/provider/BookJsonStore.java | 32 +--
.../cxf/systest/jaxrs/provider/BookJsonStore2.java | 22 +-
.../jaxrs/provider/CXFJaxbContextResolver.java | 29 +-
.../jaxrs/provider/CXFJaxbElementProvider.java | 14 +-
.../systest/jaxrs/provider/CXFJaxbProvider.java | 14 +-
.../cxf/systest/jaxrs/provider/CXFResource.java | 6 +-
.../jaxrs/provider/JAXBContextResolverTest.java | 6 +-
.../systest/jaxrs/provider/JAXBProviderTest.java | 8 +-
.../jaxrs/provider/JsrJsonbProviderTest.java | 13 +-
.../jaxrs/provider/JsrJsonpProviderTest.java | 13 +-
.../jaxrs/reactive/CompletableFutureServer.java | 15 +-
.../jaxrs/reactive/CompletableFutureService.java | 19 +-
.../reactive/IllegalArgumentExceptionMapper.java | 6 +-
.../reactive/IllegalStateExceptionMapper.java | 6 +-
.../jaxrs/reactive/JAXRSCompletionStageTest.java | 11 +-
.../jaxrs/reactive/JAXRSRxJava2FlowableTest.java | 15 +-
.../jaxrs/reactive/JAXRSRxJava2MaybeTest.java | 9 +-
.../jaxrs/reactive/JAXRSRxJava2ObservableTest.java | 13 +-
.../jaxrs/reactive/JAXRSRxJava2SingleTest.java | 7 +-
.../jaxrs/reactive/JAXRSRxJava3FlowableTest.java | 15 +-
.../jaxrs/reactive/JAXRSRxJava3MaybeTest.java | 9 +-
.../jaxrs/reactive/JAXRSRxJava3ObservableTest.java | 13 +-
.../jaxrs/reactive/JAXRSRxJava3SingleTest.java | 7 +-
.../jaxrs/reactive/JAXRSRxJavaObservableTest.java | 3 +-
.../systest/jaxrs/reactive/MappedException.java | 2 +-
.../jaxrs/reactive/MappedExceptionMapper.java | 6 +-
.../jaxrs/reactive/RxJava2FlowableService.java | 17 +-
.../jaxrs/reactive/RxJava2MaybeService.java | 13 +-
.../jaxrs/reactive/RxJava2ObservableService.java | 8 +-
.../jaxrs/reactive/RxJava2SingleService.java | 11 +-
.../jaxrs/reactive/RxJava3FlowableService.java | 17 +-
.../jaxrs/reactive/RxJava3MaybeService.java | 13 +-
.../jaxrs/reactive/RxJava3ObservableService.java | 8 +-
.../jaxrs/reactive/RxJava3SingleService.java | 11 +-
.../jaxrs/reactive/RxJavaObservableService.java | 7 +-
.../cxf/systest/jaxrs/reactor/FluxReactorTest.java | 7 +-
.../cxf/systest/jaxrs/reactor/FluxService.java | 17 +-
.../reactor/IllegalArgumentExceptionMapper.java | 6 +-
.../jaxrs/reactor/IllegalStateExceptionMapper.java | 6 +-
.../cxf/systest/jaxrs/reactor/MonoReactorTest.java | 7 +-
.../cxf/systest/jaxrs/reactor/MonoService.java | 13 +-
.../jaxrs/security/AbstractSecureBookStore.java | 6 +-
.../cxf/systest/jaxrs/security/Injectable.java | 4 +-
.../jaxrs/security/JAXRS20HttpsBookTest.java | 8 +-
.../systest/jaxrs/security/JAXRSHttpsBookTest.java | 5 +-
.../JAXRSJaasConfigurationSecurityTest.java | 5 +-
.../jaxrs/security/JAXRSJaasSecurityTest.java | 5 +-
.../security/JAXRSSpringSecurityClassTest.java | 9 +-
.../security/JAXRSSpringSecurityInterfaceTest.java | 3 +-
.../cxf/systest/jaxrs/security/SecureBook.java | 9 +-
.../jaxrs/security/SecureBookInterface.java | 9 +-
.../security/SecureBookInterfaceGenerics.java | 9 +-
.../systest/jaxrs/security/SecureBookStore.java | 11 +-
.../jaxrs/security/SecureBookStoreGenerics.java | 3 +-
.../security/SecureBookStoreNoAnnotations.java | 3 +-
.../jaxrs/security/SecureBookStoreNoInterface.java | 25 +-
.../jaxrs/security/SecurityExceptionMapper.java | 5 +-
.../security/SecurityOutFaultInterceptor.java | 3 +-
.../AbstractBookStoreWithValidation.java | 4 +-
.../validation/AbstractJAXRSValidationTest.java | 3 +-
.../jaxrs/validation/BookStoreValidatable.java | 4 +-
.../jaxrs/validation/BookStoreWithValidation.java | 34 +--
.../BookStoreWithValidationPerRequest.java | 12 +-
.../jaxrs/validation/BookWithValidation.java | 4 +-
.../JAXRSClientServerValidationTest.java | 11 +-
.../validation/JAXRSPerRequestValidationTest.java | 5 +-
.../validation/spring/BookStoreWithValidation.java | 15 +-
.../systest/jaxrs/validation/spring/BookWorld.java | 13 +-
.../jaxrs/validation/spring/BookWorldImpl.java | 3 +-
.../JAXRSClientServerValidationSpringTest.java | 16 +-
.../jaxrs/websocket/BookStoreWebSocket.java | 23 +-
.../websocket/JAXRSClientConduitWebSocketTest.java | 3 +-
systests/jaxws/pom.xml | 22 +-
.../systest/dispatch/DispatchClientServerTest.java | 36 +--
...patchClientServerWithMalformedResponseTest.java | 17 +-
.../dispatch/DispatchXMLClientServerTest.java | 10 +-
.../org/apache/cxf/systest/dispatch/Server.java | 3 +-
.../cxf/systest/dispatch/WsaMessageIdTest.java | 11 +-
.../cxf/systest/handlers/AddNumbersImpl.java | 6 +-
.../cxf/systest/handlers/AddNumbersNoHandlers.java | 4 +-
.../systest/handlers/AddNumbersServiceUnwrap.java | 11 +-
.../handlers/AddNumbersServiceWithAnnotation.java | 8 +-
.../cxf/systest/handlers/AddNumbersUnwrap.java | 12 +-
.../handlers/DispatchHandlerInvocationTest.java | 42 +--
.../cxf/systest/handlers/FaultThrowingHandler.java | 6 +-
.../systest/handlers/HandlerInvocationTest.java | 58 ++--
.../HandlerInvocationUsingAddNumbersTest.java | 19 +-
.../apache/cxf/systest/handlers/HandlerServer.java | 3 +-
.../cxf/systest/handlers/HandlerTestImpl.java | 20 +-
.../handlers/HandlerTestServiceWithAnnotation.java | 14 +-
.../cxf/systest/handlers/LoggingHandler.java | 9 +-
.../handlers/MessageContextFirstHandler.java | 7 +-
.../handlers/MessageContextSecondHandler.java | 7 +-
.../cxf/systest/handlers/ModifyNumberHandler.java | 17 +-
.../org/apache/cxf/systest/handlers/Server.java | 6 +-
.../cxf/systest/handlers/SmallNumberHandler.java | 22 +-
.../apache/cxf/systest/handlers/TestHandler.java | 22 +-
.../cxf/systest/handlers/TestHandlerBase.java | 3 +-
.../handlers/TestMustUnderstandHandler.java | 23 +-
.../cxf/systest/handlers/TestSOAPHandler.java | 32 +--
.../cxf/systest/handlers/TestUnusedHandler.java | 6 +-
.../TrivialSOAPHandlerAnnotatedGreeterImpl.java | 5 +-
.../systest/handlers/TrivialSOAPHandlerTest.java | 4 +-
.../org/apache/cxf/systest/handlers/handlers.xml | 2 +-
.../cxf/systest/handlers/handlers_invocation.xml | 2 +-
.../handlers/handlers_invocation_testunused.xml | 2 +-
.../cxf/systest/handlers/handlers_smallnumbers.xml | 2 +-
.../cxf/systest/handlers/trivial_soap_handler.xml | 2 +-
.../cxf/systest/handlers/types/AddNumbers.java | 8 +-
.../systest/handlers/types/AddNumbersResponse.java | 10 +-
.../cxf/systest/handlers/types/package-info.java | 4 +-
.../cxf/systest/jaxws/AddNumbersImplPartial1.java | 2 +-
.../cxf/systest/jaxws/AddNumbersImplPartial2.java | 2 +-
.../cxf/systest/jaxws/AnyClientServerTest.java | 4 +-
.../org/apache/cxf/systest/jaxws/ArrayService.java | 6 +-
.../apache/cxf/systest/jaxws/ArrayServiceImpl.java | 2 +-
.../cxf/systest/jaxws/ArrayServiceServer.java | 3 +-
.../org/apache/cxf/systest/jaxws/CXF6655Test.java | 4 +-
.../org/apache/cxf/systest/jaxws/CXF7990Test.java | 8 +-
.../cxf/systest/jaxws/ClientServerMiscTest.java | 12 +-
.../systest/jaxws/ClientServerMixedStyleTest.java | 5 +-
.../jaxws/ClientServerRPCLitDefatulAnnoTest.java | 2 +-
.../cxf/systest/jaxws/ClientServerRPCLitTest.java | 34 +--
.../apache/cxf/systest/jaxws/ClientServerTest.java | 38 +--
.../cxf/systest/jaxws/ClientServerXMLTest.java | 8 +-
.../apache/cxf/systest/jaxws/ComplexException.java | 4 +-
.../systest/jaxws/DocLitBareCodeFirstService.java | 25 +-
.../jaxws/DocLitBareCodeFirstServiceImpl.java | 13 +-
.../jaxws/DocLitWrappedCodeFirstBaseService.java | 2 +-
.../jaxws/DocLitWrappedCodeFirstService.java | 27 +-
.../jaxws/DocLitWrappedCodeFirstServiceImpl.java | 9 +-
.../DocLitWrappedCodeFirstServiceMissingOps.java | 8 +-
.../jaxws/DocLitWrappedCodeFirstSubService1.java | 2 +-
.../jaxws/DocLitWrappedCodeFirstSubService2.java | 2 +-
.../java/org/apache/cxf/systest/jaxws/Echo.java | 8 +-
.../cxf/systest/jaxws/EchoProxyServiceImpl.java | 6 +-
.../org/apache/cxf/systest/jaxws/EchoResponse.java | 8 +-
.../org/apache/cxf/systest/jaxws/EchoService.java | 4 +-
.../apache/cxf/systest/jaxws/EchoServiceImpl.java | 12 +-
.../java/org/apache/cxf/systest/jaxws/Hello.java | 6 +-
.../org/apache/cxf/systest/jaxws/HelloImpl.java | 2 +-
.../org/apache/cxf/systest/jaxws/HelloService.java | 7 +-
.../systest/jaxws/InterfaceInheritTestImpl.java | 2 +-
.../cxf/systest/jaxws/JaxWsClientThreadTest.java | 14 +-
.../cxf/systest/jaxws/JaxwsAsyncFailOverTest.java | 7 +-
.../cxf/systest/jaxws/JaxwsBasicAuthTest.java | 15 +-
.../cxf/systest/jaxws/JaxwsExecutorTest.java | 7 +-
.../cxf/systest/jaxws/LocatorClientServerTest.java | 6 +-
.../cxf/systest/jaxws/LocatorServiceImpl.java | 19 +-
.../apache/cxf/systest/jaxws/OASISCatalogTest.java | 4 +-
.../cxf/systest/jaxws/RpcLitCodeFirstService.java | 12 +-
.../systest/jaxws/RpcLitCodeFirstServiceImpl.java | 4 +-
.../jaxws/SchemaValidationClientServerTest.java | 2 +-
.../java/org/apache/cxf/systest/jaxws/Server.java | 16 +-
.../cxf/systest/jaxws/ServerGreeterBase.java | 3 +-
.../cxf/systest/jaxws/ServerGreeterBaseNoWsdl.java | 3 +-
.../cxf/systest/jaxws/ServerGreeterNoWsdl.java | 3 +-
.../org/apache/cxf/systest/jaxws/ServerMisc.java | 3 +-
.../apache/cxf/systest/jaxws/ServerMixedStyle.java | 13 +-
.../cxf/systest/jaxws/ServerNoBodyParts.java | 3 +-
.../cxf/systest/jaxws/ServerPartialWsdl.java | 5 +-
.../apache/cxf/systest/jaxws/ServerXMLBinding.java | 3 +-
.../cxf/systest/jaxws/ServicePortTypeImpl.java | 4 +-
.../apache/cxf/systest/jaxws/ServiceTestFault.java | 4 +-
.../org/apache/cxf/systest/jaxws/TestService.java | 7 +-
.../apache/cxf/systest/jaxws/WsdlGetUtilsTest.java | 5 +-
.../jaxws/attachment/AttachmentService.java | 9 +-
.../jaxws/attachment/AttachmentServiceImpl.java | 13 +-
.../cxf/systest/jaxws/attachment/Request.java | 10 +-
.../attachment/ValidationWithAttachmentTest.java | 7 +-
.../cxf/systest/jaxws/base/WrapperString.java | 8 +-
.../cxf/systest/jaxws/base/package-info.java | 6 +-
.../jaxws/beanpostprocessor/IWebServiceRUs.java | 4 +-
.../jaxws/beanpostprocessor/WebServiceRUs.java | 11 +-
.../jaxws/cxf5064/HeaderObjTypeAdapter.java | 2 +-
.../cxf/systest/jaxws/cxf5064/SOAPHeaderSEI.java | 10 +-
.../jaxws/cxf5064/SOAPHeaderServiceImpl.java | 2 +-
.../cxf/systest/jaxws/metrics/BookWebService.java | 4 +-
.../cxf/systest/jaxws/metrics/IBookWebService.java | 4 +-
.../JavaFirstSchemaValidationTest.java | 5 +-
.../cxf/systest/jaxws/schemavalidation/Person.java | 8 +-
.../jaxws/schemavalidation/PersonService.java | 9 +-
.../schemavalidation/PersonServiceAnnotated.java | 9 +-
.../PersonServiceAnnotatedImpl.java | 2 +-
.../jaxws/schemavalidation/PersonServiceImpl.java | 2 +-
.../jaxws/schemavalidation/PersonServiceRPC.java | 9 +-
.../schemavalidation/PersonServiceRPCImpl.java | 2 +-
.../PersonServiceWithRequestResponseAnns.java | 9 +-
.../PersonServiceWithRequestResponseAnnsImpl.java | 2 +-
.../jaxws/schemavalidation/package-info.java | 4 +-
.../org/apache/cxf/systest/jaxws/types/Bar.java | 2 +-
.../apache/cxf/systest/jaxws/types/BarAdapter.java | 2 +-
.../apache/cxf/systest/jaxws/types/BarImpl.java | 2 +-
.../jaxws/websocket/ClientServerWebSocketTest.java | 11 +-
.../apache/cxf/systest/jaxws/websocket/Server.java | 7 +-
.../provider/AbstractSourcePayloadProvider.java | 14 +-
.../cxf/systest/provider/AttachmentServer.java | 3 +-
.../AttachmentStreamSourceXMLProvider.java | 20 +-
.../cxf/systest/provider/CXF4130Provider.java | 18 +-
.../apache/cxf/systest/provider/CXF4130Test.java | 3 +-
.../apache/cxf/systest/provider/CXF4818Test.java | 22 +-
.../provider/HWDOMSourceMessageProvider.java | 20 +-
.../provider/HWDOMSourcePayloadProvider.java | 26 +-
.../HWDOMSourcePayloadXMLBindingProvider.java | 16 +-
.../provider/HWSAXSourceMessageProvider.java | 21 +-
.../provider/HWSAXSourcePayloadProvider.java | 16 +-
.../systest/provider/HWSoapMessageDocProvider.java | 34 +--
.../systest/provider/HWSoapMessageProvider.java | 18 +-
.../provider/HWStreamSourceMessageProvider.java | 20 +-
.../provider/HWStreamSourcePayloadProvider.java | 16 +-
.../InterpretNullAsOnewayProviderTest.java | 8 +-
.../provider/NBProviderClientServerTest.java | 16 +-
.../systest/provider/NBSoapMessageDocProvider.java | 17 +-
.../systest/provider/ProviderClientServerTest.java | 4 +-
.../provider/ProviderRPCClientServerTest.java | 16 +-
.../provider/ProviderXMLClientServerTest.java | 4 +-
.../org/apache/cxf/systest/provider/Server.java | 3 +-
.../cxf/systest/provider/SourceProvider.java | 3 +-
.../cxf/systest/provider/TestLogicalHandler.java | 9 +-
.../cxf/systest/provider/TestSOAPHandler.java | 15 +-
.../org/apache/cxf/systest/provider/XMLServer.java | 3 +-
.../provider/datasource/AbstractProvider.java | 9 +-
.../datasource/DataSourceProviderTest.java | 12 +-
.../systest/provider/datasource/TestProvider.java | 21 +-
.../systest/provider/datasource/WebProvider.java | 2 +-
.../cxf/systest/provider/handlers_invocation.xml | 2 +-
.../cxf/systest/swa/ClientServerSwaTest.java | 22 +-
.../java/org/apache/cxf/systest/swa/Server.java | 3 +-
.../cxf/systest/swa/SwANoMimeServiceImpl.java | 11 +-
.../org/apache/cxf/systest/swa/SwAServiceImpl.java | 10 +-
.../cxf/ws/addressing/StringTrimAdapter.java | 2 +-
.../org/apache/cxf/ws/addressing/package-info.java | 2 +-
systests/kerberos/pom.xml | 4 +-
.../kerberos/common/DoubleItPortTypeImpl.java | 7 +-
.../systest/kerberos/common/SecurityTestUtil.java | 2 +-
.../cxf/systest/kerberos/jaxrs/kerberos/Book.java | 6 +-
.../jaxrs/kerberos/BookNotFoundDetails.java | 2 +-
.../kerberos/jaxrs/kerberos/BookNotFoundFault.java | 2 +-
.../systest/kerberos/jaxrs/kerberos/BookStore.java | 11 +-
.../kerberos/jaxrs/kerberos/BookStoreImpl.java | 4 +-
.../kerberos/wssec/kerberos/KerberosTokenTest.java | 4 +-
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 2 +-
systests/ldap/pom.xml | 4 +-
.../cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java | 3 +-
.../org/apache/cxf/systest/ldap/jaxrs/User.java | 4 +-
.../cxf/systest/ldap/jaxrs/UserNotFoundFault.java | 2 +-
.../apache/cxf/systest/ldap/jaxrs/UserService.java | 11 +-
.../cxf/systest/ldap/jaxrs/UserServiceImpl.java | 4 +-
systests/microprofile/client/async/pom.xml | 4 +-
.../microprofile/rest/client/AsyncMethodTest.java | 9 +-
.../rest/client/AsyncThreadingTest.java | 13 +-
.../mock/AsyncClientWithCompletionStage.java | 14 +-
.../AsyncInvocationInterceptorFactoryTestImpl.java | 3 +-
...AsyncInvocationInterceptorFactoryTestImpl2.java | 3 +-
.../rest/client/mock/ThreadLocalClientFilter.java | 8 +-
systests/microprofile/client/jaxrs/pom.xml | 6 -
.../rest/client/InjectClientHeadersFactory.java | 9 +-
.../microprofile/rest/client/InjectRestClient.java | 5 +-
.../rest/client/JaxrsHeaderPropagationTest.java | 7 +-
.../microprofile/rest/client/JaxrsResource.java | 11 +-
.../microprofile/rest/client/RestClient.java | 5 +-
.../client/ReturnAllOutboundHeadersFilter.java | 6 +-
.../microprofile/rest/client/regex/Book.java | 6 +-
.../rest/client/regex/BookStoreClient.java | 10 +-
.../rest/client/regex/BookStoreClientRoot.java | 10 +-
systests/microprofile/client/nocdi/pom.xml | 4 +-
.../microprofile/rest/client/AsyncMethodTest.java | 11 +-
.../rest/client/AsyncThreadingTest.java | 13 +-
.../mock/AsyncClientWithCompletionStage.java | 14 +-
.../AsyncInvocationInterceptorFactoryTestImpl.java | 3 +-
...AsyncInvocationInterceptorFactoryTestImpl2.java | 3 +-
.../rest/client/mock/ThreadLocalClientFilter.java | 8 +-
systests/microprofile/client/tracing/pom.xml | 10 +-
.../rest/client/tracing/BookRestClient.java | 8 +-
.../rest/client/tracing/BookStore.java | 13 +-
.../client/tracing/brave/BraveTracingTest.java | 2 +-
systests/microprofile/client/weld/pom.xml | 8 +
systests/microprofile/pom.xml | 6 +-
systests/pom.xml | 14 +-
systests/rs-http-sci/pom.xml | 14 +-
.../apache/cxf/jaxrs/servlet/AbstractSciTest.java | 9 +-
.../jaxrs/servlet/jetty/AbstractJettyServer.java | 2 +-
.../servlet/jetty/JettyEmptyApplicationTest.java | 2 +-
.../jetty/JettyEmptyPathApplicationTest.java | 2 +-
.../servlet/jetty/JettyNoApplicationTest.java | 2 +-
.../demo/applications/classes/BookApplication.java | 8 +-
.../applications/complete/BookApplication.java | 8 +-
.../demo/applications/empty/BookApplication.java | 4 +-
.../applications/emptypath/BookApplication.java | 2 +-
.../applications/singletons/BookApplication.java | 7 +-
.../java/org/apache/demo/resources/BookStore.java | 10 +-
.../rs-http-sci/src/test/resources/WEB-INF/web.xml | 4 +-
systests/rs-security/pom.xml | 27 +-
.../apache/cxf/systest/jaxrs/security/Book.java | 2 +-
.../cxf/systest/jaxrs/security/BookStore.java | 16 +-
.../httpsignature/JAXRSHTTPSignatureTest.java | 19 +-
.../cxf/systest/jaxrs/security/jcs/BookStore.java | 8 +-
.../cxf/systest/jaxrs/security/jose/BookStore.java | 11 +-
.../jwejws/EncrSignJweContainerRequestFilter.java | 5 +-
.../jwejws/EncrSignJwsContainerRequestFilter.java | 5 +-
.../jose/jwejws/HttpHeaderModifyingFilter.java | 9 +-
.../security/jose/jwejws/JAXRSJweJwsTest.java | 7 +-
.../security/jose/jwejws/JAXRSJwsJsonTest.java | 5 +-
.../jose/jwejws/JAXRSJwsMultipartTest.java | 3 +-
.../security/jose/jwejws/JweJwsAlgorithmTest.java | 5 +-
.../security/jose/jwejws/JweJwsReferenceTest.java | 5 +-
.../security/jose/jwejws/JwsHTTPHeaderTest.java | 7 +-
.../jose/jwejws/MultipartModificationFilter.java | 9 +-
.../jaxrs/security/jose/jwt/BookStoreAuthn.java | 15 +-
.../jaxrs/security/jose/jwt/JWTAlgorithmTest.java | 5 +-
.../jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java | 5 +-
.../jaxrs/security/jose/jwt/JWTPropertiesTest.java | 5 +-
.../oauth2/common/JPAOAuthDataProviderImpl.java | 3 +-
.../security/oauth2/common/OAuth2TestUtils.java | 4 +-
.../oauth2/common/SamlCallbackHandler.java | 4 +-
.../oauth2/common/WSS4JBasicAuthFilter.java | 13 +-
.../security/oauth2/filters/OAuth2FiltersTest.java | 7 +-
.../oauth2/filters/OAuth2JwtFiltersTest.java | 5 +-
.../security/oauth2/filters/PartnerService.java | 13 +-
.../grants/AuthorizationGrantNegativeTest.java | 7 +-
.../oauth2/grants/AuthorizationGrantTest.java | 5 +-
.../security/oauth2/grants/CustomGrantHandler.java | 3 +-
.../oauth2/grants/DynamicRegistrationTest.java | 3 +-
.../oauth2/grants/IntrospectionServiceTest.java | 5 +-
.../security/oauth2/grants/JAXRSOAuth2Test.java | 5 +-
.../oauth2/grants/RevocationServiceTest.java | 5 +-
.../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 5 +-
.../security/oidc/OIDCDynamicRegistrationTest.java | 5 +-
.../systest/jaxrs/security/oidc/OIDCFlowTest.java | 7 +-
.../jaxrs/security/oidc/OIDCKeysServiceTest.java | 3 +-
.../jaxrs/security/oidc/OIDCNegativeTest.java | 7 +-
.../jaxrs/security/oidc/SubjectCreatorImpl.java | 3 +-
.../systest/jaxrs/security/oidc/UserInfoTest.java | 3 +-
.../security/oidc/filters/OIDCFiltersTest.java | 3 +-
.../security/saml/JAXRSSamlAuthorizationTest.java | 5 +-
.../systest/jaxrs/security/saml/JAXRSSamlTest.java | 10 +-
.../jaxrs/security/saml/SamlCallbackHandler.java | 4 +-
.../jaxrs/security/saml/SecureBookStore.java | 11 +-
.../jaxrs/security/saml/SecureClaimBookStore.java | 9 +-
.../jaxrs/security/samlsso/MetadataTest.java | 2 +-
.../jaxrs/security/xml/JAXRSXmlSecTest.java | 7 +-
.../systest/jaxrs/security/jose/jwejws/server.xml | 2 +-
.../jaxrs/security/jose/jwejws/serverJwsJson.xml | 2 +-
.../security/oauth2/filters/filters-server.xml | 2 +-
.../security/oauth2/filters/filters-serverJwt.xml | 2 +-
systests/rs-sse/rs-sse-base/pom.xml | 4 +-
.../cxf/systest/jaxrs/sse/AbstractSseBaseTest.java | 9 +-
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 23 +-
.../apache/cxf/systest/jaxrs/sse/BookStore.java | 35 ++-
.../apache/cxf/systest/jaxrs/sse/BookStore2.java | 35 ++-
.../jaxrs/sse/BookStoreClientCloseable.java | 31 ++-
.../systest/jaxrs/sse/BookStoreResponseFilter.java | 13 +-
.../cxf/systest/jaxrs/sse/SseApplication.java | 4 +-
systests/rs-sse/rs-sse-jetty/pom.xml | 8 +-
.../jaxrs/sse/jetty/AbstractJettyServer.java | 2 +-
.../src/test/resources/jaxrs_sse/WEB-INF/web.xml | 2 +-
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +-
.../src/test/resources/jaxrs_sse/WEB-INF/web.xml | 2 +-
systests/rs-sse/rs-sse-undertow/pom.xml | 2 +-
.../jaxrs/sse/undertow/AbstractUndertowServer.java | 2 +-
systests/spring-boot/pom.xml | 4 +-
.../jaxrs/applications/LibraryApplication.java | 7 +-
.../cxf/systest/jaxrs/resources/Catalog.java | 10 +-
.../cxf/systest/jaxrs/resources/Library.java | 7 +-
.../cxf/systest/jaxrs/resources/LibraryApi.java | 19 +-
.../spring/boot/SpringClientOnlyJaxrsTest.java | 19 +-
.../spring/boot/SpringJaxrsApplicationTest.java | 27 +-
.../systest/jaxrs/spring/boot/SpringJaxrsTest.java | 27 +-
.../jaxrs/spring/boot/SpringSseEmitterTest.java | 13 +-
.../cxf/systest/jaxws/resources/HelloService.java | 12 +-
.../systest/jaxws/resources/HelloServiceImpl.java | 2 +-
.../systest/jaxws/spring/boot/SpringJaxwsTest.java | 18 +-
.../resources/application-jaxrs-classes-scan.yml | 2 +-
.../resources/application-jaxrs-component-scan.yml | 2 +-
systests/tracing/pom.xml | 8 +-
.../cxf/systest/jaxrs/tracing/BookStore.java | 23 +-
.../jaxrs/tracing/NullPointerExceptionMapper.java | 8 +-
.../jaxrs/tracing/brave/BraveTracingTest.java | 11 +-
.../opentracing/OpenTracingTracingTest.java | 11 +-
.../systest/jaxws/tracing/BookStoreService.java | 3 +-
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 11 +-
.../jaxws/tracing/brave/BraveTracingTest.java | 3 +-
.../jaxws/tracing/opentracing/BookStore.java | 11 +-
.../opentracing/OpenTracingTracingTest.java | 3 +-
systests/transport-hc5/pom.xml | 4 +-
.../org/apache/cxf/systest/hc5/GreeterImpl.java | 3 +-
.../hc5/https/clientauth/ClientAuthTest.java | 2 +-
.../HostnameVerificationDeprecatedTest.java | 2 +-
.../https/hostname/HostnameVerificationTest.java | 2 +-
.../systest/hc5/https/trust/TrustManagerTest.java | 2 +-
.../hc5/https/trust/TrustServerNoSpring.java | 2 +-
.../org/apache/cxf/systest/hc5/jaxrs/Book.java | 14 +-
.../systest/hc5/jaxrs/BookServerAsyncClient.java | 19 +-
.../apache/cxf/systest/hc5/jaxrs/BookStore.java | 35 ++-
.../org/apache/cxf/systest/hc5/jaxrs/Chapter.java | 16 +-
.../systest/hc5/jaxrs/JAXRSAsyncClientTest.java | 49 ++--
.../org/apache/cxf/systest/hc5/jaxrs/RETRIEVE.java | 2 +-
.../systest/hc5/jaxws/JAXWSAsyncClientTest.java | 9 +-
systests/transport-jms/pom.xml | 33 ++-
.../jms/testsuite/services/GreeterSpecImpl.java | 2 +-
.../services/GreeterSpecWithPortError.java | 2 +-
.../cxf/jms/testsuite/services/Test0001Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0003Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0005Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0006Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0008Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0009Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0010Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0011Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0012Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0013Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0014Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test0101Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1001Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1002Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1003Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1004Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1006Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1007Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1008Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1101Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1102Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1103Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1104Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1105Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1106Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1107Impl.java | 2 +-
.../cxf/jms/testsuite/services/Test1108Impl.java | 2 +-
.../jms/testsuite/services/TestSuiteServer.java | 3 +-
.../testsuite/testcases/SOAPJMSTestSuiteTest.java | 18 +-
.../jms/testsuite/testcases/SoapJmsSpecTest.java | 8 +-
.../apache/cxf/jms/testsuite/util/JMSTestUtil.java | 21 +-
.../apache/cxf/systest/jms/AbstractVmJMSTest.java | 57 ++--
.../cxf/systest/jms/GreeterByteMessageImpl.java | 2 +-
.../org/apache/cxf/systest/jms/GreeterImplDoc.java | 2 +-
.../jms/GreeterImplQueueDecoupledOneWays.java | 6 +-
...eterImplQueueDecoupledOneWaysDeferredReply.java | 3 +-
.../cxf/systest/jms/GreeterImplQueueOneWay.java | 5 +-
.../apache/cxf/systest/jms/GreeterImplSoap12.java | 5 +-
.../cxf/systest/jms/GreeterImplTopicOneWay.java | 3 +-
.../cxf/systest/jms/GreeterImplTwoWayJMS.java | 2 +-
.../java/org/apache/cxf/systest/jms/Hello.java | 6 +-
.../java/org/apache/cxf/systest/jms/HelloImpl.java | 2 +-
.../cxf/systest/jms/JMSClientServerSoap12Test.java | 2 +-
.../cxf/systest/jms/JMSClientServerTest.java | 16 +-
.../org/apache/cxf/systest/jms/JMSMTOMImpl.java | 7 +-
.../org/apache/cxf/systest/jms/JMSTestMtom.java | 12 +-
.../apache/cxf/systest/jms/JmsDestPubSubImpl.java | 3 +-
.../java/org/apache/cxf/systest/jms/Server.java | 3 +-
.../cxf/systest/jms/SoapService6SoapPort6Impl.java | 2 +-
.../cxf/systest/jms/SoapService7SoapPort7Impl.java | 2 +-
.../org/apache/cxf/systest/jms/TestReceiver.java | 21 +-
.../apache/cxf/systest/jms/TwoWayJMSImplBase.java | 11 +-
.../cxf/systest/jms/action/JMSSoapActionTest.java | 2 +-
.../org/apache/cxf/systest/jms/action/Server.java | 3 +-
.../jms/action/SoapActionGreeterImplTwoWayJMS.java | 3 +-
.../GreeterImplWithContinuationsJMS.java | 7 +-
.../continuations/HWSoapMessageDocProvider.java | 22 +-
.../jms/continuations/HelloContinuation.java | 6 +-
.../continuations/HelloContinuationService.java | 7 +-
.../HelloWorldWithContinuationsJMS.java | 7 +-
.../HelloWorldWithContinuationsJMS2.java | 7 +-
.../continuations/ProviderJMSContinuationTest.java | 2 +-
.../MultiTransportClientServerTest.java | 12 +-
.../systest/jms/security/JMSWSSecurityTest.java | 2 +-
.../jms/security/SecurityGreeterImplTwoWayJMS.java | 3 +-
.../apache/cxf/systest/jms/security/Server.java | 3 +-
.../GreeterImplTwoWayJMSAppCorrelationIDEng.java | 3 +-
...eeterImplTwoWayJMSAppCorrelationIDNoPrefix.java | 3 +-
.../GreeterImplTwoWayJMSAppCorrelationIDSales.java | 3 +-
...plTwoWayJMSAppCorrelationIDStaticPrefixEng.java | 3 +-
...TwoWayJMSAppCorrelationIDStaticPrefixSales.java | 3 +-
...TwoWayJMSRuntimeCorrelationIDDynamicPrefix.java | 3 +-
...oWayJMSRuntimeCorrelationIDStaticPrefixEng.java | 3 +-
...ayJMSRuntimeCorrelationIDStaticPrefixSales.java | 3 +-
.../cxf/systest/jms/shared/JMSSharedQueueTest.java | 2 +-
.../cxf/systest/jms/swa/ClientServerSwaTest.java | 8 +-
.../org/apache/cxf/systest/jms/swa/SwAService.java | 14 +-
.../apache/cxf/systest/jms/swa/SwAServiceImpl.java | 10 +-
.../systest/jms/tx/GreeterImplWithTransaction.java | 7 +-
.../cxf/systest/jms/tx/JMSTransactionTest.java | 43 ++-
.../src/test/resources/jms/testcase.xjb | 6 +-
.../src/test/resources/swa-mime_jms.wsdl | 2 +-
systests/transport-netty/pom.xml | 4 +-
.../netty/AbstractNettyClientServerHttp2Test.java | 3 +-
.../org/apache/cxf/systest/http2/netty/Book.java | 8 +-
.../apache/cxf/systest/http2/netty/BookStore.java | 13 +-
.../cxf/systest/http2/netty/Http2TestClient.java | 2 +-
systests/transport-undertow/pom.xml | 4 +-
.../http_undertow/ClientServerSessionTest.java | 11 +-
.../apache/cxf/systest/http_undertow/Dummy.java | 4 +-
.../cxf/systest/http_undertow/DummyInterface.java | 4 +-
.../cxf/systest/http_undertow/GreeterImpl.java | 7 +-
.../systest/http_undertow/GreeterSessionImpl.java | 22 +-
.../PerRequestAnnotationGreeterImpl.java | 8 +-
.../apache/cxf/systest/http_undertow/Server.java | 3 +-
.../SessionAnnotationGreeterImpl.java | 8 +-
.../http_undertow/SpringAnnotationGreeterImpl.java | 7 +-
.../systest/http_undertow/StatefulGreeterImpl.java | 8 +-
.../cxf/systest/http_undertow/ThreadPoolTest.java | 2 +-
.../http_undertow/UndertowBasicAuthServer.java | 3 +-
.../http_undertow/UndertowBasicAuthTest.java | 2 +-
.../http_undertow/UndertowDigestAuthTest.java | 6 +-
.../ClientServerWrappedContinuationTest.java | 2 +-
.../continuations/HelloContinuation.java | 6 +-
.../continuations/HelloContinuationService.java | 7 +-
.../HelloImplWithWrapppedContinuation.java | 7 +-
.../AbstractUndertowClientServerHttp2Test.java | 3 +-
.../http_undertow/http2/Http2TestClient.java | 2 +-
.../cxf/systest/http_undertow/websocket/Book.java | 16 +-
.../websocket/BookNotFoundDetails.java | 2 +-
.../http_undertow/websocket/BookNotFoundFault.java | 2 +-
.../websocket/BookStorePerRequest.java | 14 +-
.../websocket/BookStoreWebSocket.java | 23 +-
.../systest/http_undertow/websocket/Chapter.java | 16 +-
.../systest/http_undertow/websocket/SuperBook.java | 2 +-
systests/transports/pom.xml | 14 +-
.../apache/cxf/systest/http/BadGreeterImpl.java | 3 +-
.../org/apache/cxf/systest/http/BadServer.java | 3 +-
.../org/apache/cxf/systest/http/BareServer.java | 3 +-
.../cxf/systest/http/ClientServerSessionTest.java | 11 +-
.../org/apache/cxf/systest/http/GreeterImpl.java | 3 +-
.../cxf/systest/http/GreeterSessionImpl.java | 22 +-
.../systest/http/HTTPConduitIoExceptionsTest.java | 4 +-
.../http/PerRequestAnnotationGreeterImpl.java | 8 +-
.../systest/http/SessionAnnotationGreeterImpl.java | 8 +-
.../systest/http/SpringAnnotationGreeterImpl.java | 7 +-
.../cxf/systest/http/StatefulGreeterImpl.java | 8 +-
.../cxf/systest/http/WSDLAddressRewriteTest.java | 3 +-
.../http/auth/DigestAuthSupplierJettyTest.java | 11 +-
.../http/auth/DigestAuthSupplierSpringTest.java | 7 +-
.../AbstractJettyClientServerHttp2Test.java | 3 +-
.../org/apache/cxf/systest/http2_jetty/Book.java | 7 +-
.../apache/cxf/systest/http2_jetty/BookStore.java | 7 +-
.../cxf/systest/http2_jetty/Http2TestClient.java | 21 +-
.../org/apache/cxf/systest/http_jetty/Dummy.java | 4 +-
.../cxf/systest/http_jetty/DummyInterface.java | 4 +-
.../apache/cxf/systest/http_jetty/GreeterImpl.java | 7 +-
.../systest/http_jetty/JettyBasicAuthServer.java | 3 +-
.../cxf/systest/http_jetty/JettyBasicAuthTest.java | 2 +-
.../systest/http_jetty/JettyDigestAuthTest.java | 6 +-
.../org/apache/cxf/systest/http_jetty/Server.java | 3 +-
.../cxf/systest/http_jetty/ThreadPoolTest.java | 2 +-
.../ClientServerWrappedContinuationTest.java | 2 +-
.../continuations/HelloContinuation.java | 6 +-
.../continuations/HelloContinuationService.java | 7 +-
.../HelloImplWithWrapppedContinuation.java | 7 +-
.../https/ciphersuites/CipherSuitesTest.java | 2 +-
.../systest/https/clientauth/ClientAuthTest.java | 2 +-
.../cxf/systest/https/conduit/HTTPSClientTest.java | 2 +-
.../https/constraints/CertConstraintsTest.java | 5 +-
.../HostnameVerificationDeprecatedTest.java | 6 +-
.../https/hostname/HostnameVerificationTest.java | 2 +-
.../cxf/systest/https/trust/TrustManagerTest.java | 2 +-
.../systest/https/trust/TrustServerNoSpring.java | 2 +-
.../local_transport/DirectDispatchClientTest.java | 4 +-
.../apache/cxf/systest/local_transport/Server.java | 5 +-
.../apache/cxf/systest/servlet/CXFServletTest.java | 6 +-
.../java/org/apache/cxf/systest/servlet/Hello.java | 6 +-
.../org/apache/cxf/systest/servlet/HelloImpl.java | 2 +-
.../cxf/systest/servlet/NoSpringServletServer.java | 3 +-
.../systest/servlet/SpringServletContextTest.java | 5 +-
.../cxf/systest/servlet/SpringServletTest.java | 3 +-
.../apache/cxf/systest/servlet/TestServlet.java | 2 +-
.../org/apache/cxf/systest/soap_udp/Server.java | 5 +-
.../apache/cxf/systest/soap_udp/SoapUDPTest.java | 2 +-
systests/uncategorized/pom.xml | 35 +--
.../java/org/apache/cxf/cxf1226/HelloWorld.java | 10 +-
.../org/apache/cxf/cxf1226/HelloWorldImpl.java | 2 +-
.../java/org/apache/cxf/cxf1226/package-info.java | 4 +-
.../test/java/org/apache/cxf/cxf1332/Cxf1332.java | 8 +-
.../java/org/apache/cxf/cxf1332/Cxf1332Impl.java | 8 +-
.../RespectBindingFeatureClientServerTest.java | 10 +-
.../test/java/org/apache/cxf/cxf2006/Server.java | 3 +-
.../basicDOCBare/DOCBareClientServerTest.java | 6 +-
.../basicDOCBare/PutLastTradedPriceImpl.java | 5 +-
.../apache/cxf/systest/basicDOCBare/Server.java | 8 +-
.../AddNumbersPortType.java | 14 +-
.../apache/cxf/systest/bus/BusShutdownTest.java | 5 +-
.../systest/callback/CallbackClientServerTest.java | 6 +-
.../apache/cxf/systest/callback/CallbackImpl.java | 2 +-
.../org/apache/cxf/systest/callback/Server.java | 3 +-
.../apache/cxf/systest/callback/ServerImpl.java | 10 +-
.../clustering/CircuitBreakerFailoverTest.java | 5 +-
.../apache/cxf/systest/clustering/ControlImpl.java | 9 +-
.../cxf/systest/clustering/GreeterImplA.java | 7 +-
.../cxf/systest/clustering/GreeterImplB.java | 3 +-
.../cxf/systest/clustering/GreeterImplC.java | 3 +-
.../cxf/systest/clustering/GreeterImplD.java | 3 +-
.../cxf/systest/clustering/GreeterImplE.java | 3 +-
.../LoadDistributorAddressOverrideTest.java | 3 +-
.../systest/clustering/LoadDistributorTest.java | 3 +-
.../org/apache/cxf/systest/clustering/Server.java | 3 +-
.../cxf/systest/coloc/AbstractColocTest.java | 6 +-
.../coloc/AbstractHeaderServiceDocLitTest.java | 2 +-
.../coloc/AbstractHeaderServiceRpcLitTest.java | 6 +-
.../systest/coloc/BaseHeaderTesterDocLitImpl.java | 3 +-
.../systest/coloc/BaseHeaderTesterRpcLitImpl.java | 3 +-
.../cxf/systest/coloc/ColocHeaderDocLitTest.java | 2 +-
.../cxf/systest/coloc/ColocHeaderRpcLitTest.java | 2 +-
.../cxf/systest/coloc/ThrowFaultInterceptor.java | 3 +-
.../apache/cxf/systest/corba/BaseGreeterImpl.java | 2 +-
.../cxf/systest/corba/BaseGreeterTimeoutImpl.java | 2 +-
.../apache/cxf/systest/corba/CorbaTimeoutTest.java | 2 +-
.../java/org/apache/cxf/systest/corba/Server.java | 3 +-
.../apache/cxf/systest/corba/ServerTimeout.java | 3 +-
.../cxf/systest/cxf6319/Cxf6319TestCase.java | 3 +-
.../apache/cxf/systest/cxf6319/EmptyHandler.java | 7 +-
.../apache/cxf/systest/cxf6319/ServiceImpl.java | 6 +-
.../org/apache/cxf/systest/cxf6319/handler.xml | 4 +-
.../java/org/apache/cxf/systest/cxf993/Server.java | 3 +-
.../systest/exception/GenericExceptionTest.java | 4 +-
.../apache/cxf/systest/exception/GenericsEcho.java | 3 +-
.../cxf/systest/exception/GenericsEchoImpl.java | 2 +-
.../cxf/systest/exception/GenericsException.java | 2 +-
.../org/apache/cxf/systest/exception/Server.java | 3 +-
.../factory_pattern/HttpNumberFactoryImpl.java | 4 +-
.../systest/factory_pattern/HttpNumberImpl.java | 9 +-
.../ManualHttpMulitplexClientServerTest.java | 8 +-
.../factory_pattern/ManualNumberFactoryImpl.java | 4 +-
.../systest/factory_pattern/ManualNumberImpl.java | 8 +-
.../factory_pattern/MultiplexClientServerTest.java | 5 +-
.../MultiplexHttpAddressClientServerTest.java | 9 +-
.../systest/factory_pattern/NumberFactoryImpl.java | 4 +-
.../cxf/systest/factory_pattern/NumberImpl.java | 9 +-
.../org/apache/cxf/systest/fault/GreeterImpl.java | 9 +-
.../systest/fault/IntFaultClientServerTest.java | 2 +-
.../java/org/apache/cxf/systest/fault/Server.java | 3 +-
.../cxf/systest/interceptor/GreeterImpl.java | 3 +-
.../systest/interceptor/InterceptorFaultTest.java | 6 +-
.../cxf/systest/jca/OutBoundConnectionTest.java | 8 +-
.../cxf/systest/lifecycle/LifeCycleTest.java | 7 +-
.../management/CountersClientServerTest.java | 2 +-
.../management/ManagedClientServerTest.java | 2 +-
.../apache/cxf/systest/mtom/ClientMtomXopTest.java | 20 +-
.../cxf/systest/mtom/ClientMtomXopWithJMSTest.java | 19 +-
.../java/org/apache/cxf/systest/mtom/Data.java | 12 +-
.../org/apache/cxf/systest/mtom/EchoService.java | 4 +-
.../apache/cxf/systest/mtom/TestMtomJMSImpl.java | 7 +-
.../org/apache/cxf/systest/mtom/package-info.java | 4 +-
.../cxf/systest/mtom_bindingtype/HelloImpl.java | 7 +-
.../mtom_bindingtype/MTOMBindingTypeTest.java | 6 +-
.../cxf/systest/mtom_bindingtype/Server.java | 3 +-
.../apache/cxf/systest/mtom_feature/HelloImpl.java | 4 +-
.../mtom_feature/MtomFeatureClientServerTest.java | 10 +-
.../apache/cxf/systest/mtom_feature/Server.java | 3 +-
.../mtom_schema_validation/ExceptionType.java | 6 +-
.../ExceptionTypeException.java | 2 +-
.../cxf/systest/mtom_schema_validation/Hello.java | 12 +-
.../mtom_schema_validation/HelloResponse.java | 8 +-
.../systest/mtom_schema_validation/HelloWS.java | 10 +-
.../mtom_schema_validation/HelloWSClient.java | 11 +-
.../MTOMProviderSchemaValidationTest.java | 6 +-
.../cxf/systest/mtom_schema_validation/Server.java | 3 +-
.../mtom_schema_validation/TestProvider.java | 12 +-
.../nested_callback/CallbackClientServerTest.java | 4 +-
.../cxf/systest/nested_callback/CallbackImpl.java | 2 +-
.../apache/cxf/systest/nested_callback/Server.java | 3 +-
.../cxf/systest/nested_callback/ServerImpl.java | 10 +-
.../outofband/header/OOBHdrServiceImpl.java | 16 +-
.../systest/outofband/header/OOBHeaderTest.java | 13 +-
.../cxf/systest/outofband/header/Server.java | 4 +-
.../cxf/systest/resolver/JarResolverTest.java | 2 +-
.../org/apache/cxf/systest/resolver/Server.java | 3 +-
.../schema_validation/SchemaValidationImpl.java | 3 +-
.../ValidationClientServerTest.java | 8 +-
.../schema_validation/ValidationServer.java | 12 +-
.../cxf/systest/schemaimport/RequestType.java | 8 +-
.../cxf/systest/schemaimport/ResponseType.java | 6 +-
.../org/apache/cxf/systest/schemaimport/SayHi.java | 12 +-
.../apache/cxf/systest/schemaimport/SayHiImpl.java | 12 +-
.../cxf/systest/schemaimport/SayHiImpl2.java | 12 +-
.../apache/cxf/systest/schemaimport/Server.java | 3 +-
.../cxf/systest/schemaimport/ServiceImpl.java | 2 +-
.../cxf/systest/schemaimport/ServiceV1Port.java | 10 +-
.../cxf/systest/schemaimport/SomeFeatureType.java | 6 +-
.../cxf/systest/schemaimport/TestEndpoint.java | 2 +-
.../cxf/systest/schemaimport/TestEndpointImpl.java | 2 +-
.../cxf/systest/schemaimport/sayhi1/SayHi.java | 6 +-
.../systest/schemaimport/sayhi1/SayHiResponse.java | 8 +-
.../systest/schemaimport/sayhi2/SayHiArray.java | 6 +-
.../schemaimport/sayhi2/SayHiArrayResponse.java | 8 +-
.../cxf/systest/simple/impl/WSSimpleImpl.java | 3 +-
.../apache/cxf/systest/simple/intf/WSSimple.java | 2 +-
.../org/apache/cxf/systest/soap/DoubleItImpl.java | 3 +-
.../org/apache/cxf/systest/soap/DummyService.java | 6 +-
.../apache/cxf/systest/soap/EmptySOAPBodyTest.java | 8 +-
.../cxf/systest/soap/EmptySoapProviderServer.java | 14 +-
.../soap/RPCEncodedSoapActionGreeterImpl.java | 5 +-
.../systest/soap/RPCLitSoapActionGreeterImpl.java | 3 +-
.../cxf/systest/soap/SoapActionGreeterImpl.java | 3 +-
.../apache/cxf/systest/soap/SoapActionTest.java | 3 +-
.../cxf/systest/soap/StaxTransformFeatureTest.java | 2 +-
.../soap/WrappedEncodedSoapActionGreeterImpl.java | 5 +-
.../systest/soap/WrappedSoapActionGreeterImpl.java | 3 +-
.../apache/cxf/systest/soap/XSLTFeatureTest.java | 2 +-
.../org/apache/cxf/systest/soap12/GreeterImpl.java | 2 +-
.../java/org/apache/cxf/systest/soap12/Server.java | 3 +-
.../cxf/systest/soapfault/LoggingHandler.java | 9 +-
.../cxf/systest/soapfault/SOAPFaultImpl.java | 5 +-
.../org/apache/cxf/systest/soapfault/Server.java | 3 +-
.../systest/soapfault/details/GreeterImpl11.java | 7 +-
.../systest/soapfault/details/GreeterImpl12.java | 2 +-
.../soapfault/details/Soap11ClientServerTest.java | 3 +-
.../soapfault/details/Soap12ClientServerTest.java | 2 +-
.../org/apache/cxf/systest/soapfault/handlers.xml | 4 +-
.../systest/soapheader/HeaderClientServerTest.java | 12 +-
.../org/apache/cxf/systest/soapheader/Server.java | 3 +-
.../ExtSoapHeaderClientServerTest.java | 4 +-
.../StaxTransformFeatureTest.java | 3 +-
.../org/apache/cxf/systest/stringarray/Server.java | 3 +-
.../apache/cxf/systest/transform/feature/Echo.java | 2 +-
.../cxf/systest/transform/feature/EchoImpl.java | 2 +-
.../cxf/systest/transform/feature/EchoServer.java | 3 +-
.../transform/feature/TransformFeatureTest.java | 4 +-
.../systest/type_substitution/AppleAdapter.java | 2 +-
.../AppleFindClientServerTest.java | 4 +-
.../cxf/systest/type_substitution/AppleFinder.java | 4 +-
.../systest/type_substitution/AppleFinderImpl.java | 2 +-
.../cxf/systest/type_substitution/AppleServer.java | 3 +-
.../systest/type_substitution/CarDealerImpl.java | 7 +-
.../cxf/systest/type_substitution/Fruit.java | 2 +-
.../cxf/systest/type_substitution/Server.java | 3 +-
.../systest/type_test/AbstractTypeTestClient.java | 4 +-
.../systest/type_test/AbstractTypeTestClient2.java | 5 +-
.../systest/type_test/AbstractTypeTestClient3.java | 8 +-
.../systest/type_test/AbstractTypeTestClient4.java | 4 +-
.../systest/type_test/AbstractTypeTestClient5.java | 7 +-
.../type_test/corba/CORBADocLitServerImpl.java | 6 +-
.../type_test/soap/SOAPDocLitClientTypeTest.java | 4 +-
.../type_test/soap/SOAPDocLitServerImpl.java | 8 +-
.../type_test/soap/SOAPRpcLitServerImpl.java | 5 +-
.../cxf/systest/type_test/xml/XMLServerImpl.java | 7 +-
.../versioning/ClientServerVersioningTest.java | 1 -
.../org/apache/cxf/systest/versioning/Server.java | 3 +-
.../cxf/systest/wsdl/LifeCycleListenerTester.java | 3 +-
.../ws/rm/AbstractClientPersistenceTest.java | 5 +-
.../ws/rm/AbstractServerPersistenceTest.java | 5 +-
.../apache/cxf/systest/ws/rm/BasicDocEndpoint.java | 4 +-
.../cxf/systest/ws/rm/BasicDocEndpointImpl.java | 4 +-
.../cxf/systest/ws/rm/CachedOutMessageTest.java | 3 +-
.../org/apache/cxf/systest/ws/rm/ControlImpl.java | 10 +-
.../cxf/systest/ws/rm/DecoupledBareTest.java | 6 +-
.../ws/rm/DecoupledClientServerOnewayTest.java | 5 +-
.../systest/ws/rm/DecoupledClientServerTest.java | 5 +-
.../systest/ws/rm/DeliveryAssuranceOnewayTest.java | 10 +-
.../org/apache/cxf/systest/ws/rm/GreeterImpl.java | 3 +-
.../cxf/systest/ws/rm/ManagedEndpointsTest.java | 2 +-
.../systest/ws/rm/MessageCallbackOnewayTest.java | 12 +-
.../cxf/systest/ws/rm/PersistentGreeterImpl.java | 3 +-
.../cxf/systest/ws/rm/ProtocolVariationsTest.java | 4 +-
.../apache/cxf/systest/ws/rm/RedeliveryTest.java | 3 +-
.../cxf/systest/ws/rm/RetransmissionGZIPTest.java | 3 +-
.../cxf/systest/ws/rm/RetransmissionQueueTest.java | 3 +-
.../systest/ws/rm/RobustServiceAtMostOnceTest.java | 3 +-
.../systest/ws/rm/RobustServiceWithFaultTest.java | 3 +-
.../org/apache/cxf/systest/ws/rm/SequenceTest.java | 10 +-
.../cxf/systest/ws/rm/SequenceTimeoutTest.java | 10 +-
.../java/org/apache/cxf/systest/ws/rm/Server.java | 3 +-
.../systest/ws/rm/ServiceInvocationAckBase.java | 3 +-
.../cxf/systest/ws/rm/WSRM12ServerCycleTest.java | 7 +-
.../apache/cxf/systest/ws/rm/policy/Greeting.java | 6 +-
.../cxf/systest/ws/rm/policy/GreetingService.java | 6 +-
.../apache/cxf/systest/ws/rm/policy/Server.java | 3 +-
.../ws/rm/policy/WSRMOptionalPolicyTest.java | 4 +-
.../examples/common/DoubleItPortTypeImpl.java | 7 +-
.../wssec/examples/common/SecurityTestUtil.java | 3 +-
.../systest/wssec/examples/saml/SamlTokenTest.java | 4 +-
.../examples/secconv/SecureConversationTest.java | 2 +-
.../wssec/examples/ut/UsernameTokenTest.java | 2 +-
.../systest/wssec/examples/x509/X509TokenTest.java | 2 +-
.../apache/cxf/systest/ws/action/ActionTest.java | 18 +-
.../systest/ws/action/SignatureWhitespaceTest.java | 4 +-
.../org/apache/cxf/systest/ws/action/UTServer.java | 3 +-
.../systest/ws/algsuite/AlgorithmSuiteTest.java | 2 +-
.../ws/algsuite/StaxAlgorithmSuiteTest.java | 2 +-
.../systest/ws/basicauth/BasicAuthJAASTest.java | 2 +-
.../cxf/systest/ws/basicauth/BasicAuthTest.java | 4 +-
.../systest/ws/bindings/BindingPropertiesTest.java | 22 +-
.../apache/cxf/systest/ws/cache/CachingTest.java | 4 +-
.../cxf/systest/ws/common/DoubleIt2Impl.java | 3 +-
.../cxf/systest/ws/common/DoubleIt3Impl.java | 3 +-
.../ws/common/DoubleItImplContinuation.java | 7 +-
.../cxf/systest/ws/common/DoubleItOneWayImpl.java | 3 +-
.../systest/ws/common/DoubleItPortTypeImpl.java | 7 +-
.../cxf/systest/ws/common/SecurityTestUtil.java | 3 +-
.../CryptoCoverageCheckerTest.java | 2 +-
.../ws/fault/AbstractModifyRequestInterceptor.java | 6 +-
.../cxf/systest/ws/fault/DoubleItPortTypeImpl.java | 7 +-
.../ws/fault/DoubleItPortTypeImplJavaFirst.java | 7 +-
.../org/apache/cxf/systest/ws/fault/FaultTest.java | 6 +-
.../cxf/systest/ws/fault/ModifiedRequestTest.java | 6 +-
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 2 +-
.../apache/cxf/systest/ws/httpget/HTTPGetTest.java | 2 +-
.../cxf/systest/ws/https/HttpsTokenTest.java | 6 +-
.../apache/cxf/systest/ws/mtom/DoubleIt4Impl.java | 4 +-
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 8 +-
.../org/apache/cxf/systest/ws/parts/PartsTest.java | 30 +--
.../ws/password/PasswordPropertiesTest.java | 2 +-
.../policy/JavaFirstAttachmentPolicyService.java | 4 +-
.../JavaFirstAttachmentPolicyServiceImpl.java | 2 +-
.../systest/ws/policy/JavaFirstPolicyService.java | 5 +-
.../ws/policy/JavaFirstPolicyServiceImpl.java | 2 +-
.../ws/policy/JavaFirstPolicyServiceTest.java | 2 +-
.../systest/ws/policy/PolicyAlternativeTest.java | 10 +-
.../SslUsernamePasswordAttachmentService.java | 4 +-
.../SslUsernamePasswordAttachmentServiceImpl.java | 2 +-
.../systest/ws/policy/handler/DummyHandler.java | 7 +-
.../systest/ws/policy/handler/HelloService.java | 9 +-
.../ws/policy/handler/HelloServiceImpl.java | 9 +-
.../cxf/systest/ws/policy/handler/MyFault.java | 2 +-
.../handler/PolicyHandlerFaultResponseTest.java | 6 +-
.../cxf/systest/ws/policy/handler/Server.java | 3 +-
.../ws/policy/javafirst/BindingSimpleService.java | 4 +-
.../policy/javafirst/BindingSimpleServiceImpl.java | 3 +-
.../NoAlternativesOperationSimpleService.java | 4 +-
.../NoAlternativesOperationSimpleServiceImpl.java | 3 +-
.../policy/javafirst/OperationSimpleService.java | 4 +-
.../javafirst/OperationSimpleServiceImpl.java | 3 +-
.../ws/policy/operation/PolicyOperationTest.java | 2 +-
.../apache/cxf/systest/ws/saml/SamlTokenTest.java | 40 +--
.../ws/saml/subjectconf/SamlSubjectConfTest.java | 16 +-
.../cxf/systest/ws/security/GreeterImpl.java | 4 +-
.../systest/ws/security/SecurityPolicyTest.java | 22 +-
.../cxf/systest/ws/security/TestOutHandler.java | 7 +-
.../systest/ws/security/WSSecurityClientTest.java | 30 +--
.../systest/ws/security/handler/HelloWorld.java | 6 +-
.../ws/security/handler/HelloWorldImpl.java | 6 +-
.../systest/ws/security/handler/JAXWSHandler.java | 9 +-
.../cxf/systest/ws/security/handler/WSSecTest.java | 2 +-
.../apache/cxf/systest/ws/swa/SWAActionTest.java | 2 +-
.../apache/cxf/systest/ws/swa/SWAPolicyTest.java | 4 +-
.../systest/ws/tokens/BinarySecurityTokenTest.java | 4 +-
.../cxf/systest/ws/tokens/DoubleItBSTImpl.java | 7 +-
.../ws/tokens/EndorsingSupportingTokenTest.java | 10 +-
.../cxf/systest/ws/tokens/SupportingTokenTest.java | 16 +-
.../ws/ut/SecurityHeaderCacheInterceptor.java | 8 +-
.../systest/ws/ut/UsernameTokenDerivedTest.java | 2 +-
.../cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 16 +-
.../cxf/systest/ws/ut/UsernameTokenTest.java | 14 +-
.../org/apache/cxf/systest/ws/wssc/Server.java | 5 +-
.../org/apache/cxf/systest/ws/wssc/StaxServer.java | 5 +-
.../org/apache/cxf/systest/ws/wssc/WSSCTest.java | 2 +-
.../apache/cxf/systest/ws/wssc/WSSCUnitTest.java | 4 +-
.../cxf/systest/ws/wssec10/WSSecurity10Test.java | 2 +-
.../server/MutualCertificate10SignEncrypt.java | 2 +-
.../MutualCertificate10SignEncryptRestricted.java | 2 +-
...tualCertificate10SignEncryptRsa15TripleDes.java | 2 +-
...icate10SignEncryptRsa15TripleDesRestricted.java | 2 +-
.../systest/ws/wssec10/server/PingServiceBase.java | 5 +-
.../ws/wssec10/server/UserNameOverTransport.java | 2 +-
.../server/UserNameOverTransportRestricted.java | 2 +-
.../cxf/systest/ws/wssec11/WSSecurity11Common.java | 2 +-
.../systest/ws/wssec11/server/AbstractServer.java | 5 +-
.../wssec11/server/AbstractServerRestricted.java | 5 +-
.../systest/ws/x509/DoubleItIntermediaryImpl.java | 10 +-
.../systest/ws/x509/DoubleItPropertiesImpl.java | 3 +-
.../apache/cxf/systest/ws/x509/X509TokenTest.java | 24 +-
.../org/apache/cxf/systest/ws/xkms/XKMSTest.java | 2 +-
systests/ws-specs/pom.xml | 10 +-
.../cxf/systest/ws/addr_disable/AddNumberImpl.java | 9 +-
.../systest/ws/addr_disable/WSADisableTest.java | 16 +-
.../cxf/systest/ws/addr_feature/AddNumberImpl.java | 8 +-
.../ws/addr_feature/FaultToEndpointServer.java | 17 +-
.../apache/cxf/systest/ws/addr_feature/Server.java | 2 +-
.../ws/addr_feature/WSAClientServerTest.java | 14 +-
.../addr_feature/WSAFaultToClientServerTest.java | 4 +-
.../systest/ws/addr_fromjava/WSAFromJavaTest.java | 6 +-
.../ws/addr_fromjava/server/AddNumberImpl.java | 10 +-
.../addr_fromjava/server/AddNumberImplNoAddr.java | 4 +-
.../systest/ws/addr_fromwsdl/AddNumberImpl.java | 7 +-
.../cxf/systest/ws/addr_fromwsdl/Server.java | 3 +-
.../systest/ws/addr_fromwsdl/WSAFromWSDLTest.java | 8 +-
.../cxf/systest/ws/addr_responses/Hello.java | 6 +-
.../cxf/systest/ws/addr_responses/HelloImpl.java | 6 +-
.../systest/ws/addr_responses/HelloService.java | 7 +-
.../WSAResponsesClientServerTest.java | 2 +-
.../cxf/systest/ws/addr_wsdl/AddNumberImpl.java | 7 +-
.../apache/cxf/systest/ws/addr_wsdl/Server.java | 18 +-
.../cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java | 14 +-
.../MessageProviderWithAddressingPolicy.java | 8 +-
.../systest/ws/addressing/AbstractGreeterImpl.java | 9 +-
.../systest/ws/addressing/DecoupledJMSTest.java | 4 +-
.../cxf/systest/ws/addressing/HeaderVerifier.java | 10 +-
.../apache/cxf/systest/ws/addressing/MAPTest.java | 2 +-
.../cxf/systest/ws/addressing/MAPTestBase.java | 6 +-
.../systest/ws/addressing/NonDecoupledJMSTest.java | 4 +-
.../systest/ws/addressing/NonDecoupledTest.java | 2 +-
.../apache/cxf/systest/ws/addressing/Server.java | 3 +-
.../apache/cxf/systest/ws/mex/AddNumberImpl.java | 7 +-
.../ws/policy/AddressingAnonymousPolicyTest.java | 3 +-
.../ws/policy/AddressingInlinePolicyTest.java | 3 +-
.../ws/policy/AddressingOptionalPolicyTest.java | 3 +-
.../ws/policy/AddressingPolicy0705Test.java | 3 +-
...dressingPolicyExternalAttachmentWsdl11Test.java | 3 +-
.../systest/ws/policy/AddressingPolicyTest.java | 3 +-
.../apache/cxf/systest/ws/policy/GreeterImpl.java | 3 +-
.../systest/ws/policy/HTTPClientPolicyTest.java | 4 +-
.../systest/ws/policy/HTTPServerPolicyTest.java | 5 +-
.../cxf/systest/ws/policy/HttpGreeterImpl.java | 3 +-
.../ws/policy/NestedAddressingPolicyTest.java | 3 +-
.../apache/cxf/systest/ws/policy/RMPolicyTest.java | 3 +-
.../cxf/systest/ws/policy/ReliableGreeterImpl.java | 3 +-
.../systest/ws/policy/ReliableGreeterImpl2.java | 3 +-
.../wsdl_systest_wsspec/add_numbers-binding.xml | 2 +-
.../cxf/systest/ws/transfer/CreateStudentTest.java | 2 +-
.../cxf/systest/ws/transfer/CreateTeacherTest.java | 2 +-
.../apache/cxf/systest/ws/transfer/DeleteTest.java | 2 +-
.../apache/cxf/systest/ws/transfer/PutTest.java | 2 +-
.../apache/cxf/systest/ws/transfer/TestUtils.java | 2 +-
.../wsdl_maven/codegen/src/it/cxf-4004/pom.xml | 4 +-
.../cxf-4004/src/main/resources/wsdl/binding.xml | 2 +-
.../wsdl_maven/codegen/src/it/it-parent/pom.xml | 2 +-
.../codegen/src/main/resources/defaultBinding.xml | 2 +-
.../apache/cxf/systests/java2ws/HelloWorld.java | 5 +-
.../cxf/systests/java2ws/HelloWorldArgs.java | 5 +-
systests/wsdl_maven/pom.xml | 12 +-
testutils/pom.xml | 18 +-
.../AnonymousComplexTypeImpl.java | 2 +-
.../org/apache/cxf/authservice/AuthService.java | 4 +-
.../apache/cxf/authservice/AuthServiceImpl.java | 2 +-
.../org/apache/cxf/calculator/CalculatorImpl.java | 3 +-
.../java/org/apache/cxf/customer/Customer.java | 2 +-
.../cxf/customer/CustomerNotFoundDetails.java | 2 +-
.../apache/cxf/customer/CustomerNotFoundFault.java | 2 +-
.../java/org/apache/cxf/customer/Customers.java | 2 +-
.../apache/cxf/customer/bare/CustomerService.java | 15 +-
.../org/apache/cxf/customer/bare/GetCustomer.java | 4 +-
.../org/apache/cxf/customer/bare/GetCustomers.java | 2 +-
.../org/apache/cxf/customer/bare/package-info.java | 4 +-
.../java/org/apache/cxf/customer/book/Book.java | 2 +-
.../cxf/customer/book/BookNotFoundDetails.java | 2 +-
.../cxf/customer/book/BookNotFoundFault.java | 2 +-
.../org/apache/cxf/customer/book/BookService.java | 6 +-
.../apache/cxf/customer/book/BookServiceImpl.java | 2 +-
.../cxf/customer/book/BookServiceWrapped.java | 6 +-
.../cxf/customer/book/BookServiceWrappedImpl.java | 2 +-
.../java/org/apache/cxf/customer/book/Books.java | 2 +-
.../java/org/apache/cxf/customer/book/GetBook.java | 2 +-
.../org/apache/cxf/customer/book/package-info.java | 4 +-
.../java/org/apache/cxf/customer/package-info.java | 4 +-
.../cxf/customer/wraped/CustomerService.java | 9 +-
.../apache/cxf/customer/wraped/package-info.java | 4 +-
.../cxf/greeter_control/AbstractGreeterImpl.java | 5 +-
.../apache/cxf/greeter_control/ControlImpl.java | 9 +-
.../cxf/greeter_control/GreeterImplBase.java | 7 +-
.../cxf/greeter_control/GreeterImplBaseNoWsdl.java | 2 +-
.../cxf/greeter_control/GreeterImplNoWsdl.java | 2 +-
.../apache/cxf/greeter_control/GreeterNoWsdl.java | 14 +-
.../cxf/jaxb_element_test/JaxbElementTestImpl.java | 2 +-
.../java/org/apache/cxf/mtom_xop/TestMtomImpl.java | 7 +-
.../apache/cxf/mtom_xop/TestMtomProviderImpl.java | 30 +--
.../apache/cxf/no_body_parts/NoBodyPartsImpl.java | 7 +-
.../OrderedParamHolderImpl.java | 4 +-
.../java/org/apache/cxf/test/TestUtilities.java | 2 +-
.../testutil/common/EmbeddedJMSBrokerLauncher.java | 23 +-
.../org/apache/cxf/testutil/common/TestUtil.java | 3 +-
.../cxf/testutil/handler/TrivialSOAPHandler.java | 13 +-
.../org/apache/header_test/TestHeaderImpl.java | 5 +-
.../apache/header_test/rpc/TestRPCHeaderImpl.java | 5 +-
.../java/org/apache/headers/HeaderTesterImpl.java | 5 +-
.../java/org/apache/hello_world/GreeterImpl.java | 3 +-
.../apache/hello_world_doc_lit/GreeterImplDoc.java | 3 +-
.../hello_world_doc_lit/HTTPGreeterImpl.java | 2 +-
.../apache/hello_world_doc_lit/JMSGreeterImpl.java | 2 +-
.../GreeterImplMixedStyle.java | 3 +-
.../AnnotatedGreeterImpl.java | 20 +-
.../AnnotatedGreeterNoOverloadImpl.java | 20 +-
.../AnotherDerivedGreeterImpl.java | 11 +-
.../hello_world_soap_http/BaseGreeterImpl.java | 15 +-
.../hello_world_soap_http/DerivedGreeterImpl.java | 11 +-
.../DocLitBareGreeterImpl.java | 7 +-
.../hello_world_soap_http/DocLitBareImpl.java | 5 +-
.../GreeterEndpointInterface.java | 2 +-
.../apache/hello_world_soap_http/GreeterImpl.java | 2 +-
.../HWSoapMessageProvider.java | 10 +-
.../HWSourcePayloadProvider.java | 10 +-
.../org/apache/hello_world_soap_http/Hello.java | 8 +-
.../apache/hello_world_soap_http/HelloImpl.java | 2 +-
.../HelloWorldServiceProvider.java | 13 +-
.../HelloWrongAnnotation.java | 4 +-
.../NotAnnotatedGreeterImpl.java | 5 +-
.../NotAnnotatedProvider.java | 3 +-
.../hello_world_soap_http/RPCLitGreeterImpl.java | 3 +-
.../any_types/GreeterImpl.java | 3 +-
.../hello_world_xml_http/bare/GreeterImpl.java | 4 +-
.../hello_world_xml_http/mixed/GreeterImpl.java | 4 +-
.../wrapped/GreeterFaultImpl.java | 4 +-
.../hello_world_xml_http/wrapped/GreeterImpl.java | 4 +-
.../src/main/resources/wsdl/async_binding.xml.tmpl | 2 +-
.../main/resources/wsdl/basic_callback_test.wsdl | 4 +-
.../src/main/resources/wsdl/factory_pattern.wsdl | 2 +-
.../resources/wsdl/greeter_control-binding.xml | 2 +-
.../src/main/resources/wsdl/header_doc_lit.wsdl | 4 +-
.../main/resources/wsdl/hello_world-binding.xml | 2 +-
.../resources/wsdl/hello_world_async-binding.xml | 2 +-
.../main/resources/wsdl/hello_world_doc_lit.wsdl | 14 +-
.../main/resources/wsdl/jms_spec_testsuite.wsdl | 60 ++---
.../src/main/resources/wsdl/jms_test-binding.xml | 2 +-
testutils/src/main/resources/wsdl/jms_test.wsdl | 16 +-
.../src/main/resources/wsdl/jms_test_mtom.wsdl | 2 +-
.../src/main/resources/wsdl/nested_callback.wsdl | 4 +-
.../src/main/resources/wsdl/swa-mime-binding.xml | 2 +-
.../src/main/resources/wsdl/swa-mime-nomime.wsdl | 2 +-
testutils/src/main/resources/wsdl/swa-mime.wsdl | 2 +-
.../main/resources/wsdl/type_test/type_test.xsd | 2 +-
.../resources/wsdl/type_test/type_test_ID_xsd.xsl | 4 +-
.../wsdl/type_test/type_test_impl_java.xsl | 2 +-
.../resources/wsdl/type_test/type_test_wsdl.xsl | 4 +-
.../header_test/rpc/TestRPCHeaderTest.java | 3 +-
tools/common/pom.xml | 4 +-
.../org/apache/cxf/tools/common/ToolConstants.java | 6 +-
.../cxf/tools/common/model/JavaInterface.java | 3 +-
.../apache/cxf/tools/common/model/JavaMethod.java | 2 +-
.../apache/cxf/tools/common/model/JavaPort.java | 3 +-
.../org/apache/cxf/tools/util/AnnotationUtil.java | 5 +-
.../java/org/apache/cxf/tools/util/JAXBUtils.java | 2 +-
.../cxf/tools/common/jaxb/W3CEPRJaxbBinding.xml | 12 +-
.../tools/common/jaxb/W3CEPRJaxbBinding_jaxb22.xml | 12 +-
.../apache/cxf/tools/common/ProcessorTestBase.java | 4 +-
.../cxf/tools/common/model/JAnnotationTest.java | 20 +-
.../cxf/tools/common/model/JavaParameterTest.java | 4 +-
tools/corba/pom.xml | 2 +-
.../cxf/tools/corba/common/SchemaFactory.java | 4 +-
.../cxf/tools/corba/common/WSDLCorbaFactory.java | 4 +-
.../tools/corba/processors/idl/WSDLASTVisitor.java | 2 +-
.../corba/processors/idl/WSDLSchemaManager.java | 2 +-
.../processors/wsdl/WSDLToCorbaProcessor.java | 3 +-
tools/javato/ws/pom.xml | 6 +-
.../tools/java2js/processor/JavaToJSProcessor.java | 5 +-
.../generator/wsdl11/DateTypeCustomGenerator.java | 2 +-
.../wsdl11/annotator/WrapperBeanAnnotator.java | 9 +-
.../annotator/WrapperBeanFieldAnnotator.java | 11 +-
.../java2wsdl/generator/wsdl11/date_type_cust.vm | 6 +-
.../generator/wsdl11/date_type_cust_embed.vm | 6 +-
.../tools/java2wsdl/processor/FrontendFactory.java | 11 +-
.../java2wsdl/processor/JavaToWSDLProcessor.java | 4 +-
.../processor/internal/jaxws/FaultBean.java | 2 +-
.../internal/jaxws/JAXWSFrontEndProcessor.java | 3 +-
.../processor/internal/jaxws/RequestWrapper.java | 11 +-
.../processor/internal/jaxws/ResponseWrapper.java | 17 +-
.../processor/internal/jaxws/Wrapper.java | 4 +-
.../processor/internal/jaxws/WrapperUtil.java | 12 +-
.../jaxws/generator/template/javafirst-client.vm | 4 +-
.../jaxws/generator/template/javafirst-impl.vm | 2 +-
.../jaxws/generator/template/javafirst-sei.vm | 10 +-
.../jaxws/generator/template/javafirst-server.vm | 2 +-
.../internal/simple/generator/template/sei.vm | 10 +-
.../java/org/apache/attachment/AddNumbers.java | 10 +-
.../java/org/apache/attachment/AddNumbersImpl.java | 4 +-
.../apache/cxf/tools/fortest/AddNumbersImpl.java | 8 +-
.../org/apache/cxf/tools/fortest/GreeterImpl.java | 2 +-
.../java/org/apache/cxf/tools/fortest/Hello.java | 2 +-
.../org/apache/cxf/tools/fortest/HelloImpl.java | 2 +-
.../org/apache/cxf/tools/fortest/HelloRMI.java | 2 +-
.../org/apache/cxf/tools/fortest/ImageSender.java | 4 +-
.../org/apache/cxf/tools/fortest/ImageSender2.java | 2 +-
.../java/org/apache/cxf/tools/fortest/MyImage.java | 4 +-
.../org/apache/cxf/tools/fortest/RPCHello.java | 6 +-
.../cxf/tools/fortest/action/AddNumbersImpl.java | 6 +-
.../fortest/addr/AddressingFeatureException.java | 2 +-
.../apache/cxf/tools/fortest/addr/WSAImpl2.java | 12 +-
.../cxf/tools/fortest/aegis2ws/TestAegisSEI.java | 2 +-
.../tools/fortest/classnoanno/docbare/Stock.java | 6 +-
.../fortest/classnoanno/docwrapped/Stock.java | 8 +-
.../classnoanno/docwrapped/jaxws/GetPrice.java | 10 +-
.../docwrapped/jaxws/GetPriceResponse.java | 8 +-
.../docwrapped/jaxws/ObjectFactory.java | 2 +-
.../cxf/tools/fortest/classnoanno/rpc/Stock.java | 6 +-
.../cxf/tools/fortest/cxf1450/WebParamService.java | 6 +-
.../apache/cxf/tools/fortest/cxf1519/Endpoint.java | 4 +-
.../cxf/tools/fortest/cxf1519/EndpointImpl.java | 6 +-
.../cxf/tools/fortest/cxf1519/UserException.java | 4 +-
.../org/apache/cxf/tools/fortest/cxf188/Demo.java | 8 +-
.../cxf/tools/fortest/cxf2934/WebParamService.java | 6 +-
.../tools/fortest/cxf2941/WebResultService.java | 4 +-
.../apache/cxf/tools/fortest/cxf4877/Hello.java | 12 +-
.../cxf/tools/fortest/cxf4877/HelloImpl.java | 2 +-
.../org/apache/cxf/tools/fortest/cxf669/Hello.java | 10 +-
.../apache/cxf/tools/fortest/cxf669/HelloImpl.java | 2 +-
.../apache/cxf/tools/fortest/cxf774/ListTest.java | 8 +-
.../cxf/tools/fortest/cxf774/ListTestImpl.java | 2 +-
.../cxf/tools/fortest/date/EchoCalendar.java | 2 +-
.../apache/cxf/tools/fortest/date/EchoDate.java | 2 +-
.../cxf/tools/fortest/epr/AddNumbersImpl.java | 12 +-
.../tools/fortest/exception/Cl1ToCl2Adapter.java | 2 +-
.../apache/cxf/tools/fortest/exception/Echo.java | 2 +-
.../apache/cxf/tools/fortest/exception/Echo2.java | 2 +-
.../cxf/tools/fortest/exception/Echo2Impl.java | 2 +-
.../apache/cxf/tools/fortest/exception/Echo3.java | 2 +-
.../cxf/tools/fortest/exception/Echo3Impl.java | 2 +-
.../apache/cxf/tools/fortest/exception/Echo4.java | 2 +-
.../apache/cxf/tools/fortest/exception/Echo5.java | 2 +-
.../cxf/tools/fortest/exception/Echo5Impl.java | 2 +-
.../cxf/tools/fortest/exception/EchoImpl.java | 2 +-
.../cxf/tools/fortest/exception/ListException.java | 2 +-
.../cxf/tools/fortest/exception/MyException.java | 4 +-
.../cxf/tools/fortest/exception/MyException2.java | 4 +-
.../cxf/tools/fortest/exception/OrderEcho.java | 2 +-
.../cxf/tools/fortest/exception/OrderEchoImpl.java | 2 +-
.../tools/fortest/exception/OrderException.java | 6 +-
.../cxf/tools/fortest/exception/OrderItem.java | 6 +-
.../exception/TransientMessageException.java | 2 +-
.../tools/fortest/exception/TypeAdapterEcho.java | 2 +-
.../fortest/exception/TypeAdapterException.java | 2 +-
.../cxf/tools/fortest/headers/SomeHeaders.java | 8 +-
.../cxf/tools/fortest/holder/HolderService.java | 8 +-
.../org/apache/cxf/tools/fortest/inherit/A.java | 2 +-
.../org/apache/cxf/tools/fortest/inherit/B.java | 24 +-
.../org/apache/cxf/tools/fortest/inherit/C.java | 2 +-
.../cxf/tools/fortest/jaxws/rpc/Greeter.java | 8 +-
.../cxf/tools/fortest/jaxws/rpc/GreeterFault.java | 8 +-
.../cxf/tools/fortest/jaxws/rpc/PingMeFault.java | 2 +-
.../cxf/tools/fortest/refparam/AddNumbersImpl.java | 8 +-
.../apache/cxf/tools/fortest/simple/Caculator.java | 6 +-
.../doc/EchoGenericNoWrapperBean.java | 8 +-
.../tools/fortest/withannotation/doc/Greeter.java | 8 +-
.../fortest/withannotation/doc/GreeterArray.java | 8 +-
.../withannotation/doc/GreeterNoWrapperBean.java | 8 +-
.../tools/fortest/withannotation/doc/Hello.java | 6 +-
.../withannotation/doc/HelloWithNoWebParam.java | 8 +-
.../fortest/withannotation/doc/HelloWrapped.java | 6 +-
.../tools/fortest/withannotation/doc/SayHi.java | 10 +-
.../withannotation/doc/SayHiNoWrapperBean.java | 10 +-
.../fortest/withannotation/doc/SayHiResponse.java | 8 +-
.../tools/fortest/withannotation/doc/Stock.java | 8 +-
.../fortest/withannotation/doc/Stock12Impl.java | 12 +-
.../fortest/withannotation/doc/StockWrapped.java | 6 +-
.../fortest/withannotation/doc/jaxws/GetPrice.java | 8 +-
.../withannotation/doc/jaxws/GetPriceResponse.java | 6 +-
.../withannotation/doc/jaxws/ObjectFactory.java | 2 +-
.../tools/fortest/withannotation/rpc/EchoImpl.java | 8 +-
.../tools/fortest/withannotation/rpc/Hello.java | 10 +-
.../withannotation/rpc/HelloWrongAnnotation.java | 10 +-
.../cxf/tools/fortest/xmllist/AddNumberImpl.java | 2 +-
.../tools/fortest/xmllist/AddNumbersPortType.java | 14 +-
.../cxf/tools/java2ws/fortest/Calculator.java | 2 +-
.../generator/wsdl11/WrapperBeanGeneratorTest.java | 3 +-
.../cxf/tools/java2wsdl/processor/Hello.java | 2 +-
.../cxf/tools/java2wsdl/processor/HelloBare.java | 8 +-
.../java2wsdl/processor/JavaToProcessorTest.java | 4 +-
.../org/apache/xmladapter/CurrencyAdapter.java | 2 +-
.../test/java/org/apache/xmladapter/Greeter.java | 6 +-
.../java/org/apache/xmladapter/GreeterImpl.java | 2 +-
.../java2wsdl_wsdl/hello_world_async.wsdl | 2 +-
.../wsdl11/expected/DBServiceFaultBean.java.source | 8 +-
.../wsdl11/expected/FaultDetail.java.source | 8 +-
.../generator/wsdl11/expected/calendar.xjb | 12 +-
.../generator/wsdl11/expected/calendar_embed.xml | 10 +-
.../java2wsdl/generator/wsdl11/expected/date.xjb | 8 +-
.../generator/wsdl11/expected/date_embed.xml | 6 +-
.../java2wsdl/processor/expected/echo_calendar.xjb | 10 +-
.../java2wsdl/processor/expected/echo_date.xjb | 6 +-
tools/pom.xml | 3 +-
tools/validator/pom.xml | 4 +-
.../tools/validator/internal/WSIBPValidator.java | 2 +-
tools/wadlto/jaxrs/pom.xml | 2 +
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 2 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 48 ++--
.../cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml | 2 +-
.../cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 21 +-
.../jaxrs/src/test/resources/wadl/jaxbBinding.xml | 2 +-
.../resources/wadl/jaxbBindingWithSchemaLoc.xml | 2 +-
.../src/test/resources/wadl/jaxbSchemaBindings.xml | 2 +-
tools/wsdlto/core/pom.xml | 2 +-
.../cxf/tools/wsdlto/core/AbstractGenerator.java | 3 +-
.../apache/cxf/tools/wsdlto/core/PluginLoader.java | 4 +-
.../wsdlto/databinding/jaxb/JAXBDataBinding.java | 2 +-
tools/wsdlto/frontend/jaxws/pom.xml | 6 +-
.../wsdlto/frontend/jaxws/JAXWSContainer.java | 3 +-
.../jaxws/customization/CustomizationParser.java | 2 +-
.../jaxws/generators/HandlerConfigGenerator.java | 3 +-
.../frontend/jaxws/generators/SEIGenerator.java | 4 +-
.../jaxws/generators/ServiceGenerator.java | 6 +-
.../tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml | 2 +-
.../processor/internal/OperationProcessor.java | 9 +-
.../processor/internal/ParameterProcessor.java | 6 +-
.../jaxws/processor/internal/ProcessorUtil.java | 2 +-
.../jaxws/processor/internal/ServiceProcessor.java | 24 +-
.../internal/annotator/BindingAnnotator.java | 3 +-
.../internal/annotator/SoapBindingAnnotator.java | 3 +-
.../internal/annotator/WSActionAnnotator.java | 4 +-
.../internal/annotator/WebMethodAnnotator.java | 3 +-
.../internal/annotator/WebParamAnnotator.java | 5 +-
.../internal/annotator/WebResultAnnotator.java | 9 +-
.../internal/annotator/WebServiceAnnotator.java | 3 +-
.../internal/annotator/WrapperAnnotator.java | 5 +-
.../annotator/XmlJavaTypeAdapterAnnotator.java | 5 +-
.../internal/annotator/XmlListAnotator.java | 3 +-
.../internal/annotator/XmlSeeAlsoAnnotator.java | 3 +-
.../processor/internal/mapper/MethodMapper.java | 2 +-
.../processor/internal/mapper/ParameterMapper.java | 5 +-
.../tools/wsdlto/frontend/jaxws/template/client.vm | 6 +-
.../tools/wsdlto/frontend/jaxws/template/fault.vm | 4 +-
.../tools/wsdlto/frontend/jaxws/template/impl.vm | 4 +-
.../tools/wsdlto/frontend/jaxws/template/sei.vm | 2 +-
.../tools/wsdlto/frontend/jaxws/template/server.vm | 4 +-
.../wsdlto/frontend/jaxws/template/service.vm | 10 +-
.../jaxws/wsdl11/JAXWSDefinitionBuilder.java | 2 +-
.../jaxws/customization/resources/binding2.xml | 4 +-
.../jaxws/customization/resources/embeded_jaxb.xjb | 4 +-
.../customization/resources/external_jaxws.xml | 2 +-
.../resources/external_jaxws_embed_jaxb.xml | 2 +-
.../resources/external_jaxws_embed_jaxb_date.xml | 2 +-
.../internal/annotator/WebParamAnnotatorTest.java | 2 +-
.../annotator/XmlSeeAlsoAnnotatorTest.java | 2 +-
.../internal/mapper/MethodMapperTest.java | 2 +-
.../frontend/jaxws/wsdl11/resources/binding1.xml | 2 +-
.../frontend/jaxws/wsdl11/resources/binding2.xml | 4 +-
.../frontend/jaxws/wsdl11/resources/binding3.xml | 4 +-
.../jaxws/wsdl11/resources/cxf556_binding.xml | 2 +-
.../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 24 +-
.../apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 73 +++--
.../resources/wsdl2java_wsdl/async_binding.xml | 2 +-
.../wsdl2java_wsdl/async_binding.xml.tmpl | 2 +-
.../resources/wsdl2java_wsdl/basic_callback.wsdl | 4 +-
.../wsdl2java_wsdl/binary_attachment.wsdl | 2 +-
.../wsdl2java_wsdl/bug305924/binding1.xml | 2 +-
.../wsdl2java_wsdl/bug305924/binding2.xml | 4 +-
.../wsdl2java_wsdl/bug627/async_binding.xml | 2 +-
.../src/test/resources/wsdl2java_wsdl/cust.xml | 2 +-
.../wsdl2java_wsdl/cxf-1344/handlerbinding.xml | 4 +-
.../wsdl2java_wsdl/cxf1094/async_binding.xml | 2 +-
.../wsdl2java_wsdl/cxf1094/jaxbbinding.xml | 2 +-
.../resources/wsdl2java_wsdl/cxf1095/binding.xml | 2 +-
.../resources/wsdl2java_wsdl/cxf1095/binding1.xml | 2 +-
.../resources/wsdl2java_wsdl/cxf1106/binding.xml | 2 +-
.../resources/wsdl2java_wsdl/cxf1112/binding.xml | 2 +-
.../wsdl2java_wsdl/cxf1112/jaxbbinding.xml | 2 +-
.../test/resources/wsdl2java_wsdl/cxf1141/jaxb.xml | 4 +-
.../resources/wsdl2java_wsdl/cxf1141/jaxws.xml | 2 +-
.../resources/wsdl2java_wsdl/cxf1152/jaxws1.xml | 4 +-
.../resources/wsdl2java_wsdl/cxf1152/jaxws2.xml | 2 +-
.../wsdl2java_wsdl/cxf3105/ws-binding.xml | 2 +-
.../resources/wsdl2java_wsdl/cxf4452/binding.xml | 2 +-
.../test/resources/wsdl2java_wsdl/cxf918/bug.wsdl | 2 +-
.../test/resources/wsdl2java_wsdl/cxf918/bug2.wsdl | 2 +-
.../test/resources/wsdl2java_wsdl/cxf939/bug.wsdl | 2 +-
.../test/resources/wsdl2java_wsdl/cxf994/async.xml | 2 +-
.../test/resources/wsdl2java_wsdl/echo_date.xjb | 4 +-
.../wsdl2java_wsdl/hello-mime-binding.xml | 4 +-
.../wsdl2java_wsdl/hello_world_async.wsdl | 2 +-
.../hello_world_async_noservice.wsdl | 2 +-
.../wsdl2java_wsdl/hello_world_jaxws_binding.wsdl | 2 +-
.../wsdl2java_wsdl/hello_world_schema_import.xjb | 2 +-
.../wsdl2java_wsdl/jaxb_custom_extensors.xjb | 8 +-
.../wsdl2java_wsdl/locator_with_jaxbbinding.wsdl | 2 +-
.../test/resources/wsdl2java_wsdl/mime-inout.wsdl | 2 +-
.../resources/wsdl2java_wsdl/mime_binding.wsdl | 2 +-
.../wsdl2java_wsdl/mime_fail_diff_parts.wsdl | 2 +-
.../wsdl2java_wsdl/mime_fail_unique_root.wsdl | 2 +-
.../wsdl2java_wsdl/remote-hello_world_binding.xsd | 2 +-
.../resources/wsdl2java_wsdl/swa-mime-binding.xml | 2 +-
.../test/resources/wsdl2java_wsdl/swa-mime.wsdl | 2 +-
.../wsdl2java_wsdl/ws_address_binding.wsdl | 4 +-
3560 files changed, 14357 insertions(+), 15101 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6408e98701..5fd6ede9df 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,6 +42,11 @@ jobs:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2
+ - name: Setup JDK 17
+ uses: actions/setup-java@v2
+ with:
+ distribution: 'temurin'
+ java-version: '17'
- name: Cache local Maven repository
uses: actions/cache@v3
with:
diff --git a/Jenkinsfile b/Jenkinsfile
index ebf88fa85b..135e208955 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
axes {
axis {
name 'JAVA_VERSION'
- values 'jdk_11_latest', 'jdk_17_latest', 'jdk_18_latest'
+ values 'jdk_17_latest', 'jdk_18_latest'
}
}
stages {
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
index b93c23877d..4f8da7f58f 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
@@ -39,7 +39,7 @@ import edu.indiana.extreme.wsdl.benchmark1.SimpleEvent;
-@javax.jws.WebService(name = "Benchmark", serviceName = "Benchmark",
+@jakarta.jws.WebService(name = "Benchmark", serviceName = "Benchmark",
portName = "Benchmark",
targetNamespace = "http://www.extreme.indiana.edu/wsdl/Benchmark1",
endpointInterface = "edu.indiana.extreme.wsdl.benchmark1.Benchmark")
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
index be4d52784d..dc306d9593 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
@@ -19,7 +19,7 @@
/* Generated by WSDLToJava Compiler. */
package org.apache.cxf.performance.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
/**
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
index 9c6621d7f1..8b6cc80bcf 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.cxf.pat.internal.TestCaseBase;
import org.apache.cxf.pat.internal.TestResult;
import org.apache.cxf.performance.basic_type.BasicPortType;
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
index 4cce831e62..fae124ad9c 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.performance.basic_type.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server implements Runnable {
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
index adb6b4eda1..4069959f46 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
@@ -21,7 +21,7 @@ package org.apache.cxf.performance.basic_type.server;
import java.util.logging.Logger;
import org.apache.cxf.performance.basic_type.BasicPortType;
-@javax.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
+@jakarta.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
targetNamespace = "http://cxf.apache.org/performance/basic_type",
endpointInterface = "org.apache.cxf.performance.basic_type.BasicPortType",
wsdlLocation = "wsdl/basic_type.wsdl"
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
index df4e1c5d10..c0f3ac49cf 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.performance.complex_type.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
index 6d41577b28..ddbf8cb034 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
import org.apache.cxf.performance.complex_type.ComplexPortType;
import org.apache.cxf.performance.complex_type.types.NestedComplexTypeSeq;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
+@jakarta.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
targetNamespace = "http://cxf.apache.org/performance/complex_type",
endpointInterface = "org.apache.cxf.performance.complex_type.ComplexPortType")
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
index d78495e543..18f66c537d 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
@@ -32,9 +32,8 @@ import java.util.logging.Logger;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-
+import jakarta.xml.ws.Holder;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
index acd24794ba..13bca06a57 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.performance.complex_type.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
index 5785925521..890bd02f1a 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
@@ -29,7 +29,7 @@ import org.apache.cxf.cxf.performance.types.NestedComplexType;
import org.apache.cxf.cxf.performance.types.NestedComplexTypeSeq;
-@javax.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
+@jakarta.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
targetNamespace = "http://cxf.apache.org/cxf/performance",
endpointInterface = "org.apache.cxf.cxf.performance.DocPortType",
wsdlLocation="/wsdl/perf.wsdl")
@@ -39,7 +39,7 @@ public class ServerImpl implements DocPortType {
Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
}
- public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request, int id, javax.xml.ws.Holder<Integer> i) {
+ public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request, int id, jakarta.xml.ws.Holder<Integer> i) {
//System.out.println("Executing operation echoComplexTypeDoc\n");
//System.out.println("Message received: " + request + "\n");
i.value = id;
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl b/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl
index d5d24b2d2e..f6e19bac65 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/wsdl/perf.wsdl
@@ -169,7 +169,7 @@
</operation>
</portType>
<portType name="DocPortTypeWrapped">
- <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
+ <jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
<jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
</jaxws:bindings>
<operation name="echoStringDoc">
diff --git a/core/pom.xml b/core/pom.xml
index fbcf62aa3c..e85b3e8932 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -57,12 +57,12 @@
org.springframework.core*;resolution:=optional;version="${cxf.osgi.spring.version}",
org.springframework.util*;resolution:=optional;version="${cxf.osgi.spring.version}",
org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}",
- javax.activation;version="${cxf.osgi.javax.activation.version}",
- javax.annotation;version="${cxf.osgi.javax.annotation.version}",
- javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
- javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
- javax.xml.stream*;version="${cxf.osgi.javax.stream.version}",
- javax.validation*;resolution:=optional;version="${cxf.validation.api.package.version}",
+ jakarta.activation;version="${cxf.osgi.jakarta.activation.version}",
+ jakarta.annotation;version="${cxf.osgi.jakarta.annotation.version}",
+ jakarta.xml.ws*;version="${cxf.osgi.jakarta.xml.ws.version}",
+ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}",
+ jakarta.xml.stream*;version="${cxf.osgi.jakarta.stream.version}",
+ jakarta.validation*;resolution:=optional;version="${cxf.validation.api.package.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.apache.karaf.jaas.boot.principal;resolution:=optional,
org.apache.commons.logging;resolution:=optional,
@@ -176,8 +176,13 @@
<artifactId>xmlschema-core</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index a10c6821bc..8fc76cdb06 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -23,8 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import javax.activation.DataSource;
-
+import jakarta.activation.DataSource;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CacheSizeExceededException;
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 2cd5472e3a..a6c18572a4 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -35,8 +35,7 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.activation.DataSource;
-
+import jakarta.activation.DataSource;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.util.SystemPropertyAction;
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java
index 84cdabaed7..b3a1849053 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java
@@ -23,8 +23,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.activation.DataHandler;
-
+import jakarta.activation.DataHandler;
import org.apache.cxf.message.Attachment;
public class AttachmentImpl implements Attachment {
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
index b46f715c6d..ae6fbab317 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -33,16 +33,12 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.activation.DataHandler;
-
+import jakarta.activation.DataHandler;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
-
-
-
public class AttachmentSerializer {
// http://tools.ietf.org/html/rfc2387
private static final String DEFAULT_MULTIPART_TYPE = "multipart/related";
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index f62ebee76b..c728c98c05 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -46,15 +46,14 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
-import javax.activation.CommandInfo;
-import javax.activation.CommandMap;
-import javax.activation.DataContentHandler;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.activation.MailcapCommandMap;
-import javax.activation.URLDataSource;
-
+import jakarta.activation.CommandInfo;
+import jakarta.activation.CommandMap;
+import jakarta.activation.DataContentHandler;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
+import jakarta.activation.MailcapCommandMap;
+import jakarta.activation.URLDataSource;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.FileUtils;
diff --git a/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java b/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java
index e19a924659..89966aaef2 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
public class ByteDataSource implements DataSource {
private String contentType;
diff --git a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
index 0de70cd3ce..ff37eaaad0 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
@@ -23,8 +23,6 @@ import java.awt.Component;
import java.awt.Graphics;
import java.awt.Image;
import java.awt.MediaTracker;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
@@ -33,23 +31,23 @@ import java.io.OutputStream;
import java.nio.file.Files;
import java.util.Iterator;
-import javax.activation.ActivationDataFlavor;
-import javax.activation.DataContentHandler;
-import javax.activation.DataSource;
import javax.imageio.ImageIO;
import javax.imageio.ImageWriter;
import javax.imageio.stream.ImageOutputStream;
+import jakarta.activation.ActivationDataFlavor;
+import jakarta.activation.DataContentHandler;
+import jakarta.activation.DataSource;
import org.apache.cxf.helpers.IOUtils;
/**
*
*/
public class ImageDataContentHandler implements DataContentHandler {
- private static final DataFlavor[] FLAVORS;
+ private static final ActivationDataFlavor[] FLAVORS;
static {
String[] types = ImageIO.getReaderMIMETypes();
- FLAVORS = new DataFlavor[types.length];
+ FLAVORS = new ActivationDataFlavor[types.length];
int i = 0;
for (String type : types) {
FLAVORS[i++] = new ActivationDataFlavor(Image.class, type, "Image");
@@ -64,9 +62,9 @@ public class ImageDataContentHandler implements DataContentHandler {
return ImageIO.read(ds.getInputStream());
}
- public Object getTransferData(DataFlavor df, DataSource ds) throws UnsupportedFlavorException,
- IOException {
- for (DataFlavor f : FLAVORS) {
+ @Override
+ public Object getTransferData(ActivationDataFlavor df, DataSource ds) throws IOException {
+ for (ActivationDataFlavor f : FLAVORS) {
if (f.equals(df)) {
return getContent(ds);
}
@@ -74,10 +72,12 @@ public class ImageDataContentHandler implements DataContentHandler {
return null;
}
- public DataFlavor[] getTransferDataFlavors() {
+ @Override
+ public ActivationDataFlavor[] getTransferDataFlavors() {
return FLAVORS;
}
+ @Override
public void writeTo(Object obj, String mimeType, OutputStream os) throws IOException {
if (obj instanceof Image) {
Iterator<ImageWriter> writers = ImageIO.getImageWritersByMIMEType(mimeType);
diff --git a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
index 8dd4ace35c..8fdbba7660 100644
--- a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
+++ b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
@@ -28,8 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.activation.DataHandler;
-
+import jakarta.activation.DataHandler;
import org.apache.cxf.message.Attachment;
public class LazyAttachmentCollection
diff --git a/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java b/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
index cec8fcb7fb..0450b6eec4 100644
--- a/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
@@ -25,8 +25,7 @@ import java.io.OutputStream;
import java.util.Collection;
import java.util.stream.Collectors;
-import javax.activation.DataSource;
-
+import jakarta.activation.DataSource;
import org.apache.cxf.message.Attachment;
/**
diff --git a/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java b/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
index 85fb09316e..fea543bb72 100644
--- a/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
+++ b/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
@@ -21,9 +21,9 @@ package org.apache.cxf.binding;
import java.util.Collection;
-import javax.annotation.Resource;
import javax.xml.namespace.QName;
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.Service;
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
index 002fb2cbd9..e52b860490 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
@@ -28,8 +28,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.AbstractBindingFactory;
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java b/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
index 3787df399c..5da5ef79fc 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
@@ -22,8 +22,7 @@ package org.apache.cxf.bus.managers;
import java.util.ListIterator;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
index e1a0433b71..e48457d11c 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
@@ -25,9 +25,8 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.common.i18n.BundleUtils;
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
index 7122a5f8dc..b400635514 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
@@ -27,8 +27,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.common.i18n.BundleUtils;
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
index 901e45d7f2..9e54cac39f 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
@@ -21,8 +21,7 @@ package org.apache.cxf.bus.managers;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.headers.HeaderManager;
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
index b8ffd14cd5..6ae20d7bb3 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
@@ -22,9 +22,8 @@ package org.apache.cxf.bus.managers;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
index 18db041c43..f66948e8c6 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
@@ -25,9 +25,9 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Resource;
import javax.management.JMException;
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
index 99c6ee9a79..a8324db163 100644
--- a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
@@ -21,8 +21,7 @@ package org.apache.cxf.bus.resource;
import java.util.List;
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
diff --git a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
index 80cc8906c3..17510a2aab 100644
--- a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
+++ b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
@@ -34,10 +34,9 @@ import java.util.concurrent.CopyOnWriteArraySet;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Resource;
-
import org.xml.sax.EntityResolver;
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
index 583ac0a27a..9fb333d8c8 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
@@ -31,12 +31,10 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.annotation.Resources;
-
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import jakarta.annotation.Resources;
import org.apache.cxf.common.annotation.AbstractAnnotationVisitor;
import org.apache.cxf.common.annotation.AnnotationProcessor;
import org.apache.cxf.common.logging.LogUtils;
@@ -92,7 +90,7 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
public static boolean processable(Class<?> cls, Object o) {
if (cls.getName().startsWith("java.")
- || cls.getName().startsWith("javax.")) {
+ || cls.getName().startsWith("jakarta.")) {
return false;
}
NoJSR250Annotations njsr = cls.getAnnotation(NoJSR250Annotations.class);
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index dfbb8d9820..79908f1316 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -25,9 +25,6 @@ import java.io.InputStreamReader;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -36,11 +33,11 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Pattern;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.transform.dom.DOMSource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.annotation.XmlElementDecl;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.CacheMap;
import org.apache.cxf.common.util.CachedClass;
@@ -194,7 +191,7 @@ public final class JAXBContextCache {
if (HAS_MOXY) {
map.put("eclipselink.default-target-namespace", defaultNs);
}
- map.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNs);
+ map.put("org.glassfish.jaxb.defaultNamespaceRemap", defaultNs);
}
if (props != null) {
map.putAll(props);
@@ -247,15 +244,7 @@ public final class JAXBContextCache {
// load jaxb needed class and try to create jaxb context
boolean added = addJaxbObjectFactory(ex, classes);
if (added) {
- try {
- context = AccessController.doPrivileged(new PrivilegedExceptionAction<JAXBContext>() {
- public JAXBContext run() throws Exception {
- return JAXBContext.newInstance(classes.toArray(new Class<?>[0]), null);
- }
- });
- } catch (PrivilegedActionException e) {
- throw ex;
- }
+ context = JAXBUtils.createContext(classes, null);
}
if (context == null) {
throw ex;
@@ -298,18 +287,12 @@ public final class JAXBContextCache {
JAXBContext ctx;
if (typeRefs != null && !typeRefs.isEmpty()) {
Class<?> fact = null;
- String pfx = "com.sun.xml.bind.";
+ String pfx = "org.glassfish.jaxb.";
try {
- fact = ClassLoaderUtils.loadClass("com.sun.xml.bind.v2.ContextFactory",
- JAXBContextCache.class);
+ fact = ClassLoaderUtils.loadClass("org.glassfish.jaxb.runtime.v2.ContextFactory",
+ JAXBContextCache.class);
} catch (Throwable t) {
- try {
- fact = ClassLoaderUtils.loadClass("com.sun.xml.internal.bind.v2.ContextFactory",
- JAXBContextCache.class);
- pfx = "com.sun.xml.internal.bind.";
- } catch (Throwable t2) {
- //ignore
- }
+ //ignore
}
if (fact != null) {
for (Method m : fact.getMethods()) {
@@ -339,31 +322,10 @@ public final class JAXBContextCache {
}
}
}
- try {
- ctx = AccessController.doPrivileged(new PrivilegedExceptionAction<JAXBContext>() {
- public JAXBContext run() throws Exception {
- return JAXBContext.newInstance(classes.toArray(new Class<?>[0]), map);
- }
- });
- } catch (PrivilegedActionException e2) {
- if (e2.getException() instanceof JAXBException) {
- JAXBException ex = (JAXBException)e2.getException();
- if (map.containsKey("com.sun.xml.bind.defaultNamespaceRemap")
- && ex.getMessage() != null
- && ex.getMessage().contains("com.sun.xml.bind.defaultNamespaceRemap")) {
- map.put("com.sun.xml.internal.bind.defaultNamespaceRemap",
- map.remove("com.sun.xml.bind.defaultNamespaceRemap"));
- ctx = JAXBContext.newInstance(classes.toArray(new Class<?>[0]), map);
- } else {
- throw ex;
- }
- } else {
- throw new RuntimeException(e2.getException());
- }
- }
+ ctx = JAXBUtils.createContext(classes, map);
return ctx;
}
- // Now we can not add all the classes that Jaxb needed into JaxbContext,
+ // Now we can not add all the classes that Jaxb needed into JaxbContext
// especially when
// an ObjectFactory is pointed to by an jaxb @XmlElementDecl annotation
// added this workaround method to load the jaxb needed ObjectFactory class
@@ -427,5 +389,4 @@ public final class JAXBContextCache {
//ignore
}
}
-
}
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index f018e2aa48..448e7c9539 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -40,6 +40,8 @@ import java.net.URLClassLoader;
import java.nio.charset.StandardCharsets;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -52,16 +54,6 @@ import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.SchemaOutputResolver;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.bind.attachment.AttachmentUnmarshaller;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -76,6 +68,16 @@ import org.w3c.dom.Node;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.SchemaOutputResolver;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.attachment.AttachmentMarshaller;
+import jakarta.xml.bind.attachment.AttachmentUnmarshaller;
import org.apache.cxf.Bus;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.logging.LogUtils;
@@ -92,7 +94,7 @@ import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.helpers.JavaUtils;
public final class JAXBUtils {
- public static final String JAXB_URI = "http://java.sun.com/xml/ns/jaxb";
+ public static final String JAXB_URI = "https://jakarta.ee/xml/ns/jaxb";
private static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class);
@@ -123,7 +125,7 @@ public final class JAXBUtils {
private static ClassLoader jaxbXjcLoader;
private static volatile Optional<Object> jaxbMinimumEscapeHandler;
private static volatile Optional<Object> jaxbNoEscapeHandler;
-
+
static {
BUILTIN_DATATYPES_MAP = new HashMap<>();
BUILTIN_DATATYPES_MAP.put("string", "java.lang.String");
@@ -569,10 +571,10 @@ public final class JAXBUtils {
}
if (cls == Object.class || cls == String.class || cls.isPrimitive() || cls.isAnnotation()
- || "javax.xml.ws.Holder".equals(cls.getName())) {
+ || "jakarta.xml.ws.Holder".equals(cls.getName())) {
return null;
} else if (cls.isInterface()
- || "javax.xml.ws.wsaddressing.W3CEndpointReference".equals(cls.getName())) {
+ || "jakarta.xml.ws.wsaddressing.W3CEndpointReference".equals(cls.getName())) {
return cls;
}
@@ -587,6 +589,7 @@ public final class JAXBUtils {
}
private static synchronized ClassLoader getXJCClassLoader() {
+ //TODO: review and remove this after JDK11
if (jaxbXjcLoader == null) {
try {
Class.forName("com.sun.tools.internal.xjc.api.XJC");
@@ -620,11 +623,8 @@ public final class JAXBUtils {
ClassLoaderService classLoaderService = bus.getExtension(ClassLoaderService.class);
Object mapper = classLoaderService.createNamespaceWrapperInstance(marshaller.getClass(), nspref);
if (mapper != null) {
- if (marshaller.getClass().getName().contains(".internal.")) {
- marshaller.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper",
- mapper);
- } else if (marshaller.getClass().getName().contains("com.sun")) {
- marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper",
+ if (marshaller.getClass().getName().contains("org.glassfish")) {
+ marshaller.setProperty("org.glassfish.jaxb.namespacePrefixMapper",
mapper);
} else if (marshaller.getClass().getName().contains("eclipse")) {
marshaller.setProperty("eclipselink.namespace-prefix-mapper",
@@ -640,13 +640,12 @@ public final class JAXBUtils {
try {
Class<?> cls;
Class<?> refClass;
- String pkg = "com.sun.xml.bind.";
+ String pkg = "org.glassfish.jaxb.runtime.";
try {
- cls = Class.forName("com.sun.xml.bind.api.JAXBRIContext");
+ cls = Class.forName("org.glassfish.jaxb.runtime.api.JAXBRIContext");
refClass = Class.forName(pkg + "api.TypeReference");
} catch (ClassNotFoundException e) {
- cls = Class.forName("com.sun.xml.internal.bind.api.JAXBRIContext", true, getXJCClassLoader());
- pkg = "com.sun.xml.internal.bind.";
+ cls = Class.forName("org.glassfish.jaxb.runtime.api.JAXBRIContext", true, getXJCClassLoader());
refClass = Class.forName(pkg + "api.TypeReference", true, getXJCClassLoader());
}
Object ref = refClass.getConstructor(QName.class,
@@ -705,7 +704,7 @@ public final class JAXBUtils {
cls = Class.forName("com.sun.tools.xjc.api.XJC");
sc = cls.getMethod("createSchemaCompiler").invoke(null);
} catch (Throwable e) {
- cls = Class.forName("com.sun.tools.internal.xjc.api.XJC", true, getXJCClassLoader());
+ cls = Class.forName("com.sun.tools.xjc.api.XJC", true, getXJCClassLoader());
sc = cls.getMethod("createSchemaCompiler").invoke(null);
}
@@ -775,6 +774,7 @@ public final class JAXBUtils {
try {
cls = Class.forName("com.sun.codemodel.writer.FileCodeWriter");
} catch (ClassNotFoundException e) {
+ //TODO: review and remove this check
cls = Class.forName("com.sun.codemodel.internal.writer.FileCodeWriter",
true, getXJCClassLoader());
}
@@ -829,8 +829,8 @@ public final class JAXBUtils {
public static String getPackageNamespace(Class<?> cls) {
Package p = cls.getPackage();
if (p != null) {
- javax.xml.bind.annotation.XmlSchema schemaAnn =
- p.getAnnotation(javax.xml.bind.annotation.XmlSchema.class);
+ jakarta.xml.bind.annotation.XmlSchema schemaAnn =
+ p.getAnnotation(jakarta.xml.bind.annotation.XmlSchema.class);
if (schemaAnn != null) {
return schemaAnn.namespace();
}
@@ -944,8 +944,8 @@ public final class JAXBUtils {
}
return clazz.getClassLoader();
}
-
- private static void addToObjectFactoryCache(Package objectFactoryPkg,
+
+ private static void addToObjectFactoryCache(Package objectFactoryPkg,
Class<?> ofactory,
Map<Package, CachedClass> objectFactoryCache) {
if (objectFactoryPkg == null || objectFactoryCache == null) {
@@ -1084,7 +1084,8 @@ public final class JAXBUtils {
public static JAXBContextProxy createJAXBContextProxy(final JAXBContext ctx,
final SchemaCollection collection,
final String defaultNs) {
- if (ctx.getClass().getName().contains("com.sun.")
+ if (ctx.getClass().getName().contains("org.glassfish.")
+ || ctx.getClass().getName().contains("com.sun.")
|| collection == null) {
return ReflectionInvokationHandler.createProxyWrapper(ctx, JAXBContextProxy.class);
}
@@ -1103,13 +1104,14 @@ public final class JAXBUtils {
private static String getPostfix(Class<?> cls) {
String className = cls.getName();
- if (className.contains("com.sun.xml.internal")
- || className.contains("eclipse")) {
- //eclipse moxy accepts sun package CharacterEscapeHandler
- return ".internal";
- } else if (className.contains("com.sun.xml.bind")
- || className.startsWith("com.ibm.xml")) {
+ //TODO: review and remove "com.sun" package name check
+ if (className.contains("org.glassfish.jaxb") || className.contains("com.sun.xml.bind")
+ || className.startsWith("com.ibm.xml")) {
return "";
+ } else if (className.contains("com.sun.xml.internal")
+ || className.contains("eclipse")) {
+ //eclipse moxy accepts sun package CharacterEscapeHandler
+ return ".internal";
}
return null;
}
@@ -1127,26 +1129,26 @@ public final class JAXBUtils {
}
jaxbNoEscapeHandler.ifPresent(p -> setEscapeHandler(marshaller, p));
}
-
+
public static void setEscapeHandler(Marshaller marshaller, Object escapeHandler) {
try {
String postFix = getPostfix(marshaller.getClass());
if (postFix != null && escapeHandler != null) {
- marshaller.setProperty("com.sun.xml" + postFix + ".bind.characterEscapeHandler", escapeHandler);
+ marshaller.setProperty("org.glassfish.jaxb" + postFix + ".characterEscapeHandler", escapeHandler);
}
} catch (PropertyException e) {
LOG.log(Level.INFO, "Failed to set MinumEscapeHandler to jaxb marshaller", e);
}
}
-
+
public static Object createMininumEscapeHandler(Class<?> cls) {
return createEscapeHandler(cls, "MinimumEscapeHandler");
}
-
+
public static Object createNoEscapeHandler(Class<?> cls) {
return createEscapeHandler(cls, "NoEscapeHandler");
}
-
+
private static Object createEscapeHandler(Class<?> cls, String simpleClassName) {
try {
String postFix = getPostfix(cls);
@@ -1155,11 +1157,10 @@ public final class JAXBUtils {
+ cls);
return null;
}
- Class<?> handlerClass = ClassLoaderUtils.loadClass("com.sun.xml" + postFix
- + ".bind.marshaller." + simpleClassName,
- cls);
+ Class<?> handlerClass = ClassLoaderUtils.loadClass("org.glassfish.jaxb.core.marshaller."
+ + simpleClassName, cls);
Class<?> handlerInterface = ClassLoaderUtils
- .loadClass("com.sun.xml" + postFix + ".bind.marshaller.CharacterEscapeHandler",
+ .loadClass("org.glassfish.jaxb.core.marshaller.CharacterEscapeHandler",
cls);
Object targetHandler = ReflectionUtil.getDeclaredField(handlerClass, "theInstance").get(null);
return ProxyHelper.getProxy(cls.getClassLoader(),
@@ -1175,6 +1176,28 @@ public final class JAXBUtils {
}
return null;
}
-
-
+ public static JAXBContext createContext(final Set<Class<?>> classes,
+ final Map<String, Object> map) throws JAXBException {
+ JAXBContext ctx = null;
+ try {
+ ctx = AccessController.doPrivileged(new PrivilegedExceptionAction<JAXBContext>() {
+ public JAXBContext run() throws Exception {
+ //This is a workaround for CXF-8675
+ Class<?> factoryClass = ClassLoaderUtils.loadClass("org.glassfish.jaxb.runtime.v2.ContextFactory",
+ JAXBContextCache.class);
+ Method m = factoryClass.getMethod("createContext", Class[].class, Map.class);
+ Object context = m.invoke(null, classes.toArray(new Class<?>[0]), map);
+ return (JAXBContext) context;
+ }
+ });
+ } catch (PrivilegedActionException e2) {
+ if (e2.getException() instanceof JAXBException) {
+ JAXBException ex = (JAXBException) e2.getException();
+ throw ex;
+ } else {
+ throw new RuntimeException(e2.getException());
+ }
+ }
+ return ctx;
+ }
}
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java b/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
index 610d1af6b8..95d0bfae22 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
@@ -21,7 +21,7 @@ package org.apache.cxf.common.jaxb;
import java.util.Map;
-import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
public final class NamespaceMapper extends NamespacePrefixMapper {
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java b/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java
index 0c5522d693..54133640c4 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java
@@ -31,18 +31,18 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;
import org.w3c.dom.Document;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;
diff --git a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
index 8a2b0c58c9..c1f5a8dbcc 100644
--- a/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
+++ b/core/src/main/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
@@ -47,7 +47,7 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement
return createEclipseNamespaceMapper();
} else if (mcls.getName().contains(".internal")) {
postFix = "Internal";
- } else if (mcls.getName().contains("com.sun")) {
+ } else if (mcls.getName().contains("org.glassfish")) {
postFix = "RI";
}
@@ -294,9 +294,7 @@ public class NamespaceClassGenerator extends ClassGeneratorClassLoader implement
private byte[] createNamespaceWrapperInternal(String postFix) {
- String superName = "com/sun/xml/"
- + ("RI".equals(postFix) ? "" : "internal/")
- + "bind/marshaller/NamespacePrefixMapper";
+ String superName = "org/glassfish/jaxb/runtime/marshaller/NamespacePrefixMapper";
String postFixedName = "org/apache/cxf/jaxb/NamespaceMapper" + postFix;
ASMHelper.ClassWriter cw = helper.createClassWriter();
if (cw == null) {
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
index 88320f3802..8df53be5ac 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
@@ -24,10 +24,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -36,6 +32,10 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.PassThroughMetadata;
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
index 989850d5e9..781abcc15f 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
@@ -26,12 +26,12 @@ import java.util.Set;
import javax.net.ssl.KeyManager;
import javax.net.ssl.TrustManager;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
index 5cce4a9345..5bd0557d1f 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
@@ -25,10 +25,6 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.logging.Logger;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -38,6 +34,10 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.jaxb.JAXBUtils;
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java b/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
index 7c0801b566..2a52ccafe6 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
@@ -21,12 +21,12 @@ package org.apache.cxf.configuration.spring;
import java.io.StringReader;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.staxutils.StaxUtils;
diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
index 33876abdd7..d27fbcc8e5 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Resource;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
@@ -36,6 +35,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.util.StringUtils;
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
index c9dcf15698..77e832366e 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
@@ -25,7 +25,6 @@ import java.util.Collection;
import java.util.List;
import java.util.logging.Logger;
-import javax.activation.DataSource;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -42,6 +41,7 @@ import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+import jakarta.activation.DataSource;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
@@ -256,7 +256,7 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
parentNode.removeChild(include);
String cid = DOMUtils.getAttribute(include, "href");
//set the fake base64Binary to validate instead of reading the attachment from message
- parentNode.setTextContent(javax.xml.bind.DatatypeConverter.printBase64Binary(cid.getBytes()));
+ parentNode.setTextContent(jakarta.xml.bind.DatatypeConverter.printBase64Binary(cid.getBytes()));
}
}
try {
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
index fa019753e0..02b07b7d66 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.util.Collection;
import java.util.logging.Logger;
-import javax.activation.DataSource;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -43,7 +42,7 @@ import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-
+import jakarta.activation.DataSource;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.databinding.DataWriter;
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 53d3a432b8..43f8bf4e84 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -38,8 +38,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.MessageContext;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.Binding;
diff --git a/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java b/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
index 39ac97d52d..dfe8fa0657 100644
--- a/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
@@ -20,8 +20,7 @@ package org.apache.cxf.feature;
import java.util.List;
-import javax.xml.ws.WebServiceFeature;
-
+import jakarta.xml.ws.WebServiceFeature;
import org.apache.cxf.Bus;
import org.apache.cxf.interceptor.InterceptorProvider;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
index 70d5ae0618..58c591b627 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
@@ -87,9 +87,9 @@ public abstract class AbstractFaultChainInitiatorObserver implements MessageObse
faultMessage.put(FaultMode.class, mode);
}
//CXF-3981
- if (message.get("javax.xml.ws.addressing.context.inbound") != null) {
- faultMessage.put("javax.xml.ws.addressing.context.inbound",
- message.get("javax.xml.ws.addressing.context.inbound"));
+ if (message.get("jakarta.xml.ws.addressing.context.inbound") != null) {
+ faultMessage.put("jakarta.xml.ws.addressing.context.inbound",
+ message.get("jakarta.xml.ws.addressing.context.inbound"));
}
exchange.setOutMessage(null);
exchange.setOutFaultMessage(faultMessage);
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
index 2fa200759c..cfd69cedcb 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
@@ -36,7 +36,7 @@ import org.apache.cxf.common.util.ClassHelper;
public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(SecureAnnotationsInterceptor.class);
- private static final String DEFAULT_ANNOTATION_CLASS_NAME = "javax.annotation.security.RolesAllowed";
+ private static final String DEFAULT_ANNOTATION_CLASS_NAME = "jakarta.annotation.security.RolesAllowed";
private static final Set<String> SKIP_METHODS = new HashSet<>(
Arrays.asList("wait", "notify", "notifyAll", "equals", "toString", "hashCode"));
diff --git a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
index 6f669b757a..a5d0d2e96c 100644
--- a/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
@@ -62,7 +62,7 @@ import java.nio.charset.CodingErrorAction;
* in the design of the code. This class is typically used in situations where an existing
* API only accepts an {@link InputStream}, but where the most natural way to produce the data
* is as a character stream, i.e. by providing a {@link Reader} instance. An example of a situation
- * where this problem may appear is when implementing the {@link javax.activation.DataSource}
+ * where this problem may appear is when implementing the {@link jakarta.activation.DataSource}
* interface from the Java Activation Framework.
* <p>
* Given the fact that the {@link Reader} class doesn't provide any way to predict whether the next
diff --git a/core/src/main/java/org/apache/cxf/message/Attachment.java b/core/src/main/java/org/apache/cxf/message/Attachment.java
index e86e67ce73..7746402ef3 100644
--- a/core/src/main/java/org/apache/cxf/message/Attachment.java
+++ b/core/src/main/java/org/apache/cxf/message/Attachment.java
@@ -21,7 +21,7 @@ package org.apache.cxf.message;
import java.util.Iterator;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
public interface Attachment {
DataHandler getDataHandler();
diff --git a/core/src/main/java/org/apache/cxf/message/Message.java b/core/src/main/java/org/apache/cxf/message/Message.java
index 5a74b619f1..1fdad40e45 100644
--- a/core/src/main/java/org/apache/cxf/message/Message.java
+++ b/core/src/main/java/org/apache/cxf/message/Message.java
@@ -22,6 +22,7 @@ package org.apache.cxf.message;
import java.util.Collection;
import java.util.Set;
+import jakarta.xml.ws.handler.MessageContext;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.transport.Destination;
@@ -164,11 +165,11 @@ public interface Message extends StringMap {
String MAINTAIN_SESSION = Message.class.getName() + ".MAINTAIN_SESSION";
String ATTACHMENTS = Message.class.getName() + ".ATTACHMENTS";
- String WSDL_DESCRIPTION = "javax.xml.ws.wsdl.description";
- String WSDL_SERVICE = "javax.xml.ws.wsdl.service";
- String WSDL_PORT = "javax.xml.ws.wsdl.port";
- String WSDL_INTERFACE = "javax.xml.ws.wsdl.interface";
- String WSDL_OPERATION = "javax.xml.ws.wsdl.operation";
+ String WSDL_DESCRIPTION = MessageContext.WSDL_DESCRIPTION;
+ String WSDL_SERVICE = MessageContext.WSDL_SERVICE;
+ String WSDL_PORT = MessageContext.WSDL_PORT;
+ String WSDL_INTERFACE = MessageContext.WSDL_INTERFACE;
+ String WSDL_OPERATION = MessageContext.WSDL_OPERATION;
/**
* Some properties to allow adding interceptors to the chain
@@ -194,8 +195,8 @@ public interface Message extends StringMap {
/*
* The properties to allow configure the client timeout
*/
- String CONNECTION_TIMEOUT = "javax.xml.ws.client.connectionTimeout";
- String RECEIVE_TIMEOUT = "javax.xml.ws.client.receiveTimeout";
+ String CONNECTION_TIMEOUT = "jakarta.xml.ws.client.connectionTimeout";
+ String RECEIVE_TIMEOUT = "jakarta.xml.ws.client.receiveTimeout";
/**
* Boolean property to indicate whether application-defined StAX-factories (stored as contextual property in the
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
index e7f75233c5..16a054f399 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
@@ -188,7 +188,7 @@ public final class MessageUtils {
return m != null && m.getContent(Node.class) != null;
/*
for (Class c : m.getContentFormats()) {
- if (c.equals(Node.class) || "javax.xml.soap.SOAPMessage".equals(c.getName())) {
+ if (c.equals(Node.class) || "jakarta.xml.soap.SOAPMessage".equals(c.getName())) {
return true;
}
}
diff --git a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java
index fa4a3950c7..c010b02ce8 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java
@@ -22,8 +22,7 @@ package org.apache.cxf.service.factory;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
index 9fca2290d3..c90863f1e3 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
@@ -20,9 +20,9 @@ package org.apache.cxf.transport;
import java.util.Map;
-import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.ws.addressing.AddressingProperties;
diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
index 3fecf1a91d..fa9188b0d0 100644
--- a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
@@ -21,8 +21,7 @@ package org.apache.cxf.validation;
import java.lang.reflect.Method;
import java.util.List;
-import javax.validation.ValidationException;
-
+import jakarta.validation.ValidationException;
import org.apache.cxf.message.Message;
public abstract class AbstractBeanValidationInterceptor extends AbstractValidationInterceptor {
diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
index f0e98d4ad0..a12e231494 100644
--- a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
@@ -23,9 +23,8 @@ import java.util.List;
import java.util.ResourceBundle;
import java.util.logging.Logger;
-import javax.validation.executable.ExecutableType;
-import javax.validation.executable.ValidateOnExecution;
-
+import jakarta.validation.executable.ExecutableType;
+import jakarta.validation.executable.ValidateOnExecution;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Endpoint;
diff --git a/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java b/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
index 9652d481dd..b3d4421cac 100644
--- a/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
+++ b/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
@@ -26,19 +26,18 @@ import java.util.concurrent.ConcurrentMap;
import java.util.function.Supplier;
import java.util.logging.Logger;
-import javax.validation.Configuration;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ParameterNameProvider;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.executable.ExecutableValidator;
-import javax.validation.metadata.MethodDescriptor;
-import javax.validation.spi.ValidationProvider;
-
+import jakarta.validation.Configuration;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.executable.ExecutableValidator;
+import jakarta.validation.metadata.MethodDescriptor;
+import jakarta.validation.spi.ValidationProvider;
import org.apache.cxf.common.logging.LogUtils;
import static java.util.Collections.emptySet;
diff --git a/core/src/main/java/org/apache/cxf/validation/ResponseConstraintViolationException.java b/core/src/main/java/org/apache/cxf/validation/ResponseConstraintViolationException.java
index f8c501b013..7e2bbc0777 100644
--- a/core/src/main/java/org/apache/cxf/validation/ResponseConstraintViolationException.java
+++ b/core/src/main/java/org/apache/cxf/validation/ResponseConstraintViolationException.java
@@ -20,8 +20,8 @@ package org.apache.cxf.validation;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
@SuppressWarnings("serial")
public class ResponseConstraintViolationException extends ConstraintViolationException {
diff --git a/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java b/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java
index a9109bea33..097272b0b8 100644
--- a/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java
+++ b/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java
@@ -21,10 +21,10 @@ package org.apache.cxf.validation;
import java.util.Collections;
import java.util.Map;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.ParameterNameProvider;
-import javax.validation.TraversableResolver;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.TraversableResolver;
public class ValidationConfiguration {
private ParameterNameProvider parameterNameProvider;
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/ContextJAXBUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/ContextJAXBUtils.java
index 58a909e93a..a5d60c2a0c 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/ContextJAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/ContextJAXBUtils.java
@@ -22,9 +22,8 @@ package org.apache.cxf.ws.addressing;
import java.util.HashSet;
import java.util.Set;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index a01e58b9dc..6ca1344731 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -37,10 +37,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source;
@@ -56,6 +52,10 @@ import org.w3c.dom.ls.LSResourceResolver;
import org.xml.sax.InputSource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.jaxb.JAXBContextCache;
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/FaultAction.java b/core/src/main/java/org/apache/cxf/ws/addressing/FaultAction.java
index cfc92fd3ea..b3822686db 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/FaultAction.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/FaultAction.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
/**
* If applied on an exception type, the value specifies the WS-Addressing Action
* which will be applied if this exception is thrown from a WSA-enabled service.
- * This setting overrides any other settings, for example from @javax.xml.ws.Action.
+ * This setting overrides any other settings, for example from @jakarta.xml.ws.Action.
* If the value is null, this annotation is ignored.
*/
@Retention(RetentionPolicy.RUNTIME)
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java b/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
index db85ab7fbb..665f0500fc 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
@@ -60,16 +60,16 @@ public final class JAXWSAConstants {
* Context.
*/
public static final String CLIENT_ADDRESSING_PROPERTIES =
- "javax.xml.ws.addressing.context";
+ "jakarta.xml.ws.addressing.context";
/**
* Well-known Property names for AddressingProperties in Handler
* Context.
*/
public static final String ADDRESSING_PROPERTIES_INBOUND =
- "javax.xml.ws.addressing.context.inbound";
+ "jakarta.xml.ws.addressing.context.inbound";
public static final String ADDRESSING_PROPERTIES_OUTBOUND =
- "javax.xml.ws.addressing.context.outbound";
+ "jakarta.xml.ws.addressing.context.outbound";
@Deprecated
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
index 2704ebcf5c..053bfb7d2d 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
@@ -23,16 +23,14 @@ package org.apache.cxf.ws.addressing;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
-//import javax.xml.ws.EndpointReference;
-//import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.w3c.dom.Element;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.v200408.AttributedQName;
diff --git a/core/src/main/resources/schemas/configuration/parameterized-types.xsd b/core/src/main/resources/schemas/configuration/parameterized-types.xsd
index 3e71c324d0..94f411e38a 100644
--- a/core/src/main/resources/schemas/configuration/parameterized-types.xsd
+++ b/core/src/main/resources/schemas/configuration/parameterized-types.xsd
@@ -24,8 +24,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- jaxb:version="2.0">
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+ jaxb:version="3.0">
<xs:simpleType name="ParameterizedValue">
diff --git a/core/src/main/resources/schemas/configuration/security.xjb b/core/src/main/resources/schemas/configuration/security.xjb
index 138f15b23f..d0ac34918a 100644
--- a/core/src/main/resources/schemas/configuration/security.xjb
+++ b/core/src/main/resources/schemas/configuration/security.xjb
@@ -16,8 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<jaxb:bindings version="1.0"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0"
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
<jaxb:bindings schemaLocation="security.xsd" node="/xs:schema">
diff --git a/core/src/main/resources/schemas/configuration/security.xsd b/core/src/main/resources/schemas/configuration/security.xsd
index 9e224a8011..73f5e1767f 100644
--- a/core/src/main/resources/schemas/configuration/security.xsd
+++ b/core/src/main/resources/schemas/configuration/security.xsd
@@ -22,11 +22,11 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:tns="http://cxf.apache.org/configuration/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:pt="http://cxf.apache.org/configuration/parameterized-types"
- jaxb:version="2.0">
+ jaxb:version="3.0">
<xs:import namespace="http://cxf.apache.org/configuration/parameterized-types"
schemaLocation="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"/>
diff --git a/core/src/main/resources/schemas/wsdl/addressing.xjb b/core/src/main/resources/schemas/wsdl/addressing.xjb
index 0092844a95..dc86ebcabc 100644
--- a/core/src/main/resources/schemas/wsdl/addressing.xjb
+++ b/core/src/main/resources/schemas/wsdl/addressing.xjb
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<jaxb:bindings version="1.0"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0"
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
diff --git a/core/src/main/resources/schemas/wsdl/addressing200403.xjb b/core/src/main/resources/schemas/wsdl/addressing200403.xjb
index 8669694c4c..df7cfe37d8 100644
--- a/core/src/main/resources/schemas/wsdl/addressing200403.xjb
+++ b/core/src/main/resources/schemas/wsdl/addressing200403.xjb
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<jaxb:bindings version="1.0"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0"
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
diff --git a/core/src/main/resources/schemas/wsdl/http.xjb b/core/src/main/resources/schemas/wsdl/http.xjb
index e759183e67..f43994f2a0 100644
--- a/core/src/main/resources/schemas/wsdl/http.xjb
+++ b/core/src/main/resources/schemas/wsdl/http.xjb
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<jaxb:bindings version="1.0"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0"
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<jaxb:bindings schemaLocation="http.xsd" node="/xs:schema">
<jaxb:schemaBindings>
diff --git a/core/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb b/core/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
index 1b78662d94..6c61c828ea 100644
--- a/core/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
+++ b/core/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<jaxb:bindings version="1.0"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0"
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
diff --git a/core/src/main/resources/schemas/wsdl/wsdl.xjb b/core/src/main/resources/schemas/wsdl/wsdl.xjb
index b5feaa3549..534f7e0703 100644
--- a/core/src/main/resources/schemas/wsdl/wsdl.xjb
+++ b/core/src/main/resources/schemas/wsdl/wsdl.xjb
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<jaxb:bindings version="1.0"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0"
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
jaxb:extensionBindingPrefixes="xjc">
diff --git a/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java b/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
index ff22d52dee..dc0f629257 100644
--- a/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
+++ b/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
@@ -25,12 +25,6 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentMarshaller;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Result;
@@ -40,6 +34,13 @@ import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.attachment.AttachmentMarshaller;
+
public class MockMarshaller implements Marshaller {
private final Map<String, Object> properties = new HashMap<>();
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index 717083e91b..9d36f9246d 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -32,12 +32,12 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.IntStream;
-import javax.activation.DataSource;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.helpers.DefaultHandler;
+import jakarta.activation.DataSource;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Exchange;
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index 14e8b2a642..0fb560db79 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -26,14 +26,13 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Properties;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.mail.Session;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.util.ByteArrayDataSource;
-
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
+import jakarta.mail.util.ByteArrayDataSource;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
diff --git a/core/src/test/java/org/apache/cxf/attachment/LazyDataSourceTest.java b/core/src/test/java/org/apache/cxf/attachment/LazyDataSourceTest.java
index 8d5355b7d6..ed002188a8 100644
--- a/core/src/test/java/org/apache/cxf/attachment/LazyDataSourceTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/LazyDataSourceTest.java
@@ -20,8 +20,8 @@ package org.apache.cxf.attachment;
import java.util.Collections;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 03e0e40f9c..99a1a38bbb 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -23,8 +23,7 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index 058e8268e5..3ce0b59a09 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -24,10 +24,9 @@ import java.util.Collection;
import java.util.List;
import java.util.SortedSet;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
index bcc36b00af..dbfe432847 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
@@ -24,17 +24,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
-import javax.annotation.Resource;
-import javax.jws.HandlerChain;
-import javax.jws.WebMethod;
-import javax.jws.WebResult;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-import javax.xml.ws.WebServiceContext;
-
+import jakarta.annotation.Resource;
+import jakarta.jws.HandlerChain;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebResult;
+import jakarta.xml.ws.RequestWrapper;
+import jakarta.xml.ws.ResponseWrapper;
+import jakarta.xml.ws.WebServiceContext;
import org.apache.cxf.common.logging.LogUtils;
-@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
+@jakarta.jws.WebService(name = "Greeter", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http")
@HandlerChain(name = "TestHandlerChain", file = "handlers.xml")
public class AnnotatedGreeterImpl {
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index bec33558d1..acd7055042 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -19,18 +19,16 @@
package org.apache.cxf.common.annotation;
-
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Resource;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
+import jakarta.annotation.Resource;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.WebServiceContext;
import org.easymock.EasyMock;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index 48085f1f17..ca190853a9 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -27,11 +27,10 @@ import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.annotation.Resources;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import jakarta.annotation.Resources;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
diff --git a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
index 1becfc908e..822da128bf 100644
--- a/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/jaxb/JAXBUtilsTest.java
@@ -19,13 +19,13 @@
package org.apache.cxf.common.jaxb;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-
import com.ibm.xml.mock.marshaller.MockMarshaller;
-import com.sun.xml.bind.marshaller.MinimumEscapeHandler;
-import com.sun.xml.bind.v2.runtime.JAXBContextImpl;
-import com.sun.xml.bind.v2.runtime.MarshallerImpl;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
+import org.glassfish.jaxb.core.marshaller.MinimumEscapeHandler;
+import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl;
+import org.glassfish.jaxb.runtime.v2.runtime.MarshallerImpl;
import org.junit.Test;
@@ -40,7 +40,7 @@ public class JAXBUtilsTest {
Marshaller m = new MarshallerImpl((JAXBContextImpl) JAXBContext.newInstance(this.getClass()), null);
final Object mockHandler = MinimumEscapeHandler.theInstance;
JAXBUtils.setEscapeHandler(m, mockHandler);
- assertEquals(mockHandler, m.getProperty("com.sun.xml.bind.characterEscapeHandler"));
+ assertEquals(mockHandler, m.getProperty("org.glassfish.jaxb.characterEscapeHandler"));
}
@Test
@@ -48,7 +48,7 @@ public class JAXBUtilsTest {
Marshaller m = new MockMarshaller();
final Object mockHandler = new Object();
JAXBUtils.setEscapeHandler(m, mockHandler);
- assertEquals(mockHandler, m.getProperty("com.sun.xml.bind.characterEscapeHandler"));
+ assertEquals(mockHandler, m.getProperty("org.glassfish.jaxb.characterEscapeHandler"));
}
@Test
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Address.java b/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
index 9bed8775d1..6128e2d799 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
@@ -20,10 +20,10 @@
package org.apache.cxf.configuration.foo;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java b/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
index ec68077dde..3ebff87ca3 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
@@ -18,10 +18,10 @@
*/
package org.apache.cxf.configuration.foo;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java b/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java
index 24321d0561..cf1b935973 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java
@@ -19,11 +19,12 @@
package org.apache.cxf.configuration.foo;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
/**
* This object contains factory methods for each
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Point.java b/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
index 4edbb1bec1..2130fa11f4 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
@@ -19,9 +19,9 @@
package org.apache.cxf.configuration.foo;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
/**
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/package-info.java b/core/src/test/java/org/apache/cxf/configuration/foo/package-info.java
index d3e0c2adf5..0abf60e9cd 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/package-info.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/package-info.java
@@ -17,6 +17,6 @@
* under the License.
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://cxf.apache.org/configuration/foo",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://cxf.apache.org/configuration/foo",
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.cxf.configuration.foo;
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index f0899b6721..1cdbd6c3dc 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -23,11 +23,11 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Set;
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.bind.DatatypeConverterInterface;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import javax.xml.namespace.QName;
+import jakarta.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverterInterface;
+import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter;
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.configuration.Configurable;
import org.springframework.context.ApplicationContext;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
index 39c4e5c2c9..fd33e31084 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
@@ -24,15 +24,15 @@ import java.io.ByteArrayInputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPPart;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 435dded623..8e7aac702e 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -28,16 +28,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Element;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index acb1a3df8b..b6237b6dea 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -208,7 +208,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
+ <artifactId>artemis-jakarta-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -328,26 +328,27 @@
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${cxf.ehcache3.version}</version>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
@@ -432,7 +433,7 @@
</dependency>
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
+ <artifactId>undertow-servlet-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -458,10 +459,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
@@ -489,8 +486,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <artifactId>websocket-jakarta-server</artifactId>
+ <version>${cxf.jetty11.version}</version>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava3</groupId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 4ff0acf9bd..410e7d7059 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -380,16 +380,6 @@
<groupId>org.apache.cxf.services.wsn</groupId>
<artifactId>cxf-services-wsn-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.ws-discovery</groupId>
diff --git a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java
index 39c419bff4..bb4c2b539e 100644
--- a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java
+++ b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java
@@ -21,7 +21,9 @@ package demo.hw_http.client;
import java.io.File;
import java.net.URL;
+
import javax.xml.namespace.QName;
+
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
diff --git a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java
index 9f180453af..a1d644e6e2 100644
--- a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java
@@ -22,7 +22,7 @@ package demo.hw_http.server;
import java.util.logging.Logger;
import org.apache.hello_world_soap_http.Greeter;
-@javax.jws.WebService(name = "Soap", serviceName = "SOAPService",
+@jakarta.jws.WebService(name = "Soap", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http",
wsdlLocation = "file:./wsdl/hello_world.wsdl")
diff --git a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java
index 5046e3b0f9..9b8d1cd254 100644
--- a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java
+++ b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java
@@ -19,7 +19,7 @@
package demo.hw_http.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java
index dc4863f441..69d3b4ad4e 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java
@@ -23,7 +23,7 @@ package demo.callback.client;
import org.apache.callback.CallbackPortType;
-@javax.jws.WebService(serviceName = "CallbackService",
+@jakarta.jws.WebService(serviceName = "CallbackService",
portName = "CallbackPort",
endpointInterface = "org.apache.callback.CallbackPortType",
targetNamespace = "http://apache.org/callback")
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
index 5eb2c2444c..c435055561 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
@@ -25,21 +25,17 @@ import java.io.InputStream;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.wsaddressing.W3CEndpointReference;
import org.apache.callback.SOAPService;
import org.apache.callback.ServerPortType;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
-
-
-
-
public final class Client {
private static final QName SERVICE_NAME
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java
index a4f7e2be6d..ce559e08fb 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java
@@ -20,7 +20,7 @@
package demo.callback.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.ext.logging.LoggingFeature;
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java
index 5483b35768..3cfcb9233c 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java
@@ -20,14 +20,14 @@
package demo.callback.server;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import jakarta.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.wsaddressing.W3CEndpointReference;
import org.apache.callback.CallbackPortType;
import org.apache.callback.ServerPortType;
-@javax.jws.WebService(serviceName = "SOAPService",
+@jakarta.jws.WebService(serviceName = "SOAPService",
portName = "SOAPPort",
targetNamespace = "http://apache.org/callback",
endpointInterface = "org.apache.callback.ServerPortType")
diff --git a/distribution/src/main/release/samples/clustering/failover_server/pom.xml b/distribution/src/main/release/samples/clustering/failover_server/pom.xml
index d09a0e6bd0..bfd19003bd 100644
--- a/distribution/src/main/release/samples/clustering/failover_server/pom.xml
+++ b/distribution/src/main/release/samples/clustering/failover_server/pom.xml
@@ -44,7 +44,7 @@ under the License.
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName>
<Import-Package>
- javax.ws.rs.*;version="[1.1,3)",
+ jakarta.ws.rs.*;version="[1.1,3)",
org.apache.cxf.*;version="[2,4)",
</Import-Package>
<Export-Package>org.apache.cxf.samples.failover.jaxws</Export-Package>
diff --git a/distribution/src/main/release/samples/clustering/failover_server/src/main/java/org/apache/cxf/samples/failover/jaxws/SampleService.java b/distribution/src/main/release/samples/clustering/failover_server/src/main/java/org/apache/cxf/samples/failover/jaxws/SampleService.java
index 1e379dc25e..63f8b52664 100644
--- a/distribution/src/main/release/samples/clustering/failover_server/src/main/java/org/apache/cxf/samples/failover/jaxws/SampleService.java
+++ b/distribution/src/main/release/samples/clustering/failover_server/src/main/java/org/apache/cxf/samples/failover/jaxws/SampleService.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.samples.failover.jaxws;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface SampleService {
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
index 329ff45cad..648a865736 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
@@ -20,6 +20,7 @@
package demo.stream.client;
import java.net.URL;
+
import javax.xml.namespace.QName;
import org.apache.cxf.frontend.ClientProxy;
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java
index db6f07a270..2d61353ae6 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java
@@ -24,7 +24,7 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+@jakarta.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java
index dc92355614..50eb22511c 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java
@@ -19,7 +19,7 @@
package demo.stream.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.jaxws.EndpointImpl;
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
index f78a631e0e..a1eb7f39e9 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
@@ -19,6 +19,7 @@
package cxf.client;
import java.net.URL;
+
import javax.xml.namespace.QName;
import bank.common.Account;
@@ -43,7 +44,7 @@ public final class Client {
System.out.print("Invoking createAccount for Mr. John... ");
- javax.xml.ws.Holder<Account> account = new javax.xml.ws.Holder<>(new Account());
+ jakarta.xml.ws.Holder<Account> account = new jakarta.xml.ws.Holder<>(new Account());
try {
if (port.createAccount("John", account)) {
System.out.println("success");
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
index f250dd8377..e110db510b 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
@@ -28,7 +28,7 @@ import bank.common.AccountNotFoundException;
import bank.common.AccountNotFoundExceptionType;
import bank.common.Bank;
-@javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService",
+@jakarta.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService",
targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/bank",
wsdlLocation = "classpath:/wsdl/bank.wsdl",
endpointInterface = "bank.common.Bank")
@@ -37,7 +37,7 @@ public class BankImpl implements Bank {
Map<String, Account> accounts = new HashMap<>();
- public boolean createAccount(String name, javax.xml.ws.Holder<Account> account)
+ public boolean createAccount(String name, jakarta.xml.ws.Holder<Account> account)
throws AccountAlreadyExistsException {
System.out.println("Creating account: " + name);
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java
index 1258e386b6..f487f7655f 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java
@@ -18,7 +18,7 @@
*/
package cxf.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
index 17bab999a8..9c76974c5a 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
@@ -22,7 +22,7 @@ package cxf.client;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import jakarta.xml.ws.wsaddressing.W3CEndpointReference;
import cxf.common.Account;
import cxf.common.AccountCORBAService;
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java
index e54eafb1ac..a27dc1a4ef 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java
@@ -21,7 +21,7 @@ package cxf.server;
import cxf.common.Account;
-@javax.jws.WebService(portName = "AccountCORBAPort",
+@jakarta.jws.WebService(portName = "AccountCORBAPort",
serviceName = "AccountCORBAService",
targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/Bank",
wsdlLocation = "classpath:/wsdl/BankWS-corba.wsdl",
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
index 05b31c7726..7552f0a2eb 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
@@ -22,12 +22,12 @@ package cxf.server;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.wsaddressing.W3CEndpointReference;
import cxf.common.Bank;
-@javax.jws.WebService(portName = "BankCORBAPort",
+@jakarta.jws.WebService(portName = "BankCORBAPort",
serviceName = "BankCORBAService",
targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/Bank",
wsdlLocation = "classpath:/wsdl/BankWS-corba.wsdl",
@@ -80,7 +80,7 @@ public class BankImpl implements Bank {
}
// TODO: What is the correct implementation for this operation?
- public void findAccount(javax.xml.ws.Holder<java.lang.Object> accountDetails) {
+ public void findAccount(jakarta.xml.ws.Holder<java.lang.Object> accountDetails) {
}
public void removeAccount(String accountName) {
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java
index 7c95fede51..360f62d0a9 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java
@@ -19,7 +19,7 @@
package cxf.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
index f72bad1385..1a8dfc92dd 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
@@ -21,7 +21,7 @@ package cxf.server;
import cxf.common.HelloWorld;
-@javax.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService",
+@jakarta.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService",
targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/HelloWorld",
wsdlLocation = "classpath:/wsdl/HelloWorld-corba.wsdl",
endpointInterface = "cxf.common.HelloWorld")
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
index acf145520d..edb0638c58 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
@@ -19,7 +19,7 @@
package cxf.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.java b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.java
index 38a8a50778..02ebd17f24 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.java
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/HelloWorld.java
@@ -19,7 +19,7 @@
// START SNIPPET: service
package demo.spring;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface HelloWorld {
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
index 55c27172ba..1cefd30ca4 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
@@ -21,6 +21,7 @@ package demo.colocated.client;
import java.io.File;
import java.net.URL;
+
import javax.xml.namespace.QName;
import org.apache.hello_world_soap_http.Greeter;
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
index 4f234205dc..e0b0a4eabf 100755
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
@@ -21,17 +21,19 @@ package demo.colocated.client;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.soap.SOAPFaultException;
+
+import jakarta.xml.ws.Dispatch;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.soap.SOAPFaultException;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/common/ThrowFaultInterceptor.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/common/ThrowFaultInterceptor.java
index f26102cd4a..4d0fdde90d 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/common/ThrowFaultInterceptor.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/common/ThrowFaultInterceptor.java
@@ -19,7 +19,7 @@
package demo.colocated.common;
-import javax.xml.ws.ProtocolException;
+import jakarta.xml.ws.ProtocolException;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/GreeterImpl.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/GreeterImpl.java
index 625be3fb13..9757d3397a 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/GreeterImpl.java
@@ -24,7 +24,7 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+@jakarta.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java
index 3ef5f7bdaa..1e5322383b 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java
@@ -19,7 +19,7 @@
package demo.colocated.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
index 94ebe1c973..008cedf4da 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
@@ -22,8 +22,9 @@ package demo.hw.client;
import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
+
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.soap.SOAPBinding;
import demo.hw.server.HelloWorld;
import demo.hw.server.User;
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
index 67c8af1e74..fd00ffc41e 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
@@ -20,8 +20,8 @@ package demo.hw.server;
import java.util.Map;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
// START SNIPPET: service
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java
index a325eb428c..7f3d07e925 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java
@@ -22,7 +22,7 @@ package demo.hw.server;
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(endpointInterface = "demo.hw.server.HelloWorld",
serviceName = "HelloWorld")
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java
index ec282f3bf8..5541cc72ec 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java
@@ -21,10 +21,10 @@ package demo.hw.server;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(name = "IntegerUserMap")
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
index ea77c939e3..63ac431865 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
@@ -22,7 +22,7 @@ package demo.hw.server;
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class IntegerUserMapAdapter extends XmlAdapter<IntegerUserMap, Map<Integer, User>> {
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java
index c9426a0c40..f1f9a54f80 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java
@@ -19,7 +19,7 @@
package demo.hw.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.ext.logging.LoggingFeature;
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/User.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/User.java
index 756b463358..b6bbb740a3 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/User.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/User.java
@@ -18,7 +18,7 @@
*/
package demo.hw.server;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlJavaTypeAdapter(UserAdapter.class)
public interface User {
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserAdapter.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserAdapter.java
index 3a61465774..eca68ffef9 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserAdapter.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserAdapter.java
@@ -19,7 +19,7 @@
package demo.hw.server;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class UserAdapter extends XmlAdapter<UserImpl, User> {
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserImpl.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserImpl.java
index 4d9380f70d..a63fa669a3 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserImpl.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/UserImpl.java
@@ -18,7 +18,7 @@
*/
package demo.hw.server;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
@XmlType(name = "User")
diff --git a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/HelloWorld.java
index b56ddd82d9..f3c16302b4 100644
--- a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/HelloWorld.java
@@ -19,8 +19,8 @@
// START SNIPPET: service
package demo.hw.server;
-import javax.jws.WebParam;
-import javax.jws.WebService;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
@WebService
public interface HelloWorld {
diff --git a/distribution/src/main/release/samples/java_first_jms/pom.xml b/distribution/src/main/release/samples/java_first_jms/pom.xml
index cc576403a3..032e4f1eca 100644
--- a/distribution/src/main/release/samples/java_first_jms/pom.xml
+++ b/distribution/src/main/release/samples/java_first_jms/pom.xml
@@ -92,11 +92,7 @@
<dependencies>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
+ <artifactId>artemis-jakarta-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/client/ClientJMS.java b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/client/ClientJMS.java
index 0e86e35d5a..cdac4ad061 100644
--- a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/client/ClientJMS.java
+++ b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/client/ClientJMS.java
@@ -20,8 +20,8 @@
package demo.client;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Service;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
@@ -30,7 +30,7 @@ import demo.service.HelloWorld;
public final class ClientJMS {
private static final String JMS_ENDPOINT_URI = "jms:queue:test.cxf.jmstransport.queue?timeToLive=1000"
+ "&jndiConnectionFactoryName=ConnectionFactory" + "&jndiInitialContextFactory"
- + "=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
+ + "=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory"
+ "&jndiURL=tcp://localhost:61616";
private static final QName SERVICE_QNAME =
diff --git a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
index 59380c6673..cf7cdf608f 100644
--- a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
+++ b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
@@ -19,12 +19,15 @@
package demo.server;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.io.File;
import java.util.Collections;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
@@ -37,7 +40,7 @@ public final class ServerJMS {
private static final String JMS_ENDPOINT_URI = "jms:queue:test.cxf.jmstransport.queue?timeToLive=1000"
+ "&jndiConnectionFactoryName=ConnectionFactory"
+ "&jndiInitialContextFactory"
- + "=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
+ + "=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory"
+ "&jndiURL=tcp://localhost:61616";
private ServerJMS() {
@@ -74,25 +77,15 @@ public final class ServerJMS {
System.exit(0);
}
- private static void launchAMQBroker() throws ClassNotFoundException, InstantiationException,
- IllegalAccessException, NoSuchMethodException, InvocationTargetException {
- /*
- * The following make it easier to run this against something other than ActiveMQ. You will have
- * to get a JMS broker onto the right port of localhost.
- */
- Class<?> brokerClass = ServerJMS.class.getClassLoader()
- .loadClass("org.apache.activemq.broker.BrokerService");
- if (brokerClass == null) {
- System.err.println("ActiveMQ is not in the classpath, cannot launch broker.");
- return;
- }
- Object broker = brokerClass.newInstance();
- Method addConnectorMethod = brokerClass.getMethod("addConnector", String.class);
- addConnectorMethod.invoke(broker, "tcp://localhost:61616");
- Method setDataDirectory = brokerClass.getMethod("setDataDirectory", String.class);
- setDataDirectory.invoke(broker, "target/activemq-data");
- Method startMethod = brokerClass.getMethod("start");
- startMethod.invoke(broker);
+ private static void launchAMQBroker() throws Exception {
+ final Configuration config = new ConfigurationImpl();
+ config.setPersistenceEnabled(false);
+ config.setSecurityEnabled(false);
+ config.addAcceptorConfiguration("tcp", "tcp://localhost:61616");
+ config.setBrokerInstance(new File("target/activemq-data"));
+
+ final ActiveMQServer broker = new ActiveMQServerImpl(config);
+ broker.start();
}
private static void launchCxfApi() {
diff --git a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/HelloWorld.java b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/HelloWorld.java
index 544251a68a..2a470e7ed1 100644
--- a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/HelloWorld.java
@@ -18,9 +18,9 @@
*/
package demo.service;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
@WebService
public interface HelloWorld {
diff --git a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/impl/HelloWorldImpl.java b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/impl/HelloWorldImpl.java
index fd2ba16312..2be4080990 100644
--- a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/impl/HelloWorldImpl.java
+++ b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/service/impl/HelloWorldImpl.java
@@ -18,7 +18,7 @@
*/
package demo.service.impl;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import demo.service.HelloWorld;
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorld.java b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorld.java
index facc4d4deb..2ab6298036 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorld.java
@@ -19,7 +19,7 @@
// START SNIPPET: service
package demo.spring.service;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface HelloWorld {
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorldImpl.java b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorldImpl.java
index 0b8abc78f5..67c780c1df 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorldImpl.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/HelloWorldImpl.java
@@ -19,7 +19,7 @@
// START SNIPPET: service
package demo.spring.service;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(endpointInterface = "demo.spring.service.HelloWorld")
public class HelloWorldImpl implements HelloWorld {
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Customer.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Customer.java
index 44025f076b..a52303e886 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Customer.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
index 24df62bf4c..a2672865f6 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -21,14 +21,14 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
@Path("/customerservice/")
@Produces("text/xml")
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
index ed88a9adcb..757fd3c3db 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
@@ -20,11 +20,11 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Product.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Product.java
index 4452ec5d6f..6556d25b3d 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Product.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Product.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
index 5cf09856e7..76b0439d50 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
</dependency>
</dependencies>
</profile>
@@ -107,12 +107,12 @@
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/Customer.java b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/Customer.java
index 81ce3c5cdb..529298520f 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/Customer.java
@@ -18,7 +18,7 @@
*/
package http2demo.common;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/CustomerService.java
index 890ade3e82..099d5a4c39 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/common/CustomerService.java
@@ -18,13 +18,13 @@
*/
package http2demo.common;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
/**
* This interface describes a JAX-RS root resource. All the JAXRS annotations (except those overridden) will
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/server/CustomerServiceImpl.java
index 171d27b9da..9ac480421c 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/src/main/java/http2demo/server/CustomerServiceImpl.java
@@ -21,7 +21,7 @@ package http2demo.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import http2demo.common.Customer;
import http2demo.common.CustomerService;
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/Customer.java b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/Customer.java
index 81ce3c5cdb..529298520f 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/Customer.java
@@ -18,7 +18,7 @@
*/
package http2demo.common;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/CustomerService.java
index 890ade3e82..099d5a4c39 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/common/CustomerService.java
@@ -18,13 +18,13 @@
*/
package http2demo.common;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
/**
* This interface describes a JAX-RS root resource. All the JAXRS annotations (except those overridden) will
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/server/CustomerServiceImpl.java
index 171d27b9da..9ac480421c 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/src/main/java/http2demo/server/CustomerServiceImpl.java
@@ -21,7 +21,7 @@ package http2demo.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import http2demo.common.Customer;
import http2demo.common.CustomerService;
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/Customer.java b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/Customer.java
index 81ce3c5cdb..529298520f 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/Customer.java
@@ -18,7 +18,7 @@
*/
package http2demo.common;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/CustomerService.java
index 890ade3e82..099d5a4c39 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/common/CustomerService.java
@@ -18,13 +18,13 @@
*/
package http2demo.common;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
/**
* This interface describes a JAX-RS root resource. All the JAXRS annotations (except those overridden) will
diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/server/CustomerServiceImpl.java
index 171d27b9da..9ac480421c 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/src/main/java/http2demo/server/CustomerServiceImpl.java
@@ -21,7 +21,7 @@ package http2demo.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import http2demo.common.Customer;
import http2demo.common.CustomerService;
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
index 1482f318ec..d6d4e56645 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
@@ -23,8 +23,8 @@ import java.io.FileInputStream;
import java.security.KeyStore;
import javax.net.ssl.SSLContext;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.http.HttpEntity;
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/Customer.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/Customer.java
index f9f3ab7946..267b2371e2 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/Customer.java
@@ -18,7 +18,7 @@
*/
package httpsdemo.common;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
index 03cf4e1f0d..f94a341625 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
@@ -18,13 +18,13 @@
*/
package httpsdemo.common;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
/**
* This interface describes a JAX-RS root resource. All the JAXRS annotations (except those overridden) will
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
index 65427f47db..51a8f51f47 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
@@ -21,7 +21,7 @@ package httpsdemo.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import httpsdemo.common.Customer;
import httpsdemo.common.CustomerService;
diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
index ebb4f5dc77..cbb80a2897 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
@@ -18,12 +18,12 @@
*/
package demo.jaxrs.server;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.rs.security.oidc.rp.IdTokenContext;
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
index 3e5c0ff512..d1e51c81c9 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
@@ -26,7 +26,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.jaxrs.client.WebClient;
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
index 24de03ad1f..f06aad78e2 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
@@ -22,13 +22,13 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxrs.client.WebClient;
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Customer.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Customer.java
index 44025f076b..a52303e886 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Customer.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
index db2fc7e734..e5abe56668 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -21,9 +21,9 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
@Path("/customerservice/")
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
index 5b313a1a16..bf94ac36b6 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml
@@ -80,6 +80,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java
index 6ab368773c..848cd022e9 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java
@@ -23,23 +23,23 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn;
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml
index 8391c18adc..e66b75d86b 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml
@@ -70,8 +70,8 @@
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
index e970d0ab55..c293658e92 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.openapi.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Sample.java
index f07ee28794..209de0b4d5 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Sample.java
@@ -23,23 +23,23 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/pom.xml
index f5dfa153cd..3e7b4b0098 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/pom.xml
@@ -40,9 +40,9 @@ under the License.
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName>
<Import-Package>
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.container,
+ jakarta.ws.rs,
+ jakarta.ws.rs.core,
+ jakarta.ws.rs.container,
org.apache.cxf.jaxrs.provider,
org.apache.cxf.jaxrs.openapi,
org.osgi.service.blueprint,
@@ -51,7 +51,7 @@ under the License.
io.swagger.v3.jaxrs2,
com.fasterxml.jackson.jaxrs.base,
com.fasterxml.jackson.jaxrs.json,
- javax.annotation;version="[1.2,2)",
+ jakarta.annotation;version="[1.2,2)",
*
</Import-Package>
<Export-Package>
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index b7eda12285..de2d1b4538 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.swagger.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 23f34d1b31..58adfc9dc2 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -23,23 +23,23 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml
index 063bb1c51a..17fc5457ae 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml
@@ -70,8 +70,8 @@
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<!-- spring -->
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
index e970d0ab55..c293658e92 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.openapi.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java
index f07ee28794..209de0b4d5 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample.java
@@ -23,23 +23,23 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample2.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample2.java
index b3e4c9c64a..2e8cd8b9ad 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample2.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/java/demo/jaxrs/openapi/server/Sample2.java
@@ -23,20 +23,20 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response.Status;
import demo.jaxrs.openapi.server.Item;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
index a7fe08a329..813f8c68e6 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
@@ -35,7 +35,7 @@ under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
<configuration>
<webApp>
<contextPath>/</contextPath>
@@ -59,8 +59,8 @@ under the License.
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
index e970d0ab55..c293658e92 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.openapi.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/Sample.java
index f07ee28794..209de0b4d5 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/java/demo/jaxrs/openapi/server/Sample.java
@@ -23,23 +23,23 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
index bff216fcdf..a3d7696967 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -81,8 +81,8 @@
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index b7eda12285..de2d1b4538 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.swagger.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
index a57ebbbd05..59a40f91ca 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -23,22 +23,22 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
index 55fb703d88..9c155e84cc 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/pom.xml
@@ -44,9 +44,9 @@ under the License.
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName>
<Import-Package>
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.container,
+ jakarta.ws.rs,
+ jakarta.ws.rs.core,
+ jakarta.ws.rs.container,
org.apache.cxf.jaxrs.provider,
org.apache.cxf.jaxrs.swagger,
org.osgi.service.blueprint,
@@ -56,7 +56,7 @@ under the License.
io.swagger.jaxrs.listing,
com.fasterxml.jackson.jaxrs.base,
com.fasterxml.jackson.jaxrs.json,
- javax.annotation;version="[1.2,2)",
+ jakarta.annotation;version="[1.2,2)",
*
</Import-Package>
<Export-Package>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index b7eda12285..de2d1b4538 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.swagger.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
index d68a2bd57d..d1362876e2 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -23,22 +23,22 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
index 928e95d163..cf99ef493e 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
@@ -86,8 +86,8 @@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<!-- spring -->
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index b7eda12285..de2d1b4538 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.swagger.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
index d68a2bd57d..d1362876e2 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -23,22 +23,22 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index 6de7317aa7..fa5c574b3f 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -39,7 +39,7 @@ under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
<configuration>
<webApp>
<contextPath>/</contextPath>
@@ -75,8 +75,8 @@ under the License.
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<!-- spring -->
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index b7eda12285..de2d1b4538 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -21,10 +21,10 @@ package demo.jaxrs.swagger.server;
import java.io.IOException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
index d68a2bd57d..d1362876e2 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -23,22 +23,22 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
index 447362489e..4464e0ace8 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
@@ -23,22 +23,22 @@ import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/client/Client.java
index b29f8664fb..70ded43fc8 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/client/Client.java
@@ -20,9 +20,9 @@
package demo.jaxrs.client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.Response;
public final class Client {
@@ -32,7 +32,7 @@ public final class Client {
public static void main(String[] args) throws Exception {
// Sent HTTP GET request to query customer info
System.out.println("Sent HTTP GET request to query customer info");
- javax.ws.rs.client.Client client = ClientBuilder.newClient();
+ jakarta.ws.rs.client.Client client = ClientBuilder.newClient();
String response = client
.target("http://localhost:9000/customerservice/customers/123")
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Customer.java b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Customer.java
index 44025f076b..a52303e886 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Customer.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/CustomerService.java
index 24df62bf4c..a2672865f6 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -21,14 +21,14 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
@Path("/customerservice/")
@Produces("text/xml")
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Order.java
index ed88a9adcb..757fd3c3db 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Order.java
@@ -20,11 +20,11 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Product.java b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Product.java
index 4452ec5d6f..6556d25b3d 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Product.java
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Product.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 5beda6bee8..85a55f2bf7 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -65,7 +65,7 @@
<!-- using compile instead of test so we don't need to import geronimo-servlet_3.0_spec -->
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
+ <groupId>jakarta.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
index f6622276cf..23e14cfed9 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
@@ -52,7 +52,7 @@ public class Activator implements BundleActivator {
try {
HttpService service = (HttpService)_context.getService(serviceReference);
Dictionary<String, String> initParams = new Hashtable<>();
- initParams.put("javax.ws.rs.Application", SampleApplication.class.getName());
+ initParams.put("jakarta.ws.rs.Application", SampleApplication.class.getName());
service.registerServlet(_path, new SampleServlet(), initParams, null);
return service;
} catch (Exception ex) {
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java
index 97ba45eac6..c0398a0638 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java
@@ -21,8 +21,8 @@ package minimalosgi;
import java.util.HashSet;
import java.util.Set;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
@ApplicationPath("/app")
public class SampleApplication extends Application {
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleResource.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleResource.java
index 72297182d1..7eed469030 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleResource.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleResource.java
@@ -19,10 +19,10 @@
package minimalosgi;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
public class SampleResource {
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
index 87a593c2de..1724873a47 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
@@ -19,9 +19,9 @@
package minimalosgi;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.ws.rs.core.Application;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.ws.rs.core.Application;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
public class SampleServlet extends CXFNonSpringJaxrsServlet {
diff --git a/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/JaxrsODataService.java b/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/JaxrsODataService.java
index 306aefd317..4ac5be8bf2 100644
--- a/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/JaxrsODataService.java
+++ b/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/JaxrsODataService.java
@@ -20,12 +20,12 @@ package odata.server;
import java.util.ArrayList;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
import org.apache.olingo.commons.api.edmx.EdmxReference;
import org.apache.olingo.server.api.OData;
diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml
index 0985dd06b7..1b08e6b21b 100644
--- a/distribution/src/main/release/samples/jax_rs/search/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml
@@ -128,7 +128,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
index 9f610fb6ba..d33796906f 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
@@ -33,27 +33,27 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.activation.DataHandler;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.StreamingOutput;
-import javax.ws.rs.core.UriInfo;
+import jakarta.activation.DataHandler;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
index a696ee99cf..5fe8682ce7 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
@@ -48,7 +48,7 @@ public class Server {
servletHolder.setInitParameter("redirects-list",
"/ /index.html /js/fileinput.min.js /css/fileinput.min.css");
servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName());
- servletHolder.setInitParameter("redirect-attributes", "javax.servlet.include.request_uri");
+ servletHolder.setInitParameter("redirect-attributes", "jakarta.servlet.include.request_uri");
servletHolder.setInitParameter("jaxrs.serviceClasses", Catalog.class.getName());
servletHolder.setInitParameter("jaxrs.properties", StringUtils.join(
new String[] {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/api/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/api/HelloService.java
index ccc58d7215..9fee499964 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/api/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/api/HelloService.java
@@ -17,11 +17,11 @@
* under the License.
*/
package sample.rs.service.api;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.springframework.stereotype.Service;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
index 894370320b..6691a00c44 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
@@ -18,7 +18,7 @@
*/
package sample.rs.service.hello2;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
import sample.rs.service.api.HelloService;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
index 25bda5bd73..23e91dcdc8 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
@@ -17,11 +17,11 @@
* under the License.
*/
package sample.rs.service;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
@Path("/sayHello")
public interface HelloService {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
index ad0aca287e..27535e26d0 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
@@ -17,7 +17,7 @@
* under the License.
*/
package sample.rs.service.hello2;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
import org.springframework.stereotype.Service;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 0da32ed633..013738fda0 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -21,7 +21,7 @@ package sample.rs.client;
import java.util.LinkedList;
import java.util.List;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
import org.apache.cxf.annotations.Provider;
import org.apache.cxf.annotations.Provider.Type;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
index 25bda5bd73..23e91dcdc8 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
@@ -17,11 +17,11 @@
* under the License.
*/
package sample.rs.service;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
@Path("/sayHello")
public interface HelloService {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
index 129d99d343..176930d5cf 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
@@ -19,7 +19,7 @@
package demo.jaxrs.client;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.http.HttpEntity;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
index c22a837f17..9f8295f041 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
@@ -21,13 +21,13 @@ package demo.jaxrs.service;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
@Path("/customerservice/")
public abstract class AbstractCustomerServiceSecured implements CustomerServiceSecured {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java
index be155b67f2..fbbcb87460 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.service;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
index 310c83d710..98e6a54b92 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
@@ -18,13 +18,13 @@
*/
package demo.jaxrs.service;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Response;
@Path("/customerservice/")
public interface CustomerService {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
index 76778133e4..8ada953260 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
@@ -21,8 +21,8 @@ package demo.jaxrs.service;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
public class CustomerServiceImpl implements CustomerService {
long currentId = 123;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
index 0566f2d0ca..9cd78e1cce 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.service;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.springframework.security.access.annotation.Secured;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
index de0a27072a..c14fe5d1b6 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
@@ -19,8 +19,8 @@
package demo.jaxrs.service;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
public class CustomerServiceSecuredImpl extends AbstractCustomerServiceSecured {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
index 95b5caf021..5b4d2ca42a 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
@@ -20,11 +20,11 @@ package demo.jaxrs.service;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java
index 9ea471ee8d..66403cc52c 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.service;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/SecurityExceptionMapper.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/SecurityExceptionMapper.java
index d6e85065c6..f8787e0000 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/SecurityExceptionMapper.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/SecurityExceptionMapper.java
@@ -19,8 +19,8 @@
package demo.jaxrs.service;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.springframework.security.access.AccessDeniedException;
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
index 79309188a7..2fe13d70c5 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
@@ -36,8 +36,8 @@
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
</dependency>
<dependency>
@@ -80,8 +80,8 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <artifactId>websocket-jakarta-server</artifactId>
+ <version>${cxf.jetty11.version}</version>
</dependency>
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
index 6bfa2c8f97..98404967be 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
@@ -18,8 +18,8 @@
*/
package demo.jaxrs.sse;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
@ApplicationPath("api")
public class StatsApplication extends Application {
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index 63eae32851..cbe8e20cd2 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -22,16 +22,16 @@ import java.util.Date;
import java.util.Random;
import java.util.concurrent.TimeUnit;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseBroadcaster;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.OutboundSseEvent.Builder;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseBroadcaster;
+import jakarta.ws.rs.sse.SseEventSink;
import io.reactivex.Emitter;
import io.reactivex.Flowable;
diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
index 283d0436c2..091250c199 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml
@@ -31,8 +31,8 @@
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<dependency>
<groupId>io.undertow</groupId>
- <artifactId>undertow-servlet</artifactId>
+ <artifactId>undertow-servlet-jakarta</artifactId>
</dependency>
</dependencies>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java
index b0c76d80d9..2058daa84a 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java
@@ -18,11 +18,11 @@
*/
package demo.jaxrs.sse;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.InboundSseEvent;
+import jakarta.ws.rs.sse.SseEventSource;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index 17649e1ec9..a9060b4b47 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -21,15 +21,15 @@ package demo.jaxrs.sse;
import java.util.Date;
import java.util.Random;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.OutboundSseEvent.Builder;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseEventSink;
@Path("/stats")
public class StatsRestServiceImpl {
diff --git a/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml
index 036dfbfc2e..a4a24e5bee 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_osgi/pom.xml
@@ -41,11 +41,11 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName>
<Import-Package>
- javax.servlet;version="[2.6,4)",
- javax.servlet.http;version="[2.6,4)",
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.sse,
+ jakarta.servlet;version="[5,6)",
+ jakarta.servlet.http;version="[5,6)",
+ jakarta.ws.rs,
+ jakarta.ws.rs.core,
+ jakarta.ws.rs.sse,
org.apache.cxf.jaxrs.provider,
org.osgi.service.blueprint,
*
@@ -83,8 +83,8 @@
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java
index feadec3b64..290da7b764 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java
@@ -23,20 +23,20 @@ import java.net.URL;
import java.util.Date;
import java.util.Random;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.OutboundSseEvent.Builder;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseEventSink;
@Path("/stats")
public class StatsRestServiceImpl {
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
index af35a4b732..2d7c3e495e 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@ -25,8 +25,8 @@
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
</dependency>
<dependency>
@@ -57,8 +57,8 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <artifactId>websocket-jakarta-server</artifactId>
+ <version>${cxf.jetty11.version}</version>
</dependency>
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsApplication.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsApplication.java
index 6bfa2c8f97..98404967be 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsApplication.java
@@ -18,8 +18,8 @@
*/
package demo.jaxrs.sse;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
@ApplicationPath("api")
public class StatsApplication extends Application {
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
index c327a08520..76ccd1c65e 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
@@ -18,8 +18,8 @@
*/
package demo.jaxrs.sse;
-import javax.inject.Inject;
-import javax.ws.rs.ext.RuntimeDelegate;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.ext.RuntimeDelegate;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index 0a15153959..a5135a7b03 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -21,16 +21,16 @@ package demo.jaxrs.sse;
import java.util.Date;
import java.util.Random;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.OutboundSseEvent.Builder;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseEventSink;
import org.springframework.stereotype.Component;
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
index 7ac4d457d7..89b3a71ab3 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml
@@ -39,8 +39,8 @@
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index f2d8ff3545..8f06b597c7 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -21,16 +21,16 @@ package demo.jaxrs.sse;
import java.util.Date;
import java.util.Random;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.OutboundSseEvent.Builder;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.OutboundSseEvent.Builder;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseEventSink;
@Path("/stats")
public class StatsRestServiceImpl {
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
index 44023a0edd..6c076d6599 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml
@@ -182,7 +182,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
index 1f8cab2522..3defebbf41 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -21,8 +21,8 @@ package demo.jaxrs.tracing.client;
import java.util.Arrays;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.tracing.brave.jaxrs.BraveClientProvider;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index eaba39c87c..3663c14eca 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -29,23 +29,23 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.cxf.tracing.Traceable;
import org.apache.cxf.tracing.TracerContext;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
index 5363a35480..fb8136e5d5 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
import org.apache.cxf.jaxrs.provider.jsrjsonp.JsrJsonpProvider;
import org.apache.cxf.tracing.brave.jaxrs.BraveFeature;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index d68ba668cf..5c4238fa34 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
index 99c15bc5af..b50a59ed43 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -33,7 +33,7 @@ public class Server {
context.setContextPath("/");
context.addServlet(servletHolder, "/*");
- servletHolder.setInitParameter("javax.ws.rs.Application",
+ servletHolder.setInitParameter("jakarta.ws.rs.Application",
CatalogApplication.class.getName());
server.setHandler(context);
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
index a5857e202d..d2d82db663 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/pom.xml
@@ -70,6 +70,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
@@ -91,13 +92,13 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.container,
+ jakarta.ws.rs,
+ jakarta.ws.rs.core,
+ jakarta.ws.rs.container,
org.apache.cxf.jaxrs.provider,
org.apache.cxf.tracing.brave.jaxrs,
org.osgi.service.blueprint,
- javax.annotation;version="[1.2,2)",
+ jakarta.annotation;version="[2,3)",
org.apache.johnzon.core,
*
</Import-Package>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 141effca85..120b0bb4ce 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -26,22 +26,22 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.cxf.tracing.Traceable;
import org.apache.cxf.tracing.TracerContext;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index d68ba668cf..5c4238fa34 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider.JsonProvider
similarity index 100%
rename from distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
rename to distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider.JsonProvider
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index a69678cdbf..e45e2d7339 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -117,7 +117,7 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/client/Client.java
index 09433ce3d6..0afb9f950c 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -21,8 +21,8 @@ package demo.jaxrs.tracing.client;
import java.util.Arrays;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingClientProvider;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 2e1f880c1d..210fea66b4 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -27,23 +27,23 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.cxf.tracing.Traceable;
import org.apache.cxf.tracing.TracerContext;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
index 25e6264e3b..3a1f9fbd9d 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
import org.apache.cxf.jaxrs.provider.jsrjsonp.JsrJsonpProvider;
import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingFeature;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index 9d6b8c7045..5184012bf5 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
index 44e76ca916..ff574ceacd 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -44,7 +44,7 @@ public class Server {
context.setContextPath("/");
context.addServlet(servletHolder, "/*");
- servletHolder.setInitParameter("javax.ws.rs.Application",
+ servletHolder.setInitParameter("jakarta.ws.rs.Application",
CatalogApplication.class.getName());
final Tracer tracer = new Configuration("tracer-server")
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
index 1295ddb73f..e7835b72a8 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
@@ -223,8 +223,8 @@
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+ <artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/client/Client.java
index 2f1396cf7a..1bca3cb1e2 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -19,9 +19,9 @@
package demo.jaxrs.tracing.client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import io.jaegertracing.Configuration;
import io.jaegertracing.Configuration.ReporterConfiguration;
@@ -50,7 +50,7 @@ public final class Client {
.getTracer();
final OpenTracingClientProvider provider = new OpenTracingClientProvider(tracer);
- final javax.ws.rs.client.Client client = ClientBuilder.newClient().register(provider);
+ final jakarta.ws.rs.client.Client client = ClientBuilder.newClient().register(provider);
final Response response = client
.target("http://localhost:8084/catalog")
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Catalog.java
index 22b9443ea8..7bea6b727e 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Catalog.java
@@ -22,11 +22,11 @@ package demo.jaxrs.tracing.server.cxf;
import java.util.Arrays;
import java.util.Collection;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
import org.apache.cxf.tracing.TracerContext;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml
index 320a3fdccc..b816f2e05b 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml
@@ -66,6 +66,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
@@ -107,13 +108,13 @@
<SPI-Provider>*</SPI-Provider>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.container,
+ jakarta.ws.rs,
+ jakarta.ws.rs.core,
+ jakarta.ws.rs.container,
org.apache.cxf.jaxrs.provider,
org.apache.cxf.tracing.opentracing.jaxrs,
org.osgi.service.blueprint,
- javax.annotation;version="[1.2,2)",
+ jakarta.annotation;version="[2,3)",
org.apache.johnzon.core,
!io.jaegertracing.Configuration,
*
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 141effca85..120b0bb4ce 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -26,22 +26,22 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.cxf.tracing.Traceable;
import org.apache.cxf.tracing.TracerContext;
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index d68ba668cf..5c4238fa34 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
similarity index 100%
rename from distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/META-INF/services/javax.json.spi.JsonProvider
rename to distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index f70e2557c2..538fe67522 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -30,45 +30,28 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <cxf.jetty8.version>8.1.22.v20160922</cxf.jetty8.version>
- <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
+ <cxf.jetty.version>${cxf.jetty11.version}</cxf.jetty.version>
</properties>
<profiles>
<profile>
- <id>jetty8</id>
- <properties>
- <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
- </properties>
- <dependencies>
- <!-- jetty8 websocket -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${cxf.jetty8.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jetty9</id>
+ <id>jetty11</id>
<!-- activate it by default -->
<activation>
- <property>
- <name>!jetty8</name>
- </property>
+ <activeByDefault>true</activeByDefault>
</activation>
<properties>
- <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
+ <cxf.jetty.version>${cxf.jetty11.version}</cxf.jetty.version>
</properties>
<dependencies>
- <!-- jetty9 websocket -->
+ <!-- jetty11 websocket -->
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <artifactId>websocket-jakarta-server</artifactId>
+ <version>${cxf.jetty11.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Customer.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Customer.java
index 44025f076b..a52303e886 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Customer.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index 055bee3175..24c588e567 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -27,19 +27,19 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
import org.apache.cxf.transport.websocket.WebSocketConstants;
@@ -146,7 +146,7 @@ public class CustomerService {
@Path("/monitor2")
@Produces("text/*")
public void monitorCustomers2(
- @javax.ws.rs.core.Context final HttpServletResponse httpResponse,
+ @jakarta.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
index ed88a9adcb..757fd3c3db 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
@@ -20,11 +20,11 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Product.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Product.java
index 4452ec5d6f..6556d25b3d 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Product.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Product.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index c9e543583f..f9b99b70a7 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -43,11 +43,11 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName>
<Import-Package>
- javax.servlet;version="[2.6,4)",
- javax.servlet.http;version="[2.6,4)",
- javax.ws.rs,
- javax.ws.rs.core,
- javax.xml.bind*;version=!,
+ jakarta.servlet;version="[5,6)",
+ jakarta.servlet.http;version="[5,6)",
+ jakarta.ws.rs,
+ jakarta.ws.rs.core,
+ jakarta.xml.bind*;version=!,
org.apache.cxf.jaxrs.provider,
org.osgi.service.blueprint,
*
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Customer.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Customer.java
index 44025f076b..a52303e886 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Customer.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
index 055bee3175..24c588e567 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -27,19 +27,19 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
import org.apache.cxf.transport.websocket.WebSocketConstants;
@@ -146,7 +146,7 @@ public class CustomerService {
@Path("/monitor2")
@Produces("text/*")
public void monitorCustomers2(
- @javax.ws.rs.core.Context final HttpServletResponse httpResponse,
+ @jakarta.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
index ed88a9adcb..757fd3c3db 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
@@ -20,11 +20,11 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Product.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Product.java
index 4452ec5d6f..6556d25b3d 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Product.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Product.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 1adc1af9a5..af77b4a328 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>${cxf.jetty9.version}</version>
+ <version>${cxf.jetty11.version}</version>
<configuration>
<webAppSourceDirectory>${project.build.directory}/${project.name}</webAppSourceDirectory>
<scanIntervalSeconds>1</scanIntervalSeconds>
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Customer.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Customer.java
index 44025f076b..a52303e886 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Customer.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Customer.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Customer")
public class Customer {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
index 055bee3175..24c588e567 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -27,19 +27,19 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
import org.apache.cxf.transport.websocket.WebSocketConstants;
@@ -146,7 +146,7 @@ public class CustomerService {
@Path("/monitor2")
@Produces("text/*")
public void monitorCustomers2(
- @javax.ws.rs.core.Context final HttpServletResponse httpResponse,
+ @jakarta.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
index ed88a9adcb..757fd3c3db 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
@@ -20,11 +20,11 @@ package demo.jaxrs.server;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Product.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Product.java
index 4452ec5d6f..6556d25b3d 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Product.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Product.java
@@ -18,7 +18,7 @@
*/
package demo.jaxrs.server;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
index b80a2a4e2f..04163ecf76 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
@@ -18,8 +18,8 @@
*/
package demo.hw.server;
-import javax.jws.WebParam;
-import javax.jws.WebService;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
@WebService
public interface HelloWorld {
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
index 2d7b6cc10a..6e2d4b2f99 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
@@ -27,7 +27,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import javax.xml.namespace.QName;
-import javax.xml.ws.Response;
+
+import jakarta.xml.ws.Response;
import org.apache.hello_world_async_soap_http.GreeterAsync;
import org.apache.hello_world_async_soap_http.SOAPService;
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
index d807b8c643..6a4ba479dd 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
@@ -19,8 +19,8 @@
package demo.hw.client;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import org.apache.hello_world_async_soap_http.types.GreetMeSometimeResponse;
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
index e12f85e5f8..2d74cda3fa 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
@@ -23,9 +23,9 @@ package demo.hw.server;
import java.util.concurrent.Future;
import java.util.logging.Logger;
-import javax.jws.WebService;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import org.apache.cxf.annotations.UseAsyncMethod;
import org.apache.cxf.jaxws.ServerAsyncResponse;
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
index 9f36260973..440ef635d8 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
@@ -21,7 +21,7 @@
package demo.hw.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.ext.logging.LoggingFeature;
diff --git a/distribution/src/main/release/samples/jaxws_async/wsdl/async_binding.xml b/distribution/src/main/release/samples/jaxws_async/wsdl/async_binding.xml
index cfd847fe42..cc07396698 100644
--- a/distribution/src/main/release/samples/jaxws_async/wsdl/async_binding.xml
+++ b/distribution/src/main/release/samples/jaxws_async/wsdl/async_binding.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://java.sun.com/xml/ns/jaxws" wsdlLocation="hello_world_async.wsdl">
+<bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="https://jakarta.ee/xml/ns/jaxws" wsdlLocation="hello_world_async.wsdl">
<bindings node="wsdl:definitions">
<enableAsyncMapping>true</enableAsyncMapping>
</bindings>
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
index 8b7e364095..45b0dbba34 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
@@ -24,11 +24,12 @@ import java.io.InputStream;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service.Mode;
+
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.Dispatch;
+import jakarta.xml.ws.Service.Mode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
index 652e33fe85..e9321e8aa8 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
@@ -20,13 +20,14 @@
package demo.hwDispatch.server;
import java.io.InputStream;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider()
@ServiceMode(value = Service.Mode.MESSAGE)
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
index 8c77d102e9..c5c217adbb 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
@@ -21,14 +21,15 @@ package demo.hwDispatch.server;
import java.io.InputStream;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceProvider;
+
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider()
public class GreeterDOMSourcePayloadProvider implements Provider<DOMSource> {
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
index 6c623ee5ca..8d97a08dc4 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
@@ -20,12 +20,12 @@
package demo.hwDispatch.server;
import java.io.InputStream;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider(portName = "SoapPort1", serviceName = "SOAPService1",
targetNamespace = "http://apache.org/hello_world_soap_http",
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
index 0dbc9559df..b2fad633a1 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
@@ -18,7 +18,7 @@
*/
package demo.hwDispatch.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/AddNumbersImpl.java b/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/AddNumbersImpl.java
index 5704498a67..3093c6cfa3 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/AddNumbersImpl.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/AddNumbersImpl.java
@@ -19,7 +19,7 @@
package demo.jaxws.server;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import org.apache.handlers.AddNumbers;
import org.apache.handlers.AddNumbersFault;
import org.apache.handlers.types.FaultDetail;
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/Server.java b/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/Server.java
index f94ff3540c..d46bda1fd2 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/main/java/demo/jaxws/server/Server.java
@@ -20,7 +20,7 @@
package demo.jaxws.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbers.java b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbers.java
index e512589828..26ef1795c4 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbers.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbers.java
@@ -19,12 +19,12 @@
package org.apache.handlers;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.RequestWrapper;
+import jakarta.xml.ws.ResponseWrapper;
@WebService(targetNamespace = "http://apache.org/handlers", name = "AddNumbers")
public interface AddNumbers {
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbersFault.java b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbersFault.java
index 7ee4f10297..af8f36e01d 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbersFault.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/AddNumbersFault.java
@@ -19,7 +19,7 @@
package org.apache.handlers;
-import javax.xml.ws.WebFault;
+import jakarta.xml.ws.WebFault;
@WebFault(name = "FaultDetail", targetNamespace = "http://apache.org/handlers/types")
public class AddNumbersFault extends Exception {
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/FaultDetail.java b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/FaultDetail.java
index 67054d05ef..1ad151020a 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/FaultDetail.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/FaultDetail.java
@@ -19,10 +19,10 @@
package org.apache.handlers.types;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "FaultDetail", propOrder = { "faultInfo", "message" })
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/package-info.java b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/package-info.java
index 3b31aa8b35..e4ac95e62f 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/package-info.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/java/org/apache/handlers/types/package-info.java
@@ -17,5 +17,5 @@
* under the License.
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://apache.org/handlers/types", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://apache.org/handlers/types", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.handlers.types;
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/AddNumbersImpl.java b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/AddNumbersImpl.java
index 5704498a67..3093c6cfa3 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/AddNumbersImpl.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/AddNumbersImpl.java
@@ -19,7 +19,7 @@
package demo.jaxws.server;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import org.apache.handlers.AddNumbers;
import org.apache.handlers.AddNumbersFault;
import org.apache.handlers.types.FaultDetail;
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/Server.java b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/Server.java
index f94ff3540c..d46bda1fd2 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/java/demo/jaxws/server/Server.java
@@ -20,7 +20,7 @@
package demo.jaxws.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
index bc71bb9a32..64054f3845 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
@@ -25,8 +25,8 @@ import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.Handler;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.handler.Handler;
import org.apache.handlers.AddNumbers;
import org.apache.handlers.AddNumbersFault;
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java
index 4109402a1e..262d323e0b 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java
@@ -24,10 +24,11 @@ import java.io.PrintStream;
import java.util.Set;
import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
/*
* This simple SOAPHandler will output the contents of incoming
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
index 63f5546ae0..ba13c21885 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
@@ -19,16 +19,17 @@
package demo.handlers.common;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
import javax.xml.transform.Source;
-import javax.xml.ws.LogicalMessage;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.LogicalHandler;
-import javax.xml.ws.handler.LogicalMessageContext;
-import javax.xml.ws.handler.MessageContext;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.ws.LogicalMessage;
+import jakarta.xml.ws.ProtocolException;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.handler.LogicalHandler;
+import jakarta.xml.ws.handler.LogicalMessageContext;
+import jakarta.xml.ws.handler.MessageContext;
import org.apache.handlers.types.AddNumbers;
import org.apache.handlers.types.AddNumbersResponse;
import org.apache.handlers.types.ObjectFactory;
@@ -41,7 +42,7 @@ import org.apache.handlers.types.ObjectFactory;
public class SmallNumberHandler implements LogicalHandler<LogicalMessageContext> {
- // Implementation of javax.xml.ws.handler.Handler
+ // Implementation of jakarta.xml.ws.handler.Handler
public final boolean handleMessage(LogicalMessageContext messageContext) {
System.out.println("LogicalMessageHandler handleMessage called");
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
index 1705367b4c..ce083ef2fd 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/AddNumbersImpl.java
@@ -19,8 +19,8 @@
package demo.handlers.server;
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
+import jakarta.jws.HandlerChain;
+import jakarta.jws.WebService;
import org.apache.handlers.AddNumbers;
import org.apache.handlers.AddNumbersFault;
import org.apache.handlers.types.FaultDetail;
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
index a470255425..9a9d8e1c68 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
@@ -20,7 +20,7 @@
package demo.handlers.server;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
public class Server {
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
index e234fd2fad..f1de627830 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
@@ -24,9 +24,10 @@ import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service;
-import javax.xml.ws.Service.Mode;
+
+import jakarta.xml.ws.Dispatch;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.Service.Mode;
import org.apache.cxf.staxutils.StaxUtils;
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java
index 18d54acb86..83a931094e 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/WebServiceConfig.java
@@ -18,7 +18,7 @@
*/
package sample.ws;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.EndpointImpl;
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
index 1ea22422d6..bf82f9c5fc 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
@@ -18,12 +18,12 @@
*/
package sample.ws.service;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.RequestWrapper;
+import jakarta.xml.ws.ResponseWrapper;
/**
* Examples code for spring boot with CXF services. Hello is the interface for
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
index 416fbf2d07..49d9224fae 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
* 3.1.0 2015-05-18T13:02:03.098-05:00 Generated source version: 3.1.0
*/
-@javax.jws.WebService(serviceName = "HelloService", portName = "HelloPort",
+@jakarta.jws.WebService(serviceName = "HelloService", portName = "HelloPort",
targetNamespace = "http://service.ws.sample/",
endpointInterface = "sample.ws.service.Hello")
public class HelloPortImpl implements Hello {
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
index 57983caa2e..5ed8c59f5b 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/pom.xml
@@ -104,12 +104,12 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.container,
+ jakarta.ws.rs,
+ jakarta.ws.rs.core,
+ jakarta.ws.rs.container,
org.apache.cxf.tracing.brave,
org.osgi.service.blueprint,
- javax.xml.ws;version="[2,3)",
+ jakarta.xml.ws;version="[3,4)",
brave,
*
</Import-Package>
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/client/Client.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/client/Client.java
... 71474 lines suppressed ...