You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2022/11/25 17:20:04 UTC
[camel] 06/08: Switch javax packages to jakarta
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 35acf3d50c9d9def92774a59bb9428bc1318a0dd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 18:19:28 2022 +0100
Switch javax packages to jakarta
---
.../src/main/java/MyRoutes.java | 2 +-
.../src/main/java/SomeBean.java | 4 +-
.../camel/parser/java/MyCdiConcatRouteBuilder.java | 2 +-
.../camel/parser/java/MyCdiRouteBuilder.java | 2 +-
.../converter/ActiveMQMessageConverterLoader.java | 4 +-
.../component/activemq/ActiveMQConfiguration.java | 2 +-
.../OriginalDestinationPropagateStrategy.java | 4 +-
.../converter/ActiveMQMessageConverter.java | 6 +-
.../activemq/ActiveMQJmsHeaderRouteTest.java | 2 +-
.../activemq/ActiveMQOriginalDestinationTest.java | 2 +-
.../ActiveMQReplyToHeaderUsingConverterTest.java | 2 +-
.../activemq/AdvisoryConsumerExampleTest.java | 2 +-
.../activemq/CamelVMTransportRoutingTest.java | 12 +--
.../apache/camel/component/activemq/DlqTest.java | 8 +-
...nvokeRequestReplyUsingJmsReplyToHeaderTest.java | 2 +-
.../apache/camel/component/activemq/JmsBridge.java | 12 +--
.../activemq/JmsConsumeSendTransacted.java | 12 +--
.../component/activemq/JmsJdbcXARollbackTest.java | 14 +--
.../camel/component/activemq/JmsJdbcXATest.java | 8 +-
.../activemq/JmsSimpleRequestReplyTest.java | 2 +-
.../component/activemq/ObjectMessageTest.java | 10 +-
.../component/activemq/PoisonJMSPayloadTest.java | 12 +--
.../component/activemq/TransactedConsumeTest.java | 8 +-
.../component/activemq/converter/ConsumerBean.java | 4 +-
.../converter/InvokeJmsMessageListenerTest.java | 6 +-
.../converter/InvokeMessageListenerTest.java | 4 +-
.../apache/camel/component/amqp/AMQPComponent.java | 2 +-
.../camel/component/amqp/AMQPConfiguration.java | 2 +-
.../camel/component/amqp/AMQPJmsBinding.java | 2 +-
.../apache/camel/component/amqp/AMQPRouteTest.java | 12 +--
.../websocket/CamelWebSocketServlet.java | 8 +-
.../atmosphere/websocket/WebsocketConsumer.java | 8 +-
.../apache/camel/component/atom/MyHttpServlet.java | 6 +-
.../attachment/AttachmentConverterLoader.java | 2 +-
.../org/apache/camel/attachment/Attachment.java | 2 +-
.../camel/attachment/AttachmentConverter.java | 2 +-
.../apache/camel/attachment/AttachmentMessage.java | 4 +-
.../camel/attachment/CamelFileDataSource.java | 4 +-
.../apache/camel/attachment/DefaultAttachment.java | 4 +-
.../camel/attachment/DefaultAttachmentMessage.java | 2 +-
.../attachment/BeanMethodWithExchangeTest.java | 4 +-
.../camel/attachment/BodyAndHeaderConvertTest.java | 4 +-
.../MessageWithAttachmentRedeliveryIssueTest.java | 4 +-
.../org/apache/camel/attachment/WireTapTest.java | 4 +-
.../camel/component/aws2/ses/Ses2Producer.java | 4 +-
.../camel/component/aws2/ses/MockMessage.java | 12 +--
.../BeanValidatorComponentConfigurer.java | 20 ++--
.../validator/BeanValidatorEndpointConfigurer.java | 20 ++--
.../bean/validator/BeanValidationException.java | 2 +-
.../bean/validator/BeanValidatorComponent.java | 10 +-
.../bean/validator/BeanValidatorEndpoint.java | 12 +--
.../bean/validator/BeanValidatorProducer.java | 4 +-
.../HibernateValidationProviderResolver.java | 2 +-
.../ValidationProviderResolverFactory.java | 2 +-
.../bean/validator/ValidatorFactories.java | 18 ++--
.../validator/BeanValidatorConfigurationTest.java | 12 +--
.../bean/validator/BeanValidatorRouteTest.java | 6 +-
.../bean/validator/CarWithAnnotations.java | 4 +-
.../validator/CarWithRedefinedDefaultGroup.java | 6 +-
.../CustomValidationProviderResolverTest.java | 4 +-
.../HibernateValidationProviderResolverTest.java | 2 +-
.../component/bean/validator/OrderedChecks.java | 4 +-
.../validator/ValidatorFactoryAutowireTest.java | 6 +-
.../validator/ValidatorFactoryRegistryTest.java | 6 +-
.../camel/component/bonita/api/BonitaAPI.java | 8 +-
.../component/bonita/api/BonitaAPIBuilder.java | 6 +-
.../bonita/api/filter/BonitaAuthFilter.java | 22 ++---
.../bonita/api/filter/JsonClientFilter.java | 6 +-
.../component/bonita/api/util/BonitaAPIUtil.java | 10 +-
.../api/BonitaAuthFilterAlreadyConnectedTest.java | 4 +-
.../bonita/api/BonitaAuthFilterConnectionTest.java | 6 +-
.../component/bonita/api/BonitaAuthFilterTest.java | 4 +-
.../transaction/MandatoryJtaTransactionPolicy.java | 2 +-
.../transaction/NestedJtaTransactionPolicy.java | 4 +-
.../cdi/transaction/NeverJtaTransactionPolicy.java | 2 +-
.../NotSupportedJtaTransactionPolicy.java | 4 +-
.../transaction/RequiredJtaTransactionPolicy.java | 2 +-
.../RequiresNewJtaTransactionPolicy.java | 4 +-
.../transaction/SupportsJtaTransactionPolicy.java | 2 +-
.../TransactionalJtaTransactionPolicy.java | 14 +--
.../src/main/java/org/apache/camel/cdi/Main.java | 14 +--
.../org/apache/camel/cdi/AnnotatedDelegate.java | 4 +-
.../apache/camel/cdi/AnnotatedMemberDelegate.java | 6 +-
.../apache/camel/cdi/AnnotatedMethodDelegate.java | 6 +-
.../apache/camel/cdi/AnnotatedTypeDelegate.java | 10 +-
.../apache/camel/cdi/ApplicationScopedLiteral.java | 4 +-
.../java/org/apache/camel/cdi/BeanDelegate.java | 8 +-
.../org/apache/camel/cdi/BeanManagerHelper.java | 4 +-
.../apache/camel/cdi/CamelBeanInjectionTarget.java | 10 +-
.../camel/cdi/CamelContextInjectionTarget.java | 6 +-
.../org/apache/camel/cdi/CamelContextProducer.java | 22 ++---
.../camel/cdi/CdiCamelBeanPostProcessor.java | 2 +-
.../apache/camel/cdi/CdiCamelBeanRepository.java | 6 +-
.../camel/cdi/CdiCamelConfigurationEvent.java | 2 +-
.../org/apache/camel/cdi/CdiCamelEnvironment.java | 8 +-
.../org/apache/camel/cdi/CdiCamelExtension.java | 48 +++++-----
.../java/org/apache/camel/cdi/CdiCamelFactory.java | 14 +--
.../org/apache/camel/cdi/CdiCamelInjector.java | 4 +-
.../org/apache/camel/cdi/CdiEventComponent.java | 4 +-
.../org/apache/camel/cdi/CdiEventConsumer.java | 2 +-
.../org/apache/camel/cdi/CdiEventEndpoint.java | 16 ++--
.../org/apache/camel/cdi/CdiEventNotifier.java | 4 +-
.../org/apache/camel/cdi/CdiEventProducer.java | 4 +-
.../java/org/apache/camel/cdi/CdiSpiHelper.java | 22 ++---
.../apache/camel/cdi/DelegateInjectionTarget.java | 6 +-
.../org/apache/camel/cdi/DelegateProducer.java | 6 +-
.../main/java/org/apache/camel/cdi/Excluded.java | 4 +-
.../apache/camel/cdi/ForwardingObserverMethod.java | 8 +-
.../java/org/apache/camel/cdi/ImportResource.java | 2 +-
.../apache/camel/cdi/ListParameterizedType.java | 2 +-
.../java/org/apache/camel/cdi/NamedLiteral.java | 4 +-
.../main/java/org/apache/camel/cdi/Startup.java | 4 +-
.../org/apache/camel/cdi/SyntheticAnnotated.java | 2 +-
.../java/org/apache/camel/cdi/SyntheticBean.java | 18 ++--
.../apache/camel/cdi/SyntheticBeanAttributes.java | 8 +-
.../apache/camel/cdi/SyntheticInjectionTarget.java | 6 +-
.../src/main/java/org/apache/camel/cdi/Uri.java | 6 +-
.../camel/cdi/bean/CamelContextAwareBean.java | 2 +-
.../camel/cdi/bean/CamelContextProducerMethod.java | 6 +-
.../apache/camel/cdi/bean/ConsumeMethodBean.java | 4 +-
.../cdi/bean/CustomLifecycleCamelContext.java | 8 +-
.../cdi/bean/CustomPropertiesCamelContext.java | 4 +-
.../camel/cdi/bean/DefaultCamelContextBean.java | 4 +-
.../apache/camel/cdi/bean/EventConsumingRoute.java | 4 +-
.../camel/cdi/bean/EventConsumingRouteCdi10.java | 4 +-
.../apache/camel/cdi/bean/EventProducingRoute.java | 4 +-
.../camel/cdi/bean/EventProducingRouteCdi10.java | 4 +-
.../camel/cdi/bean/FirstCamelContextBean.java | 2 +-
.../cdi/bean/FirstCamelContextConvertingRoute.java | 2 +-
.../bean/FirstCamelContextEndpointInjectRoute.java | 4 +-
.../bean/FirstCamelContextEventConsumingRoute.java | 4 +-
.../bean/FirstCamelContextEventProducingRoute.java | 4 +-
.../camel/cdi/bean/FirstCamelContextRoute.java | 2 +-
.../camel/cdi/bean/FirstNamedCamelContextBean.java | 4 +-
.../cdi/bean/FirstNamedCamelContextRoute.java | 2 +-
.../camel/cdi/bean/InjectedEndpointRoute.java | 2 +-
.../camel/cdi/bean/ManualStartupCamelContext.java | 6 +-
.../apache/camel/cdi/bean/MockAnnotationRoute.java | 2 +-
.../org/apache/camel/cdi/bean/NamedCamelBean.java | 2 +-
.../camel/cdi/bean/RecipientListMethodBean.java | 2 +-
.../camel/cdi/bean/SecondCamelContextBean.java | 6 +-
.../bean/SecondCamelContextConvertingRoute.java | 4 +-
.../SecondCamelContextEventConsumingRoute.java | 6 +-
.../SecondCamelContextEventProducingRoute.java | 6 +-
.../cdi/bean/SecondNamedCamelContextBean.java | 4 +-
.../cdi/bean/SecondNamedCamelContextRoute.java | 4 +-
.../apache/camel/cdi/bean/SimpleCamelRoute.java | 2 +-
.../apache/camel/cdi/bean/UriEndpointRoute.java | 2 +-
.../cdi/converter/InjectedTestTypeConverter.java | 2 +-
.../apache/camel/cdi/qualifier/BarQualifier.java | 4 +-
.../apache/camel/cdi/qualifier/FooQualifier.java | 4 +-
.../org/apache/camel/cdi/qualifier/Manual.java | 2 +-
.../cdi/routetemplate/MyRouteCreatorBean.java | 6 +-
.../camel/cdi/routetemplate/RouteTemplateTest.java | 2 +-
.../cdi/templatedroute/TemplatedRouteTest.java | 2 +-
.../cdi/test/AdvisedMockEndpointProducerTest.java | 2 +-
.../apache/camel/cdi/test/AdvisedRouteTest.java | 8 +-
.../org/apache/camel/cdi/test/BeanInjectTest.java | 8 +-
.../org/apache/camel/cdi/test/Camel9973Test.java | 8 +-
.../camel/cdi/test/CamelContextAwareTest.java | 2 +-
.../cdi/test/CamelContextProducerFieldTest.java | 8 +-
.../cdi/test/CamelContextProducerMethodTest.java | 2 +-
.../camel/cdi/test/CamelEventEndpointTest.java | 2 +-
.../camel/cdi/test/CamelEventNotifierTest.java | 8 +-
.../cdi/test/CamelRouteEventNotifierTest.java | 8 +-
.../camel/cdi/test/CdiCamelConfigurationTest.java | 4 +-
.../apache/camel/cdi/test/ConsumeMethodTest.java | 2 +-
.../camel/cdi/test/ConsumerTemplateTest.java | 2 +-
.../camel/cdi/test/ContextComponentTest.java | 2 +-
.../camel/cdi/test/CustomCamelContextTest.java | 2 +-
.../camel/cdi/test/DefaultCamelContextTest.java | 2 +-
.../cdi/test/DefaultProducerTemplateTest.java | 2 +-
.../camel/cdi/test/DeploymentDescriptorTest.java | 2 +-
.../apache/camel/cdi/test/EndpointInjectTest.java | 2 +-
.../apache/camel/cdi/test/EventComponentTest.java | 2 +-
.../camel/cdi/test/EventEndpointCdi12Test.java | 12 +--
.../apache/camel/cdi/test/EventEndpointTest.java | 10 +-
.../camel/cdi/test/InjectedEndpointTest.java | 2 +-
.../camel/cdi/test/InjectedTypeConverterTest.java | 6 +-
.../camel/cdi/test/ManualCamelContextTest.java | 2 +-
.../apache/camel/cdi/test/MockEndpointTest.java | 2 +-
.../camel/cdi/test/NamedCamelContextTest.java | 8 +-
.../apache/camel/cdi/test/NoCamelContextTest.java | 6 +-
.../org/apache/camel/cdi/test/NoTCCLSetTest.java | 4 +-
.../camel/cdi/test/ProgrammaticLookupTest.java | 6 +-
.../camel/cdi/test/PropertiesLocationTest.java | 6 +-
.../camel/cdi/test/PropertyEndpointTest.java | 8 +-
.../apache/camel/cdi/test/PropertyInjectTest.java | 6 +-
.../camel/cdi/test/QualifiedCamelContextTest.java | 4 +-
.../camel/cdi/test/RawEventEndpointCdi12Test.java | 8 +-
.../camel/cdi/test/RecipientListMethodTest.java | 2 +-
.../camel/cdi/test/UndefinedPropertyTest.java | 6 +-
.../cdi/test/UnstoppedCamelContextBeanTest.java | 2 +-
.../UnstoppedCamelContextProducerFieldTest.java | 4 +-
.../UnstoppedCamelContextProducerMethodTest.java | 4 +-
.../org/apache/camel/cdi/test/UriEndpointTest.java | 2 +-
.../cdi/test/UriQualifierWithContextTest.java | 4 +-
.../camel/cdi/test/UriWithWrongContextTest.java | 4 +-
.../org/apache/camel/component/cm/CMComponent.java | 8 +-
.../apache/camel/component/cm/CMConfiguration.java | 8 +-
.../org/apache/camel/component/cm/CMProducer.java | 4 +-
.../camel/component/cm/client/SMSMessage.java | 6 +-
.../component/cm/validation/constraints/E164.java | 4 +-
.../cm/validation/constraints/E164Validator.java | 4 +-
.../component/cm/test/CMConfigurationTest.java | 4 +-
.../camel/component/cm/test/SMSMessageTest.java | 4 +-
.../camel/component/cometd/CometdComponent.java | 2 +-
.../cxf/converter/CxfConverterLoader.java | 8 +-
.../camel/component/cxf/common/CxfBinding.java | 4 +-
.../component/cxf/common/message/CxfConstants.java | 4 +-
.../component/cxf/converter/CxfConverter.java | 4 +-
.../component/cxf/util/ReaderInputStream.java | 2 +-
.../component/cxf/jaxrs/CxfConverterLoader.java | 12 +--
.../camel/component/cxf/jaxrs/CxfConverter.java | 6 +-
.../camel/component/cxf/jaxrs/CxfRsBinding.java | 10 +-
.../camel/component/cxf/jaxrs/CxfRsInvoker.java | 10 +-
.../camel/component/cxf/jaxrs/CxfRsProducer.java | 14 +--
.../component/cxf/jaxrs/DataFormatProvider.java | 14 +--
.../component/cxf/jaxrs/DefaultCxfRsBinding.java | 12 +--
.../component/cxf/jaxrs/DefaultModelResource.java | 4 +-
.../component/cxf/jaxrs/SimpleCxfRsBinding.java | 24 ++---
.../component/cxf/jaxrs/CustomExceptionMapper.java | 4 +-
.../CxfRsBindingConfigurationSelectionTest.java | 4 +-
.../cxf/jaxrs/CxfRsConvertBodyToTest.java | 2 +-
.../jaxrs/CxfRsProducerEndpointConfigurerTest.java | 2 +-
.../jaxrs/CxfRsProducerHttpMethodHeaderTest.java | 2 +-
.../cxf/jaxrs/DataFormatProviderTest.java | 2 +-
.../CxfRsConsumerSimpleBindingImplTest.java | 2 +-
.../CxfRsConsumerSimpleBindingTest.java | 4 +-
.../cxf/jaxrs/simplebinding/testbean/Customer.java | 2 +-
.../jaxrs/simplebinding/testbean/CustomerList.java | 2 +-
.../simplebinding/testbean/CustomerService.java | 18 ++--
.../testbean/CustomerServiceImpl.java | 4 +-
.../testbean/CustomerServiceResource.java | 18 ++--
.../simplebinding/testbean/MultipartCustomer.java | 12 +--
.../cxf/jaxrs/simplebinding/testbean/Order.java | 8 +-
.../cxf/jaxrs/simplebinding/testbean/Product.java | 2 +-
.../testbean/VipCustomerResource.java | 14 +--
.../component/cxf/jaxrs/testbean/Customer.java | 2 +-
.../cxf/jaxrs/testbean/CustomerService.java | 18 ++--
.../jaxrs/testbean/CustomerServiceResource.java | 14 +--
.../component/cxf/jaxrs/testbean/EchoService.java | 14 +--
.../camel/component/cxf/jaxrs/testbean/Order.java | 8 +-
.../component/cxf/jaxrs/testbean/Product.java | 2 +-
.../cxf/feature/CXFMessageDataFormatFeature.java | 2 +-
.../CxfMessageSoapHeaderOutInterceptor.java | 2 +-
.../camel/component/cxf/jaxws/CxfConsumer.java | 6 +-
.../camel/component/cxf/jaxws/CxfEndpoint.java | 6 +-
.../component/cxf/jaxws/CxfEndpointUtils.java | 4 +-
.../camel/component/cxf/jaxws/CxfProducer.java | 4 +-
.../component/cxf/jaxws/DefaultCxfBinding.java | 6 +-
.../cxf/jaxws/DefaultPayloadProviderSEI.java | 8 +-
.../camel/component/cxf/jaxws/DefaultSEI.java | 12 +--
.../cxf/jaxws/WSDLServiceFactoryBean.java | 2 +-
.../cxf/holder/CxfHolderConsumerTest.java | 2 +-
.../component/cxf/holder/MyOrderEndpoint.java | 10 +-
.../camel/component/cxf/holder/MyOrderType.java | 6 +-
.../camel/component/cxf/holder/MyProcessor.java | 2 +-
...XFWsdlOnlyPayloadModeMultiPartNoSpringTest.java | 6 +-
.../CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java | 2 +-
.../jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java | 6 +-
.../jaxws/CxfConsumerPayLoadMarshalFaultTest.java | 2 +-
.../cxf/jaxws/CxfConsumerPayloadFaultTest.java | 4 +-
.../cxf/jaxws/CxfConsumerResponseTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfConsumerTest.java | 2 +-
.../cxf/jaxws/CxfPayLoadBareSoapTest.java | 6 +-
.../cxf/jaxws/CxfPayLoadSoapHeaderTest.java | 2 +-
.../jaxws/CxfPayLoadSoapHeaderTestAbstract.java | 2 +-
.../cxf/jaxws/CxfProducerContextTest.java | 2 +-
.../cxf/jaxws/CxfProducerSoapFaultTest.java | 2 +-
.../camel/component/cxf/jaxws/CxfProducerTest.java | 4 +-
.../cxf/jaxws/CxfSchemaValidationTest.java | 6 +-
.../component/cxf/jaxws/DefaultCxfBindingTest.java | 4 +-
.../camel/component/cxf/jaxws/EchoService.java | 2 +-
.../cxf/jaxws/EchoServiceSessionImpl.java | 12 +--
.../component/cxf/jaxws/ParameterProcessor.java | 2 +-
.../camel/component/cxf/jaxws/ServiceProvider.java | 8 +-
.../component/cxf/jaxws/SoapMessageProvider.java | 10 +-
.../camel/component/cxf/jaxws/SoapTargetBean.java | 6 +-
.../cxf/multipart/MultiPartInvokeImpl.java | 4 +-
.../component/cxf/noparam/NoParamEndpoint.java | 4 +-
.../cxf/soap/headers/HeaderTesterImpl.java | 16 ++--
.../headers/HeaderTesterWithInsertionImpl.java | 8 +-
.../camel/component/cxf/wsdl/OrderEndpoint.java | 4 +-
.../apache/camel/wsdl_first/JaxwsTestHandler.java | 6 +-
.../org/apache/camel/wsdl_first/PersonImpl.java | 4 +-
.../org/apache/camel/wsdl_first/PersonImpl12.java | 4 +-
.../camel/wsdl_first/PersonImplWithWsdl.java | 4 +-
.../camel/wsdl_first/PersonMultiPartImpl.java | 2 +-
.../apache/camel/wsdl_first/PersonProcessor.java | 2 +-
.../component/cxf/jaxrs/CustomExceptionMapper.java | 4 +-
.../cxf/jaxrs/CxfRsAsyncProducerTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsConsumerTest.java | 20 ++--
.../cxf/jaxrs/CxfRsProducerHeaderTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsProducerTest.java | 2 +-
.../CxfRsConsumerSimpleBindingImplTest.java | 2 +-
.../CxfRsConsumerSimpleBindingTest.java | 4 +-
.../cxf/jaxrs/simplebinding/testbean/Customer.java | 2 +-
.../jaxrs/simplebinding/testbean/CustomerList.java | 2 +-
.../simplebinding/testbean/CustomerService.java | 18 ++--
.../testbean/CustomerServiceImpl.java | 4 +-
.../testbean/CustomerServiceResource.java | 18 ++--
.../simplebinding/testbean/MultipartCustomer.java | 12 +--
.../cxf/jaxrs/simplebinding/testbean/Order.java | 8 +-
.../cxf/jaxrs/simplebinding/testbean/Product.java | 2 +-
.../testbean/VipCustomerResource.java | 14 +--
.../component/cxf/jaxrs/testbean/Customer.java | 2 +-
.../cxf/jaxrs/testbean/CustomerService.java | 18 ++--
.../jaxrs/testbean/CustomerServiceResource.java | 14 +--
.../component/cxf/jaxrs/testbean/EchoService.java | 14 +--
.../camel/component/cxf/jaxrs/testbean/Order.java | 8 +-
.../component/cxf/jaxrs/testbean/Product.java | 2 +-
.../cxf/spring/jaxws/CxfSpringEndpoint.java | 2 +-
.../cxf/spring/jaxws/CxfSpringEndpointUtils.java | 4 +-
.../cxf/AbstractCXFGreeterRouterTest.java | 2 +-
.../component/cxf/AbstractCxfWsdlFirstTest.java | 6 +-
.../camel/component/cxf/CXFGreeterEnrichTest.java | 2 +-
.../camel/component/cxf/CXFGreeterRouterTest.java | 2 +-
.../camel/component/cxf/CXFWsdlOnlyTest.java | 6 +-
.../CxfConsumerPayloadFaultCauseEnabledTest.java | 8 +-
.../component/cxf/CxfDispatchTestSupport.java | 2 +-
.../cxf/CxfGreeterCXFMessageRouterTest.java | 2 +-
.../CxfGreeterCXFMessageWithoutSEIRouterTest.java | 2 +-
.../cxf/CxfGreeterConverterRouterTest.java | 2 +-
.../cxf/CxfGreeterMessageCamelHttpRouterTest.java | 2 +-
.../component/cxf/CxfGreeterMessageRouterTest.java | 2 +-
.../component/cxf/CxfGreeterPayLoadRouterTest.java | 2 +-
.../CxfGreeterPayLoadWithFeatureRouterTest.java | 2 +-
.../cxf/CxfGreeterWSDLOnlyRouterTest.java | 2 +-
.../component/cxf/CxfMessageHeaderTimeoutTest.java | 2 +-
.../camel/component/cxf/CxfNonWrapperTest.java | 2 +-
.../camel/component/cxf/CxfOneWayRouteTest.java | 2 +-
.../cxf/CxfPayLoadSoapHeaderSpringTest.java | 4 +-
.../cxf/CxfPayLoadSoapHeaderTestAbstract.java | 2 +-
.../cxf/CxfPayloadProviderRouterTest.java | 4 +-
.../cxf/CxfPayloadRouterContentLengthTest.java | 6 +-
.../cxf/CxfPayloadWsdlWithoutSEITest.java | 2 +-
.../component/cxf/CxfSoapMessageProviderTest.java | 2 +-
.../apache/camel/component/cxf/CxfTimeoutTest.java | 2 +-
.../component/cxf/CxfWsdlFirstPayloadModeTest.java | 2 +-
.../component/cxf/CxfWsdlFirstProcessorTest.java | 2 +-
.../camel/component/cxf/CxfWsdlFirstTest.java | 2 +-
.../apache/camel/component/cxf/EchoService.java | 2 +-
.../component/cxf/EchoServiceSessionImpl.java | 12 +--
.../org/apache/camel/component/cxf/HelloImpl.java | 6 +-
.../camel/component/cxf/ParameterProcessor.java | 2 +-
.../camel/component/cxf/ServiceProvider.java | 8 +-
.../camel/component/cxf/SoapMessageProvider.java | 10 +-
.../apache/camel/component/cxf/SoapTargetBean.java | 6 +-
.../component/cxf/holder/MyOrderEndpoint.java | 10 +-
.../camel/component/cxf/holder/MyOrderType.java | 6 +-
.../camel/component/cxf/holder/MyProcessor.java | 2 +-
.../cxf/mtom/CxfJavaMtomProducerPayloadTest.java | 2 +-
.../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 4 +-
.../component/cxf/mtom/CxfMtomConsumerTest.java | 6 +-
.../CxfMtomDisabledConsumerPayloadModeTest.java | 4 +-
.../CxfMtomDisabledProducerPayloadModeTest.java | 14 +--
.../cxf/mtom/CxfMtomPOJOProducerTest.java | 6 +-
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 8 +-
.../cxf/mtom/CxfMtomRouterCxfMessageModeTest.java | 2 +-
.../cxf/mtom/CxfMtomRouterPayloadMode12Test.java | 2 +-
.../cxf/mtom/CxfMtomRouterPayloadModeTest.java | 8 +-
.../cxf/mtom/CxfMtomRouterRawModeTest.java | 2 +-
.../apache/camel/component/cxf/mtom/HelloImpl.java | 2 +-
.../camel/component/cxf/mtom/HelloImpl12.java | 6 +-
.../component/cxf/multipart/CXFMultiPartTest.java | 8 +-
.../cxf/multipart/MultiPartInvokeImpl.java | 4 +-
.../component/cxf/noparam/NoParamEndpoint.java | 4 +-
.../soap/headers/CxfMessageHeadersRelayTest.java | 12 +--
.../cxf/soap/headers/HeaderTesterImpl.java | 16 ++--
.../headers/HeaderTesterWithInsertionImpl.java | 8 +-
.../camel/component/cxf/wsdl/OrderEndpoint.java | 4 +-
.../camel/component/cxf/wsrm/HelloWorld.java | 2 +-
.../cxf/wssecurity/camel/WSSecurityRouteTest.java | 2 +-
.../cxf/wssecurity/server/GreeterImpl.java | 2 +-
.../apache/camel/wsdl_first/JaxwsTestHandler.java | 6 +-
.../org/apache/camel/wsdl_first/PersonImpl.java | 4 +-
.../org/apache/camel/wsdl_first/PersonImpl12.java | 4 +-
.../camel/wsdl_first/PersonImplWithWsdl.java | 4 +-
.../camel/wsdl_first/PersonMultiPartImpl.java | 2 +-
.../apache/camel/wsdl_first/PersonProcessor.java | 2 +-
.../message/DefaultCxfMessageMapperTest.java | 2 +-
.../cxf/transport/CamelDestinationTest.java | 6 +-
.../cxf/transport/JaxWSCamelDestinationTest.java | 2 +-
.../cxf/transport/JaxWSCamelTestSupport.java | 16 ++--
.../transport/message/DefaultCxfMessageMapper.java | 2 +-
.../message/DefaultCxfMessageMapperTest.java | 2 +-
.../cxf/transport/JaxWSCamelDestinationTest.java | 2 +-
.../cxf/transport/JaxWSCamelTestSupport.java | 16 ++--
.../camel/converter/dozer/MapperFactory.java | 2 +-
.../component/dozer/example/abc/ABCOrder.java | 12 +--
.../component/dozer/example/abc/ObjectFactory.java | 2 +-
.../freemarker/FreemarkerAttachmentsTest.java | 4 +-
.../google/mail/GmailUsersMessagesIT.java | 8 +-
.../component/google/mail/GmailUsersThreadsIT.java | 8 +-
.../sheets/server/GoogleSheetsApiTestServer.java | 18 ++--
.../camel/http/common/HttpConverterLoader.java | 10 +-
.../org/apache/camel/http/common/CamelServlet.java | 14 +--
.../camel/http/common/DefaultHttpBinding.java | 8 +-
.../camel/http/common/DefaultHttpRegistry.java | 2 +-
.../org/apache/camel/http/common/HttpBinding.java | 8 +-
.../camel/http/common/HttpCommonEndpoint.java | 4 +-
.../apache/camel/http/common/HttpConverter.java | 6 +-
.../org/apache/camel/http/common/HttpHelper.java | 4 +-
.../org/apache/camel/http/common/HttpMessage.java | 4 +-
.../HttpRestServletResolveConsumerStrategy.java | 2 +-
.../common/HttpServletResolveConsumerStrategy.java | 2 +-
.../common/ServletResolveConsumerStrategy.java | 8 +-
.../http/handler/SessionReflectionHandler.java | 8 +-
.../camel/component/jackson/TestJAXBPojo.java | 4 +-
.../camel/component/jackson/converter/Order.java | 8 +-
.../camel/component/jacksonxml/TestJAXBPojo.java | 4 +-
.../converter/jaxb/FallbackTypeConverter.java | 12 +--
.../camel/converter/jaxb/JaxbDataFormat.java | 18 ++--
.../apache/camel/converter/jaxb/JaxbHelper.java | 2 +-
.../converter/jaxb/JaxbNamespacePrefixMapper.java | 2 +-
.../jaxb/JaxbDataFormatMultipleNamespacesTest.java | 2 +-
.../JaxbDataFormatSchemaValidationSpringTest.java | 12 +--
.../jaxb/JaxbDataFormatSchemaValidationTest.java | 4 +-
...ormatSchemaValidationWithObjectFactoryTest.java | 10 +-
.../camel/converter/jaxb/address/Address.java | 8 +-
.../converter/jaxb/address/ObjectFactory.java | 2 +-
.../camel/converter/jaxb/address/package-info.java | 4 +-
.../camel/converter/jaxb/message/Message.java | 8 +-
.../converter/jaxb/message/ObjectFactory.java | 6 +-
.../camel/converter/jaxb/message/package-info.java | 2 +-
.../camel/converter/jaxb/person/ObjectFactory.java | 2 +-
.../apache/camel/converter/jaxb/person/Person.java | 10 +-
.../camel/converter/jaxb/person/package-info.java | 4 +-
.../java/org/apache/camel/example/Address.java | 8 +-
.../test/java/org/apache/camel/example/Bar.java | 8 +-
.../camel/example/DataFormatConcurrentTest.java | 4 +-
.../ExplicitEncodingAndXMLCharFilteringTest.java | 4 +-
.../camel/example/ExplicitFileEncodingTest.java | 4 +-
.../test/java/org/apache/camel/example/Foo.java | 10 +-
.../org/apache/camel/example/JaxbErrorLogTest.java | 2 +-
.../test/java/org/apache/camel/example/Order.java | 8 +-
.../java/org/apache/camel/example/Partial.java | 10 +-
.../org/apache/camel/example/PurchaseOrder.java | 8 +-
.../test/java/org/apache/camel/example/Zot.java | 6 +-
.../org/apache/camel/example/package-info.java | 4 +-
.../org/apache/camel/foo/bar/ObjectFactory.java | 6 +-
.../java/org/apache/camel/foo/bar/PersonType.java | 10 +-
.../java/org/apache/camel/jaxb/CamelJaxbTest.java | 2 +-
.../apache/camel/jaxb/JaxbDataFormatIssueTest.java | 4 +-
.../jaxb/JaxbDataFormatMustBeJAXBElementTest.java | 6 +-
.../org/apache/camel/jaxb/NotificationType.java | 10 +-
.../SplitterAndExceptionRouteTwistIssueTest.java | 10 +-
.../component/jclouds/JcloudsBlobStoreHelper.java | 2 +-
.../component/jetty/CamelContinuationServlet.java | 6 +-
.../camel/component/jetty/CamelFilterWrapper.java | 16 ++--
.../component/jetty/CamelMultipartFilter.java | 2 +-
.../camel/component/jetty/JettyHttpComponent.java | 14 +--
.../camel/component/jetty/JettyHttpEndpoint.java | 2 +-
.../component/jetty/JettyRestHttpBinding.java | 2 +-
.../camel/component/jetty/MultiPartFilter.java | 14 +--
.../jetty9/JettyHttpEndpoint9Configurer.java | 6 +-
.../component/jetty9/AttachmentHttpBinding.java | 8 +-
.../camel/component/jetty/CustomFiltersTest.java | 14 +--
.../jetty/ExplicitJettyAsyncRouteTest.java | 2 +-
.../component/jetty/ExplicitJettyRouteTest.java | 2 +-
.../jetty/HttpAuthMethodPriorityTest.java | 2 +-
.../HttpBasicAuthComponentConfiguredTest.java | 2 +-
.../camel/component/jetty/HttpBasicAuthTest.java | 2 +-
.../camel/component/jetty/HttpBindingRefTest.java | 2 +-
.../camel/component/jetty/HttpConverterTest.java | 6 +-
.../component/jetty/HttpGZipEncodingTest.java | 2 +-
.../camel/component/jetty/HttpHeaderTest.java | 2 +-
.../component/jetty/HttpRequestResponseTest.java | 4 +-
.../camel/component/jetty/HttpRouteTest.java | 2 +-
.../camel/component/jetty/JettyRouteTest.java | 2 +-
.../jetty/JettyRouteWithSocketPropertiesTest.java | 2 +-
.../camel/component/jetty/MultiPartFormTest.java | 2 +-
.../jetty/MultiPartFormWithCustomFilterTest.java | 12 +--
.../camel/component/jetty/MyErrorHandler.java | 2 +-
.../component/jetty/SpringHttpsRouteTest.java | 2 +-
.../component/jetty/rest/MyCustomHttpBinding.java | 2 +-
.../camel/component/jetty/rest/MyLoginService.java | 2 +-
.../camel/component/jetty/rest/UserJaxbPojo.java | 8 +-
.../component/jms/JmsComponentConfigurer.java | 8 +-
.../camel/component/jms/JmsEndpointConfigurer.java | 8 +-
.../component/jms/DefaultQueueBrowseStrategy.java | 8 +-
.../camel/component/jms/DestinationEndpoint.java | 6 +-
.../component/jms/EndpointMessageListener.java | 12 +--
.../component/jms/InOnlyMessageSentCallback.java | 6 +-
.../org/apache/camel/component/jms/JmsBinding.java | 26 ++---
.../camel/component/jms/JmsBrowsableEndpoint.java | 4 +-
.../apache/camel/component/jms/JmsComponent.java | 6 +-
.../camel/component/jms/JmsConfiguration.java | 40 ++++----
.../apache/camel/component/jms/JmsConstants.java | 6 +-
.../apache/camel/component/jms/JmsConsumer.java | 4 +-
.../apache/camel/component/jms/JmsEndpoint.java | 8 +-
.../camel/component/jms/JmsKeyFormatStrategy.java | 4 +-
.../org/apache/camel/component/jms/JmsMessage.java | 14 +--
.../camel/component/jms/JmsMessageHelper.java | 12 +--
.../apache/camel/component/jms/JmsMessageType.java | 2 +-
.../camel/component/jms/JmsPollingConsumer.java | 2 +-
.../apache/camel/component/jms/JmsProducer.java | 16 ++--
.../camel/component/jms/JmsProviderMetadata.java | 4 +-
.../component/jms/JmsTemporaryQueueEndpoint.java | 8 +-
.../component/jms/JmsTemporaryTopicEndpoint.java | 8 +-
.../component/jms/MessageCreatedStrategy.java | 6 +-
.../camel/component/jms/MessageSentCallback.java | 6 +-
.../component/jms/StreamMessageInputStream.java | 6 +-
.../component/jms/reply/QueueReplyManager.java | 8 +-
.../camel/component/jms/reply/ReplyHandler.java | 4 +-
.../camel/component/jms/reply/ReplyHolder.java | 4 +-
.../camel/component/jms/reply/ReplyManager.java | 6 +-
.../component/jms/reply/ReplyManagerSupport.java | 8 +-
.../jms/reply/TemporaryQueueReplyHandler.java | 4 +-
.../jms/reply/TemporaryQueueReplyManager.java | 12 +--
...essageIdAsCorrelationIdMessageSentCallback.java | 6 +-
.../camel/component/jms/AbstractJMSTest.java | 2 +-
.../component/jms/AbstractPersistentJMSTest.java | 2 +-
.../jms/ActiveMQOriginalDestinationTest.java | 4 +-
.../camel/component/jms/CamelJmsTestHelper.java | 2 +-
.../component/jms/ConsumeJmsBytesMessageTest.java | 4 +-
.../component/jms/ConsumeJmsMapMessageTest.java | 4 +-
.../component/jms/ConsumeJmsObjectMessageTest.java | 4 +-
.../component/jms/ConsumeMessageConverterTest.java | 10 +-
.../jms/ConsumerTemplateJmsSelectorTest.java | 2 +-
.../component/jms/FromTextToBytesMessageTest.java | 12 +--
.../camel/component/jms/JmsAllowNullBodyTest.java | 2 +-
.../component/jms/JmsAsyncStartListenerTest.java | 2 +-
.../jms/JmsAsyncStartStopListenerTest.java | 2 +-
.../camel/component/jms/JmsClientAckTest.java | 4 +-
.../camel/component/jms/JmsComponentTest.java | 2 +-
.../jms/JmsDefaultTaskExecutorTypeTest.java | 2 +-
.../jms/JmsEndpointConfigurationTest.java | 4 +-
.../jms/JmsFormatDateHeadersToIso8601Test.java | 2 +-
.../jms/JmsInOnlyInvalidDestinationTest.java | 6 +-
.../component/jms/JmsInOutNonPersistentTest.java | 2 +-
.../component/jms/JmsLoadBalanceFailoverTest.java | 2 +-
.../JmsMessageCreatedStrategyComponentTest.java | 6 +-
.../jms/JmsMessageCreatedStrategyEndpointTest.java | 6 +-
.../jms/JmsMessageIDNotOverridenAMQTest.java | 6 +-
.../jms/JmsProducerWithJMSHeaderTest.java | 2 +-
.../jms/JmsRequestReplyCorrelationTest.java | 2 +-
.../jms/JmsRequestReplyManualReplyTest.java | 6 +-
.../JmsRequestReplyManualWithJMSReplyToTest.java | 2 +-
.../jms/JmsRequestReplyReplyToOverrideTest.java | 2 +-
.../jms/JmsRouteDeliveryModePreserveQoSTest.java | 2 +-
.../component/jms/JmsRouteRequestReplyTest.java | 2 +-
.../camel/component/jms/JmsSelectorTest.java | 2 +-
.../apache/camel/component/jms/JmsSessionTest.java | 2 +-
.../jms/JmsSimpleRequestLateReplyTest.java | 2 +-
.../jms/JmsTestConnectionOnStartupTest.java | 2 +-
.../jms/JmsThrottlingInflightRoutePolicyTest.java | 2 +-
.../component/jms/JmsTransactedRouteTest.java | 2 +-
.../component/jms/ManagedJmsSelectorTest.java | 2 +-
.../camel/component/jms/MapJmsMessageTest.java | 4 +-
.../camel/component/jms/MyDestinationResolver.java | 6 +-
.../component/jms/ProduceMessageConverterTest.java | 8 +-
.../jms/issues/JmsAnotherCustomJMSReplyToTest.java | 6 +-
.../issues/JmsBlockedAsyncRoutingEngineTest.java | 2 +-
.../issues/JmsConcurrentConsumerInOnlyTest.java | 2 +-
.../jms/issues/JmsCustomJMSReplyToIssueTest.java | 6 +-
...derKeyFormatIssueWithContentTypeHeaderTest.java | 2 +-
.../JmsJMSReplyToEndpointUsingInOutTest.java | 6 +-
.../component/jms/issues/JmsMutateMessageTest.java | 4 +-
.../issues/JmsMutateRemoveHeaderMessageTest.java | 4 +-
...etterChannelHandlerRollbackOnExceptionTest.java | 2 +-
...ansactedOnExceptionRollbackOnExceptionTest.java | 2 +-
.../component/jms/issues/TempReplyToIssueTest.java | 2 +-
...tReplyTemporaryRefreshFailureOnStartupTest.java | 2 +-
.../component/jmx/NotificationXmlFormatter.java | 6 +-
.../component/jpa/JpaComponentConfigurer.java | 4 +-
.../camel/component/jpa/JpaEndpointConfigurer.java | 4 +-
.../component/jpa/DefaultTransactionStrategy.java | 2 +-
.../apache/camel/component/jpa/DeleteHandler.java | 2 +-
.../jpa/JpaCloseEntityManagerOnCompletion.java | 2 +-
.../apache/camel/component/jpa/JpaComponent.java | 2 +-
.../apache/camel/component/jpa/JpaConstants.java | 2 +-
.../apache/camel/component/jpa/JpaConsumer.java | 18 ++--
.../apache/camel/component/jpa/JpaEndpoint.java | 6 +-
.../org/apache/camel/component/jpa/JpaHelper.java | 8 +-
.../camel/component/jpa/JpaPollingConsumer.java | 12 +--
.../apache/camel/component/jpa/JpaProducer.java | 6 +-
.../apache/camel/component/jpa/QueryBuilder.java | 4 +-
.../apache/camel/component/jpa/QueryFactory.java | 4 +-
.../idempotent/jpa/JpaMessageIdRepository.java | 10 +-
.../processor/idempotent/jpa/MessageProcessed.java | 14 +--
.../camel/component/jpa/AbstractJpaMethodTest.java | 2 +-
.../camel/component/jpa/JpaComponentTest.java | 6 +-
.../camel/component/jpa/JpaEndpointTest.java | 4 +-
.../org/apache/camel/component/jpa/JpaTest.java | 2 +-
.../camel/component/jpa/JpaUsePersistTest.java | 2 +-
.../jpa/JpaWithNamedQueryAndParametersTest.java | 2 +-
.../camel/component/jpa/JpaWithNamedQueryTest.java | 2 +-
.../java/org/apache/camel/examples/Address.java | 6 +-
.../java/org/apache/camel/examples/Customer.java | 14 +--
.../java/org/apache/camel/examples/MultiSteps.java | 8 +-
.../test/java/org/apache/camel/examples/Order.java | 6 +-
.../java/org/apache/camel/examples/SendEmail.java | 6 +-
.../org/apache/camel/examples/VersionedItem.java | 8 +-
.../camel/processor/jpa/AbstractJpaTest.java | 4 +-
.../jpa/FileConsumerJpaIdempotentTest.java | 2 +-
.../processor/jpa/JpaIdempotentConsumerTest.java | 4 +-
.../jpa/JpaPollingConsumerLockEntityTest.java | 2 +-
.../jpa/JpaProducerPassingEntityManagerTest.java | 4 +-
.../camel/processor/jpa/JpaProducerRemoveTest.java | 4 +-
.../camel/processor/jpa/JpaRouteEndpointTest.java | 2 +-
.../jpa/MultipleJpaRouteEndpointTest.java | 6 +-
.../component/jsonb/JsonbDataFormatConfigurer.java | 2 +-
.../camel/component/jsonb/JsonbDataFormat.java | 12 +--
.../component/jsonb/JsonbAttributeOrderTest.java | 2 +-
.../apache/camel/jta/TransactionErrorHandler.java | 2 +-
...osoftExchangeOnlineOAuth2MailAuthenticator.java | 2 +-
.../component/mail/MailComponentConfigurer.java | 4 +-
.../camel/component/mail/MailConvertersLoader.java | 16 ++--
.../component/mail/MailEndpointConfigurer.java | 8 +-
...AttachmentsContentTransferEncodingResolver.java | 2 +-
.../camel/component/mail/DefaultAuthenticator.java | 4 +-
.../component/mail/DefaultJavaMailSender.java | 12 +--
.../component/mail/DefaultMailUidGenerator.java | 6 +-
.../camel/component/mail/DelegatingDataSource.java | 2 +-
.../camel/component/mail/JavaMailSender.java | 8 +-
.../camel/component/mail/MailAuthenticator.java | 4 +-
.../apache/camel/component/mail/MailBinding.java | 32 +++----
.../component/mail/MailBoxPostProcessAction.java | 2 +-
.../apache/camel/component/mail/MailComponent.java | 2 +-
.../camel/component/mail/MailConfiguration.java | 12 +--
.../apache/camel/component/mail/MailConsumer.java | 20 ++--
.../camel/component/mail/MailConverters.java | 12 +--
.../apache/camel/component/mail/MailEndpoint.java | 6 +-
.../apache/camel/component/mail/MailMessage.java | 4 +-
.../apache/camel/component/mail/MailProducer.java | 4 +-
.../apache/camel/component/mail/MailSorter.java | 8 +-
.../camel/component/mail/MailUidGenerator.java | 2 +-
.../org/apache/camel/component/mail/MailUtils.java | 6 +-
.../apache/camel/component/mail/NowSearchTerm.java | 8 +-
.../camel/component/mail/SearchTermBuilder.java | 30 +++---
.../camel/component/mail/SimpleSearchTerm.java | 2 +-
.../mime/multipart/MimeMultipartDataFormat.java | 30 +++---
.../camel/component/mail/AuthenticatorTest.java | 18 ++--
.../mail/MailAttachmentDuplicateNamesTest.java | 4 +-
.../component/mail/MailAttachmentNamesTest.java | 10 +-
.../mail/MailAttachmentRedeliveryTest.java | 4 +-
.../camel/component/mail/MailAttachmentTest.java | 4 +-
.../mail/MailAttachmentsUmlautIssueTest.java | 4 +-
.../component/mail/MailBatchConsumerTest.java | 8 +-
...MailBindingAttachmentDuplicateFileNameTest.java | 14 +--
.../MailBindingAttachmentEncodedFilenameTest.java | 18 ++--
.../mail/MailBindingAttachmentFileTest.java | 16 ++--
.../component/mail/MailCommitOnCompletionTest.java | 8 +-
.../mail/MailComponentRecipientSetTest.java | 2 +-
.../camel/component/mail/MailComponentTest.java | 2 +-
.../mail/MailConsumerAuthenticatorTest.java | 6 +-
.../mail/MailConsumerUnsupportedCharsetTest.java | 8 +-
.../mail/MailContentTypeResolverTest.java | 4 +-
.../camel/component/mail/MailContentTypeTest.java | 4 +-
.../camel/component/mail/MailConvertersTest.java | 4 +-
.../camel/component/mail/MailCopyToTest.java | 8 +-
.../component/mail/MailCustomContentTypeTest.java | 2 +-
.../component/mail/MailCustomMailSenderTest.java | 4 +-
.../mail/MailDoNotDeleteIfProcessFailsTest.java | 10 +-
.../camel/component/mail/MailFetchSizeTest.java | 8 +-
.../component/mail/MailFetchSizeZeroTest.java | 8 +-
.../component/mail/MailHtmlAttachmentTest.java | 4 +-
.../MailIdempotentRepositoryDuplicateTest.java | 8 +-
.../mail/MailIdempotentRepositoryTest.java | 8 +-
.../component/mail/MailMaxMessagesPerPollTest.java | 8 +-
.../camel/component/mail/MailMessageTest.java | 10 +-
.../component/mail/MailMimeDecodeHeadersTest.java | 2 +-
.../camel/component/mail/MailMoveToTest.java | 10 +-
.../MailMultipleRecipientsUsingHeadersTest.java | 2 +-
.../component/mail/MailPollEnrichNoMailTest.java | 4 +-
.../camel/component/mail/MailPollEnrichTest.java | 8 +-
.../component/mail/MailPostProcessActionTest.java | 8 +-
.../mail/MailProcessOnlyUnseenMessagesTest.java | 10 +-
.../camel/component/mail/MailProducerTest.java | 10 +-
.../mail/MailRecipientsPipeIssueTest.java | 2 +-
.../camel/component/mail/MailRecipientsTest.java | 2 +-
.../camel/component/mail/MailReplyToTest.java | 2 +-
.../apache/camel/component/mail/MailRouteTest.java | 8 +-
.../component/mail/MailSearchTermNotSpamTest.java | 2 +-
.../camel/component/mail/MailSearchTermTest.java | 12 +--
.../MailSearchTermUriConfigLast24HoursTest.java | 10 +-
.../mail/MailSearchTermUriConfigTest.java | 10 +-
.../mail/MailShutdownCompleteAllTasksTest.java | 8 +-
.../MailShutdownCompleteCurrentTaskOnlyTest.java | 8 +-
.../camel/component/mail/MailSortTermTest.java | 10 +-
.../component/mail/MailSortTermThreeTest.java | 10 +-
.../camel/component/mail/MailSortTermTwoTest.java | 10 +-
.../camel/component/mail/MailSorterTest.java | 8 +-
.../component/mail/MailSplitAttachmentsTest.java | 4 +-
.../mail/MailToMultipleEndpointsTest.java | 2 +-
.../component/mail/MailUsingCustomSessionTest.java | 4 +-
.../camel/component/mail/MailUsingHeadersTest.java | 2 +-
.../component/mail/MailUsingOwnComponentTest.java | 2 +-
.../component/mail/MimeMessageConsumeTest.java | 28 +++---
.../mail/MimeMultipartAlternativeTest.java | 6 +-
...imeMultipartAlternativeWithContentTypeTest.java | 2 +-
...MultipartAlternativeWithLongerFilenameTest.java | 6 +-
.../mail/MultipleDestinationConsumeTest.java | 14 +--
.../mail/NestedMimeMessageConsumeTest.java | 12 +--
.../camel/component/mail/RawMailMessageTest.java | 10 +-
.../component/mail/SearchTermBuilderTest.java | 6 +-
.../mail/SpringMailSplitAttachmentsTest.java | 4 +-
.../camel/component/mail/mock/MyMockStore.java | 8 +-
.../camel/component/mail/mock/MyMockTransport.java | 6 +-
.../camel/component/mail/mock/MyPop3Store.java | 6 +-
.../multipart/MimeMultipartDataFormatTest.java | 6 +-
...CamelMicroProfileHealthCheckRepositoryTest.java | 4 +-
.../health/CamelMicroProfileHealthCheckTest.java | 4 +-
.../CamelMicroProfileHealthComponentsTest.java | 4 +-
.../CamelMicroProfileHealthConsumerTest.java | 4 +-
...CamelMicroProfileHealthRegistryBindingTest.java | 4 +-
...MicroProfileHealthSupervisedRoutesMainTest.java | 6 +-
.../health/CamelMicroProfileHealthTestHelper.java | 8 +-
.../health/CamelMicroProfileHealthTestSupport.java | 4 +-
.../milo/client/MiloClientConfiguration.java | 2 +-
.../netty/http/NettyHttpProducerSessionTest.java | 2 +-
.../netty/http/SpringNettyHttpBasicAuthTest.java | 2 +-
.../netty/http/SpringNettyHttpSSLTest.java | 2 +-
.../component/netty/http/rest/UserJaxbPojo.java | 8 +-
.../olingo2/Olingo2AppAPIETagEnabledTest.java | 2 +-
.../http/vertx/VertxPlatformHttpConsumer.java | 2 +-
.../http/vertx/VertxPlatformHttpEngineTest.java | 2 +-
.../http/PlatformHttpHeaderFilterStrategy.java | 2 +-
.../http/JettyCustomPlatformHttpConsumer.java | 4 +-
.../camel/component/rest/openapi/HttpsTest.java | 4 +-
.../camel/component/rest/openapi/HttpsV3Test.java | 4 +-
.../apache/camel/component/rest/openapi/Pet.java | 2 +-
.../apache/camel/component/rest/openapi/Pets.java | 8 +-
.../rest/openapi/RestOpenApiComponentTest.java | 4 +-
.../rest/openapi/RestOpenApiComponentV3Test.java | 4 +-
.../openapi/RestOpenApiComponentV3YamlTest.java | 4 +-
.../rest/openapi/RestOpenApiComponentYamlTest.java | 4 +-
.../camel/component/rest/swagger/HttpsTest.java | 4 +-
.../apache/camel/component/rest/swagger/Pet.java | 2 +-
.../apache/camel/component/rest/swagger/Pets.java | 8 +-
.../rest/swagger/RestSwaggerComponentTest.java | 4 +-
.../camel/component/resteasy/ResteasyProducer.java | 12 +--
.../resteasy/servlet/ResteasyCamelServlet.java | 8 +-
.../component/resteasy/servlet/ResteasyFilter.java | 18 ++--
.../servlet/ResteasyHttpServletRequestWrapper.java | 6 +-
.../ResteasyHttpServletResponseWrapper.java | 6 +-
.../servlet/ResteasyServletInputStreamCopier.java | 4 +-
.../servlet/ResteasyServletOutputStreamCopier.java | 4 +-
.../test/ResteasyConsumerMatchUriOnPrefix.java | 2 +-
.../resteasy/test/ResteasyConsumerProxyTest.java | 12 +--
.../resteasy/test/ResteasyConsumerTest.java | 12 +--
.../test/ResteasyConsumerTwoServletsTest.java | 8 +-
.../resteasy/test/ResteasyMethodRestrictTest.java | 8 +-
.../resteasy/test/ResteasyProducerTest.java | 2 +-
.../test/ResteasyRestDSLProxyCamelTest.java | 8 +-
.../resteasy/test/ResteasyRestDSLProxyTest.java | 8 +-
.../resteasy/test/ResteasyRestDSLTest.java | 8 +-
.../resteasy/test/ResteasySimpleConsumerTest.java | 8 +-
.../resteasy/test/ServletInitializerTest.java | 2 +-
.../component/resteasy/test/TestApplication.java | 4 +-
.../component/resteasy/test/TestResource.java | 14 +--
.../camel/component/resteasy/test/WebTest.java | 2 +-
.../resteasy/test/beans/CustomerService.java | 20 ++--
.../test/beans/ProxyProducerInterface.java | 18 ++--
.../resteasy/test/beans/ProxyServiceInterface.java | 10 +-
.../test/beans/ResteasyProducerProxyTestApp.java | 4 +-
.../resteasy/test/beans/ServletOneService.java | 6 +-
.../resteasy/test/beans/ServletTwoService.java | 6 +-
.../resteasy/test/beans/SimpleService.java | 6 +-
.../resteasy/test/beans/SubresourceService.java | 6 +-
.../apache/camel/component/rss/MyHttpServlet.java | 6 +-
.../salesforce/api/dto/bulk/BatchInfo.java | 10 +-
.../salesforce/api/dto/bulk/BatchInfoList.java | 6 +-
.../salesforce/api/dto/bulk/BatchResult.java | 6 +-
.../salesforce/api/dto/bulk/BatchStateEnum.java | 6 +-
.../api/dto/bulk/ConcurrencyModeEnum.java | 6 +-
.../salesforce/api/dto/bulk/ContentType.java | 4 +-
.../component/salesforce/api/dto/bulk/Error.java | 8 +-
.../component/salesforce/api/dto/bulk/JobInfo.java | 8 +-
.../salesforce/api/dto/bulk/JobStateEnum.java | 6 +-
.../salesforce/api/dto/bulk/ObjectFactory.java | 20 ++--
.../salesforce/api/dto/bulk/OperationEnum.java | 6 +-
.../salesforce/api/dto/bulk/QueryResult.java | 8 +-
.../salesforce/api/dto/bulk/QueryResultList.java | 6 +-
.../component/salesforce/api/dto/bulk/Result.java | 6 +-
.../salesforce/api/dto/bulk/ResultError.java | 8 +-
.../component/salesforce/api/dto/bulk/SObject.java | 10 +-
.../salesforce/api/dto/bulk/StatusCode.java | 4 +-
.../salesforce/api/dto/bulk/package-info.java | 4 +-
.../internal/client/DefaultBulkApiClient.java | 10 +-
.../salesforce/HttpProxyIntegrationTest.java | 4 +-
.../salesforce/internal/streaming/StubServer.java | 6 +-
.../servicenow/AbstractServiceNowProcessor.java | 4 +-
.../component/servicenow/ServiceNowClient.java | 4 +-
.../ServiceNowComponentVerifierExtension.java | 4 +-
.../component/servicenow/ServiceNowHelper.java | 4 +-
.../servicenow/ServiceNowMetaDataExtension.java | 8 +-
.../auth/AuthenticationRequestFilter.java | 12 +--
.../fuji/FujiServiceNowAggregateProcessor.java | 6 +-
.../fuji/FujiServiceNowImportSetProcessor.java | 6 +-
.../fuji/FujiServiceNowTableProcessor.java | 6 +-
.../HelsinkiServiceNowAggregateProcessor.java | 6 +-
.../HelsinkiServiceNowAttachmentProcessor.java | 6 +-
.../HelsinkiServiceNowImportSetProcessor.java | 8 +-
.../helsinki/HelsinkiServiceNowMiscProcessor.java | 6 +-
.../HelsinkiServiceNowScorecardProcessor.java | 6 +-
...inkiServiceNowServiceCatalogCartsProcessor.java | 6 +-
...erviceNowServiceCatalogCategoriesProcessor.java | 6 +-
...inkiServiceNowServiceCatalogItemsProcessor.java | 6 +-
.../HelsinkiServiceNowServiceCatalogProcessor.java | 6 +-
.../helsinki/HelsinkiServiceNowTableProcessor.java | 6 +-
.../ServiceNowComponentVerifierExtensionIT.java | 2 +-
.../servicenow/ServiceNowComponentVerifierIT.java | 2 +-
.../component/servlet/AttachmentHttpBinding.java | 6 +-
.../servlet/CamelHttpTransportServlet.java | 4 +-
.../component/servlet/ServletRestHttpBinding.java | 2 +-
.../component/servlet/HttpClientRouteTest.java | 4 +-
.../camel/component/servlet/rest/UserJaxbPojo.java | 8 +-
.../component/sjms/SjmsComponentConfigurer.java | 8 +-
.../component/sjms/SjmsEndpointConfigurer.java | 8 +-
.../component/sjms/MessageListenerContainer.java | 4 +-
.../camel/component/sjms/SessionCallback.java | 4 +-
.../component/sjms/SessionMessageListener.java | 6 +-
.../apache/camel/component/sjms/SjmsComponent.java | 6 +-
.../apache/camel/component/sjms/SjmsConsumer.java | 2 +-
.../apache/camel/component/sjms/SjmsEndpoint.java | 18 ++--
.../apache/camel/component/sjms/SjmsHelper.java | 20 ++--
.../apache/camel/component/sjms/SjmsMessage.java | 14 +--
.../camel/component/sjms/SjmsPollingConsumer.java | 2 +-
.../apache/camel/component/sjms/SjmsProducer.java | 14 +--
.../apache/camel/component/sjms/SjmsTemplate.java | 16 ++--
.../component/sjms/TransactionOnCompletion.java | 4 +-
.../sjms/consumer/EndpointMessageListener.java | 14 +--
.../consumer/SimpleMessageListenerContainer.java | 18 ++--
.../jms/DefaultDestinationCreationStrategy.java | 8 +-
.../sjms/jms/DestinationCreationStrategy.java | 6 +-
.../component/sjms/jms/Jms11ObjectFactory.java | 12 +--
.../camel/component/sjms/jms/JmsBinding.java | 28 +++---
.../camel/component/sjms/jms/JmsConstants.java | 2 +-
.../component/sjms/jms/JmsKeyFormatStrategy.java | 4 +-
.../camel/component/sjms/jms/JmsMessageHelper.java | 14 +--
.../camel/component/sjms/jms/JmsMessageType.java | 2 +-
.../camel/component/sjms/jms/JmsObjectFactory.java | 8 +-
.../component/sjms/jms/MessageCreatedStrategy.java | 6 +-
.../camel/component/sjms/jms/MessageCreator.java | 6 +-
.../sjms/jms/SessionAcknowledgementType.java | 2 +-
.../ExclusiveQueueMessageListenerContainer.java | 8 +-
.../component/sjms/reply/QueueReplyManager.java | 8 +-
.../camel/component/sjms/reply/ReplyHandler.java | 4 +-
.../camel/component/sjms/reply/ReplyHolder.java | 4 +-
.../camel/component/sjms/reply/ReplyManager.java | 2 +-
.../component/sjms/reply/ReplyManagerSupport.java | 8 +-
.../TemporaryQueueMessageListenerContainer.java | 8 +-
.../sjms/reply/TemporaryQueueReplyHandler.java | 4 +-
.../sjms/reply/TemporaryQueueReplyManager.java | 12 +--
.../camel/component/sjms/CamelJmsTestHelper.java | 2 +-
.../component/sjms/ReconnectInOutProducerTest.java | 12 +--
.../component/sjms/ReconnectProducerTest.java | 6 +-
.../DefaultDestinationCreationStrategyTest.java | 8 +-
.../sjms/producer/InOnlyQueueProducerTest.java | 6 +-
.../sjms/producer/InOnlyTopicProducerTest.java | 6 +-
.../producer/InOutQueueProducerAsyncLoadTest.java | 12 +--
.../producer/InOutQueueProducerSyncLoadTest.java | 12 +--
.../sjms/producer/InOutQueueProducerTest.java | 12 +--
.../sjms/producer/InOutTempQueueProducerTest.java | 12 +--
.../sjms/producer/QueueProducerQoSTest.java | 4 +-
.../component/sjms/producer/QueueProducerTest.java | 6 +-
.../component/sjms/support/JmsTestSupport.java | 6 +-
.../component/sjms/support/MockConnection.java | 4 +-
.../sjms/support/MockConnectionFactory.java | 4 +-
.../sjms/support/MockMessageConsumer.java | 8 +-
.../camel/component/sjms/support/MockSession.java | 12 +--
.../sjms/support/MyInOutTestConsumer.java | 22 ++---
.../component/sjms2/jms/Jms2ObjectFactory.java | 14 +--
.../sjms2/producer/InOnlyQueueProducerTest.java | 6 +-
.../sjms2/producer/InOnlyTopicProducerTest.java | 6 +-
.../component/sjms2/support/Jms2TestSupport.java | 8 +-
.../dataformat/soap/Soap11DataFormatAdapter.java | 12 +--
.../dataformat/soap/Soap12DataFormatAdapter.java | 14 +--
.../camel/dataformat/soap/SoapDataFormat.java | 12 +--
.../camel/dataformat/soap/name/MethodInfo.java | 2 +-
.../soap/name/ServiceInterfaceStrategy.java | 14 +--
.../dataformat/soap/name/TypeNameStrategy.java | 6 +-
...mlRootElementPreferringElementNameStrategy.java | 6 +-
.../soap/name/AnnotatedClassWithNamespace.java | 2 +-
.../soap/name/AnnotatedClassWithoutNamespace.java | 2 +-
...otElementPreferringElementNameStrategyTest.java | 4 +-
.../name/testpackage/RequestWithDefaultNs.java | 4 +-
.../soap/name/testpackage/package-info.java | 2 +-
.../soap/MultiPartCustomerServiceImpl.java | 2 +-
.../camel/dataformat/soap/SoapCxfClientTest.java | 2 +-
.../dataformat/soap/SoapToSoapDontIgnoreTest.java | 4 +-
.../dataformat/soap/SoapToSoapIgnoreTest.java | 4 +-
.../soap/SoapToSoapSingleDataFormatterTest.java | 4 +-
.../camel/dataformat/soap/SoapUnMarshalTest.java | 2 +-
.../dataformat/soap12/Soap12UnMarshalTest.java | 2 +-
.../apache/camel/component/solr/SolrProducer.java | 2 +-
.../RedisStringIdempotentRepositoryManualIT.java | 2 +-
.../spring/ws/SpringWebserviceConsumer.java | 6 +-
.../spring/ws/filter/impl/BasicMessageFilter.java | 2 +-
.../net/javacrumbs/calc/model/ObjectFactory.java | 2 +-
.../net/javacrumbs/calc/model/PlusRequest.java | 8 +-
.../net/javacrumbs/calc/model/PlusResponse.java | 8 +-
.../net/javacrumbs/calc/model/package-info.java | 4 +-
.../spring/ws/SoapAttachmentResponseProcessor.java | 2 +-
.../spring/ws/SoapResponseAttachmentTest.java | 2 +-
.../ws/filter/impl/BasicMessageFilterTest.java | 2 +-
.../component/spring/ws/jaxb/QuoteRequest.java | 8 +-
.../component/spring/ws/jaxb/QuoteResponse.java | 8 +-
.../component/spring/ws/jaxb/package-info.java | 4 +-
.../camel/spring/xml/CamelBeanPostProcessor.java | 8 +-
.../xml/CamelConsumerTemplateFactoryBean.java | 8 +-
.../camel/spring/xml/CamelContextFactoryBean.java | 14 +--
.../camel/spring/xml/CamelEndpointFactoryBean.java | 8 +-
.../CamelFluentProducerTemplateFactoryBean.java | 8 +-
.../xml/CamelProducerTemplateFactoryBean.java | 8 +-
.../xml/CamelRedeliveryPolicyFactoryBean.java | 8 +-
.../spring/xml/CamelRestContextFactoryBean.java | 8 +-
.../CamelRouteConfigurationContextFactoryBean.java | 8 +-
.../spring/xml/CamelRouteContextFactoryBean.java | 8 +-
.../xml/CamelRouteTemplateContextFactoryBean.java | 8 +-
.../spring/xml/CamelThreadPoolFactoryBean.java | 8 +-
.../xml/KeyManagersParametersFactoryBean.java | 2 +-
.../spring/xml/KeyStoreParametersFactoryBean.java | 4 +-
.../xml/SSLContextClientParametersFactoryBean.java | 4 +-
.../xml/SSLContextParametersFactoryBean.java | 6 +-
.../xml/SSLContextServerParametersFactoryBean.java | 4 +-
.../xml/SecureRandomParametersFactoryBean.java | 4 +-
.../spring/xml/SpringErrorHandlerDefinition.java | 10 +-
.../camel/spring/xml/SpringErrorHandlerType.java | 4 +-
.../xml/TrustManagersParametersFactoryBean.java | 2 +-
.../spring/xml/handler/CamelNamespaceHandler.java | 6 +-
.../org/apache/camel/spring/xml/package-info.java | 4 +-
.../config/EndpointUriSetFromSpringTest.java | 2 +-
...erTemplateAutoRegisterTwoCamelContextsTest.java | 2 +-
...plateMixedAutoRegisterTwoCamelContextsTest.java | 2 +-
.../CamelContextModelErrorHandlerIssueTest.java | 6 +-
.../spring/issues/contextscan3/MyHelloRoute.java | 2 +-
.../spring/KeyStoreParametersFactoryBeanTest.java | 2 +-
.../SSLContextParametersFactoryBeanTest.java | 2 +-
.../SecureRandomParametersFactoryBeanTest.java | 2 +-
.../java/org/apache/camel/spring/package-info.java | 4 +-
.../component/stax/StAXJAXBIteratorExpression.java | 6 +-
.../org/apache/camel/component/stax/StAXUtil.java | 4 +-
.../apache/camel/component/stax/model/Order.java | 8 +-
.../apache/camel/component/stax/model/Orders.java | 8 +-
.../apache/camel/component/stax/model/Product.java | 6 +-
.../apache/camel/component/stax/model/Record.java | 8 +-
.../apache/camel/component/stax/model/Records.java | 8 +-
.../camel/component/stax/model/RecordsUtil.java | 6 +-
.../camel/component/syslog/SyslogConverter.java | 2 +-
.../apache/camel/test/cdi/AnnotatedDecorator.java | 2 +-
.../camel/test/cdi/AnnotatedMethodDecorator.java | 6 +-
.../camel/test/cdi/AnnotatedTypeDecorator.java | 8 +-
.../java/org/apache/camel/test/cdi/AnyLiteral.java | 4 +-
.../main/java/org/apache/camel/test/cdi/Beans.java | 2 +-
.../apache/camel/test/cdi/CamelCdiDeployment.java | 2 +-
.../apache/camel/test/cdi/CamelCdiExtension.java | 4 +-
.../camel/test/cdi/CamelCdiTestExtension.java | 30 +++---
.../test/cdi/FrameworkAnnotatedParameter.java | 6 +-
.../test/cdi/FrameworkMethodInjectionPoint.java | 8 +-
.../org/apache/camel/test/cdi/PriorityLiteral.java | 4 +-
.../test/cdi/CamelCdiAutoDetectRoutesTest.java | 2 +-
.../camel/test/cdi/CamelCdiCamelContextTest.java | 2 +-
.../camel/test/cdi/CamelCdiCustomContextTest.java | 10 +-
.../camel/test/cdi/CamelCdiNotifyBuilderTest.java | 2 +-
.../apache/camel/test/cdi/CamelCdiOrderTest.java | 2 +-
.../camel/test/cdi/CamelCdiParameterizedTest.java | 2 +-
.../camel/test/cdi/CamelCdiRepeatedTest.java | 2 +-
.../test/cdi/alternatives/AlternativeBean.java | 4 +-
.../camel/test/cdi/alternatives/Application.java | 2 +-
.../apache/camel/test/cdi/alternatives/Bean.java | 2 +-
.../apache/camel/test/cdi/AnnotatedDecorator.java | 2 +-
.../camel/test/cdi/AnnotatedMethodDecorator.java | 6 +-
.../camel/test/cdi/AnnotatedTypeDecorator.java | 8 +-
.../java/org/apache/camel/test/cdi/AnyLiteral.java | 4 +-
.../main/java/org/apache/camel/test/cdi/Beans.java | 2 +-
.../org/apache/camel/test/cdi/CamelCdiContext.java | 2 +-
.../org/apache/camel/test/cdi/CamelCdiRunner.java | 4 +-
.../camel/test/cdi/CamelCdiTestExtension.java | 18 ++--
.../test/cdi/FrameworkAnnotatedParameter.java | 6 +-
.../test/cdi/FrameworkMethodCdiInjection.java | 2 +-
.../test/cdi/FrameworkMethodInjectionPoint.java | 8 +-
.../org/apache/camel/test/cdi/PriorityLiteral.java | 4 +-
.../security/SpringSecurityConfiguration.java | 2 +-
.../spring/security/SpringSecurityProvider.java | 8 +-
.../AbstractSpringSecurityBearerTokenTest.java | 2 +-
.../component/spring/security/MockFilter.java | 12 +--
.../component/undertow/DefaultUndertowHost.java | 2 +-
.../undertow/DefaultUndertowHttpBinding.java | 2 +-
.../component/undertow/MultiPartFormTest.java | 2 +-
.../undertow/UndertowHandlersSpringTest.java | 2 +-
.../undertow/UndertowHttpsSpringTest.java | 2 +-
.../component/undertow/rest/UserJaxbPojo.java | 8 +-
.../websocket/jsr356/CamelServerEndpoint.java | 8 +-
.../camel/websocket/jsr356/ClientSessions.java | 16 ++--
.../DefaultServerEndpointDeploymentStrategy.java | 6 +-
.../camel/websocket/jsr356/JSR356Constants.java | 2 +-
.../camel/websocket/jsr356/JSR356Consumer.java | 6 +-
.../camel/websocket/jsr356/JSR356Producer.java | 6 +-
.../websocket/jsr356/JSR356WebSocketComponent.java | 2 +-
.../jsr356/ServerEndpointDeploymentStrategy.java | 6 +-
.../camel/websocket/jsr356/ServletIntegration.java | 10 +-
.../camel/websocket/jsr356/GreetingEncoder.java | 4 +-
.../camel/websocket/jsr356/JSR356ConsumerTest.java | 20 ++--
.../camel/websocket/jsr356/JSR356ProducerTest.java | 6 +-
.../ServerEndpointDeploymentStrategyTest.java | 14 +--
.../component/websocket/WebsocketComponent.java | 2 +-
.../impl/AbstractWordpressServiceAdapter.java | 2 +-
.../wordpress/api/service/spi/CategoriesSPI.java | 18 ++--
.../wordpress/api/service/spi/CommentsSPI.java | 18 ++--
.../wordpress/api/service/spi/PagesSPI.java | 18 ++--
.../api/service/spi/PostRevisionsSPI.java | 14 +--
.../wordpress/api/service/spi/PostsSPI.java | 18 ++--
.../wordpress/api/service/spi/TagsSPI.java | 16 ++--
.../wordpress/api/service/spi/TaxonomySPI.java | 12 +--
.../wordpress/api/service/spi/UsersSPI.java | 16 ++--
.../WordpressServicePostRevisionAdapterIT.java | 2 +-
.../src/main/java/org/apache/camel/BeanScope.java | 2 +-
.../java/org/apache/camel/ExchangePattern.java | 4 +-
.../main/java/org/apache/camel/LoggingLevel.java | 2 +-
.../org/apache/camel/ManagementMBeansLevel.java | 2 +-
.../apache/camel/ManagementStatisticsLevel.java | 2 +-
.../main/java/org/apache/camel/ShutdownRoute.java | 4 +-
.../java/org/apache/camel/ShutdownRunningTask.java | 4 +-
.../java/org/apache/camel/StartupSummaryLevel.java | 2 +-
.../java/org/apache/camel/TypeConverterExists.java | 2 +-
.../org/apache/camel/WaitForTaskToComplete.java | 4 +-
.../main/java/org/apache/camel/package-info.java | 4 +-
.../apache/camel/spi/ModelJAXBContextFactory.java | 6 +-
.../apache/camel/model/AdviceWithDefinition.java | 2 +-
.../apache/camel/model/AggregateDefinition.java | 14 +--
.../org/apache/camel/model/BeanDefinition.java | 10 +-
.../apache/camel/model/BeanFactoryDefinition.java | 10 +-
.../org/apache/camel/model/CatchDefinition.java | 12 +--
.../org/apache/camel/model/ChoiceDefinition.java | 12 +--
.../camel/model/CircuitBreakerDefinition.java | 14 +--
.../apache/camel/model/ClaimCheckDefinition.java | 10 +-
.../apache/camel/model/ClaimCheckOperation.java | 4 +-
.../apache/camel/model/ContextScanDefinition.java | 10 +-
.../apache/camel/model/ConvertBodyDefinition.java | 10 +-
.../apache/camel/model/DataFormatDefinition.java | 8 +-
.../camel/model/DefaultRouteTemplateContext.java | 2 +-
.../org/apache/camel/model/DelayDefinition.java | 10 +-
.../apache/camel/model/DescriptionDefinition.java | 10 +-
.../camel/model/DynamicRouterDefinition.java | 8 +-
.../org/apache/camel/model/EnrichDefinition.java | 10 +-
.../apache/camel/model/ErrorHandlerDefinition.java | 10 +-
.../org/apache/camel/model/ExpressionNode.java | 8 +-
.../model/ExpressionSubElementDefinition.java | 8 +-
.../model/FaultToleranceConfigurationCommon.java | 6 +-
.../FaultToleranceConfigurationDefinition.java | 8 +-
.../org/apache/camel/model/FilterDefinition.java | 8 +-
.../org/apache/camel/model/FinallyDefinition.java | 8 +-
.../org/apache/camel/model/FromDefinition.java | 10 +-
.../apache/camel/model/GlobalOptionDefinition.java | 8 +-
.../camel/model/GlobalOptionsDefinition.java | 8 +-
.../camel/model/IdempotentConsumerDefinition.java | 10 +-
.../org/apache/camel/model/IdentifiedType.java | 10 +-
.../org/apache/camel/model/InOnlyDefinition.java | 6 +-
.../org/apache/camel/model/InOutDefinition.java | 6 +-
.../apache/camel/model/InputTypeDefinition.java | 8 +-
.../apache/camel/model/InterceptDefinition.java | 10 +-
.../camel/model/InterceptFromDefinition.java | 8 +-
.../model/InterceptSendToEndpointDefinition.java | 10 +-
.../org/apache/camel/model/KameletDefinition.java | 10 +-
.../apache/camel/model/LoadBalanceDefinition.java | 12 +--
.../apache/camel/model/LoadBalancerDefinition.java | 2 +-
.../java/org/apache/camel/model/LogDefinition.java | 10 +-
.../org/apache/camel/model/LoopDefinition.java | 8 +-
.../org/apache/camel/model/MarshalDefinition.java | 10 +-
.../apache/camel/model/MulticastDefinition.java | 12 +--
.../apache/camel/model/OnCompletionDefinition.java | 16 ++--
.../org/apache/camel/model/OnCompletionMode.java | 4 +-
.../apache/camel/model/OnExceptionDefinition.java | 14 +--
.../apache/camel/model/OnFallbackDefinition.java | 10 +-
.../model/OptimisticLockRetryPolicyDefinition.java | 8 +-
.../camel/model/OptionalIdentifiedDefinition.java | 12 +--
.../apache/camel/model/OtherwiseDefinition.java | 8 +-
.../org/apache/camel/model/OutputDefinition.java | 6 +-
.../apache/camel/model/OutputExpressionNode.java | 8 +-
.../java/org/apache/camel/model/OutputNode.java | 2 +-
.../apache/camel/model/OutputTypeDefinition.java | 8 +-
.../apache/camel/model/PackageScanDefinition.java | 8 +-
.../org/apache/camel/model/PausableDefinition.java | 10 +-
.../org/apache/camel/model/PipelineDefinition.java | 8 +-
.../org/apache/camel/model/PolicyDefinition.java | 12 +--
.../apache/camel/model/PollEnrichDefinition.java | 10 +-
.../org/apache/camel/model/ProcessDefinition.java | 10 +-
.../apache/camel/model/ProcessorDefinition.java | 8 +-
.../org/apache/camel/model/PropertyDefinition.java | 8 +-
.../apache/camel/model/PropertyDefinitions.java | 6 +-
.../camel/model/PropertyExpressionDefinition.java | 10 +-
.../camel/model/RecipientListDefinition.java | 10 +-
.../camel/model/RedeliveryPolicyDefinition.java | 8 +-
.../apache/camel/model/RemoveHeaderDefinition.java | 8 +-
.../camel/model/RemoveHeadersDefinition.java | 10 +-
.../camel/model/RemovePropertiesDefinition.java | 10 +-
.../camel/model/RemovePropertyDefinition.java | 8 +-
.../apache/camel/model/ResequenceDefinition.java | 14 +--
.../model/Resilience4jConfigurationCommon.java | 6 +-
.../model/Resilience4jConfigurationDefinition.java | 8 +-
.../camel/model/RestContextRefDefinition.java | 8 +-
.../apache/camel/model/ResumableDefinition.java | 10 +-
.../org/apache/camel/model/RollbackDefinition.java | 8 +-
.../apache/camel/model/RouteBuilderDefinition.java | 8 +-
.../camel/model/RouteConfigurationContainer.java | 2 +-
.../RouteConfigurationContextRefDefinition.java | 8 +-
.../camel/model/RouteConfigurationDefinition.java | 10 +-
.../camel/model/RouteConfigurationsDefinition.java | 10 +-
.../org/apache/camel/model/RouteContainer.java | 2 +-
.../camel/model/RouteContextRefDefinition.java | 8 +-
.../org/apache/camel/model/RouteDefinition.java | 16 ++--
.../java/org/apache/camel/model/RouteFilters.java | 2 +-
.../camel/model/RouteTemplateBeanDefinition.java | 6 +-
.../apache/camel/model/RouteTemplateContainer.java | 2 +-
.../model/RouteTemplateContextRefDefinition.java | 8 +-
.../camel/model/RouteTemplateDefinition.java | 12 +--
.../model/RouteTemplateParameterDefinition.java | 8 +-
.../camel/model/RouteTemplatesDefinition.java | 10 +-
.../org/apache/camel/model/RoutesDefinition.java | 10 +-
.../apache/camel/model/RoutingSlipDefinition.java | 8 +-
.../camel/model/SagaActionUriDefinition.java | 4 +-
.../org/apache/camel/model/SagaCompletionMode.java | 4 +-
.../org/apache/camel/model/SagaDefinition.java | 14 +--
.../org/apache/camel/model/SagaPropagation.java | 4 +-
.../org/apache/camel/model/SamplingDefinition.java | 8 +-
.../org/apache/camel/model/ScriptDefinition.java | 6 +-
.../org/apache/camel/model/SendDefinition.java | 8 +-
.../org/apache/camel/model/SetBodyDefinition.java | 6 +-
.../camel/model/SetExchangePatternDefinition.java | 8 +-
.../apache/camel/model/SetHeaderDefinition.java | 8 +-
.../apache/camel/model/SetPropertyDefinition.java | 8 +-
.../org/apache/camel/model/SortDefinition.java | 10 +-
.../org/apache/camel/model/SplitDefinition.java | 10 +-
.../org/apache/camel/model/StepDefinition.java | 8 +-
.../org/apache/camel/model/StopDefinition.java | 6 +-
.../camel/model/TemplatedRouteBeanDefinition.java | 6 +-
.../camel/model/TemplatedRouteContainer.java | 2 +-
.../camel/model/TemplatedRouteDefinition.java | 14 +--
.../model/TemplatedRouteParameterDefinition.java | 8 +-
.../camel/model/TemplatedRoutesDefinition.java | 10 +-
.../camel/model/ThreadPoolProfileDefinition.java | 8 +-
.../org/apache/camel/model/ThreadsDefinition.java | 10 +-
.../org/apache/camel/model/ThrottleDefinition.java | 14 +--
.../camel/model/ThrowExceptionDefinition.java | 10 +-
.../java/org/apache/camel/model/ToDefinition.java | 8 +-
.../apache/camel/model/ToDynamicDefinition.java | 10 +-
.../apache/camel/model/TransactedDefinition.java | 12 +--
.../apache/camel/model/TransformDefinition.java | 6 +-
.../java/org/apache/camel/model/TryDefinition.java | 10 +-
.../apache/camel/model/UnmarshalDefinition.java | 12 +--
.../org/apache/camel/model/ValidateDefinition.java | 10 +-
.../org/apache/camel/model/WhenDefinition.java | 2 +-
.../model/WhenSkipSendToEndpointDefinition.java | 4 +-
.../org/apache/camel/model/WireTapDefinition.java | 10 +-
...klistServiceCallServiceFilterConfiguration.java | 8 +-
...ngServiceCallServiceDiscoveryConfiguration.java | 12 +--
...edServiceCallServiceDiscoveryConfiguration.java | 10 +-
...binedServiceCallServiceFilterConfiguration.java | 10 +-
...ulServiceCallServiceDiscoveryConfiguration.java | 10 +-
...ustomServiceCallServiceFilterConfiguration.java | 10 +-
...erviceCallServiceLoadBalancerConfiguration.java | 6 +-
...nsServiceCallServiceDiscoveryConfiguration.java | 8 +-
...althyServiceCallServiceFilterConfiguration.java | 6 +-
...esServiceCallServiceDiscoveryConfiguration.java | 8 +-
...roughServiceCallServiceFilterConfiguration.java | 6 +-
.../model/cloud/ServiceCallConfiguration.java | 8 +-
.../cloud/ServiceCallConfigurationDefinition.java | 14 +--
.../camel/model/cloud/ServiceCallDefinition.java | 14 +--
.../cloud/ServiceCallExpressionConfiguration.java | 12 +--
.../ServiceCallServiceChooserConfiguration.java | 8 +-
.../ServiceCallServiceDiscoveryConfiguration.java | 8 +-
.../ServiceCallServiceFilterConfiguration.java | 8 +-
...erviceCallServiceLoadBalancerConfiguration.java | 8 +-
...icServiceCallServiceDiscoveryConfiguration.java | 8 +-
...erServiceCallServiceDiscoveryConfiguration.java | 8 +-
.../org/apache/camel/model/cloud/package-info.java | 4 +-
.../camel/model/config/BatchResequencerConfig.java | 8 +-
.../camel/model/config/ResequencerConfig.java | 6 +-
.../model/config/StreamResequencerConfig.java | 10 +-
.../apache/camel/model/config/package-info.java | 4 +-
.../camel/model/dataformat/ASN1DataFormat.java | 10 +-
.../camel/model/dataformat/Any23DataFormat.java | 12 +--
.../apache/camel/model/dataformat/Any23Type.java | 4 +-
.../camel/model/dataformat/AvroDataFormat.java | 10 +-
.../apache/camel/model/dataformat/AvroLibrary.java | 4 +-
.../camel/model/dataformat/BarcodeDataFormat.java | 10 +-
.../camel/model/dataformat/Base64DataFormat.java | 10 +-
.../camel/model/dataformat/BindyDataFormat.java | 10 +-
.../apache/camel/model/dataformat/BindyType.java | 4 +-
.../camel/model/dataformat/CBORDataFormat.java | 10 +-
.../camel/model/dataformat/CryptoDataFormat.java | 10 +-
.../camel/model/dataformat/CsvDataFormat.java | 12 +--
.../camel/model/dataformat/CustomDataFormat.java | 10 +-
.../model/dataformat/DataFormatsDefinition.java | 10 +-
.../camel/model/dataformat/FhirDataformat.java | 4 +-
.../camel/model/dataformat/FhirJsonDataFormat.java | 8 +-
.../camel/model/dataformat/FhirXmlDataFormat.java | 8 +-
.../camel/model/dataformat/FlatpackDataFormat.java | 10 +-
.../camel/model/dataformat/GrokDataFormat.java | 10 +-
.../model/dataformat/GzipDeflaterDataFormat.java | 4 +-
.../camel/model/dataformat/HL7DataFormat.java | 10 +-
.../camel/model/dataformat/IcalDataFormat.java | 10 +-
.../model/dataformat/JacksonXMLDataFormat.java | 10 +-
.../camel/model/dataformat/JaxbDataFormat.java | 10 +-
.../camel/model/dataformat/JsonApiDataFormat.java | 10 +-
.../camel/model/dataformat/JsonDataFormat.java | 10 +-
.../apache/camel/model/dataformat/JsonLibrary.java | 4 +-
.../camel/model/dataformat/LZFDataFormat.java | 10 +-
.../model/dataformat/MimeMultipartDataFormat.java | 10 +-
.../camel/model/dataformat/PGPDataFormat.java | 10 +-
.../camel/model/dataformat/ProtobufDataFormat.java | 10 +-
.../camel/model/dataformat/ProtobufLibrary.java | 4 +-
.../camel/model/dataformat/RssDataFormat.java | 8 +-
.../camel/model/dataformat/SoapDataFormat.java | 10 +-
.../camel/model/dataformat/SwiftMtDataFormat.java | 10 +-
.../camel/model/dataformat/SwiftMxDataFormat.java | 10 +-
.../camel/model/dataformat/SyslogDataFormat.java | 8 +-
.../camel/model/dataformat/TarFileDataFormat.java | 10 +-
.../camel/model/dataformat/ThriftDataFormat.java | 10 +-
.../model/dataformat/TidyMarkupDataFormat.java | 10 +-
.../dataformat/UniVocityAbstractDataFormat.java | 10 +-
.../model/dataformat/UniVocityCsvDataFormat.java | 10 +-
.../model/dataformat/UniVocityFixedDataFormat.java | 10 +-
.../camel/model/dataformat/UniVocityHeader.java | 10 +-
.../model/dataformat/UniVocityTsvDataFormat.java | 10 +-
.../model/dataformat/XMLSecurityDataFormat.java | 10 +-
.../camel/model/dataformat/XStreamDataFormat.java | 12 +--
.../camel/model/dataformat/YAMLDataFormat.java | 12 +--
.../apache/camel/model/dataformat/YAMLLibrary.java | 4 +-
.../model/dataformat/YAMLTypeFilterDefinition.java | 8 +-
.../camel/model/dataformat/YAMLTypeFilterType.java | 2 +-
.../model/dataformat/ZipDeflaterDataFormat.java | 10 +-
.../camel/model/dataformat/ZipFileDataFormat.java | 10 +-
.../camel/model/dataformat/package-info.java | 4 +-
.../DeadLetterChannelConfiguration.java | 2 +-
.../errorhandler/DeadLetterChannelDefinition.java | 8 +-
.../DefaultErrorHandlerConfiguration.java | 2 +-
.../DefaultErrorHandlerDefinition.java | 12 +--
.../errorhandler/ErrorHandlerRefConfiguration.java | 2 +-
.../errorhandler/ErrorHandlerRefDefinition.java | 8 +-
.../JtaTransactionErrorHandlerDefinition.java | 6 +-
.../errorhandler/NoErrorHandlerConfiguration.java | 2 +-
.../errorhandler/NoErrorHandlerDefinition.java | 6 +-
.../SpringTransactionErrorHandlerDefinition.java | 6 +-
.../TransactionErrorHandlerDefinition.java | 4 +-
.../camel/model/errorhandler/package-info.java | 4 +-
.../camel/model/language/CSimpleExpression.java | 8 +-
.../camel/model/language/ConstantExpression.java | 8 +-
.../camel/model/language/DatasonnetExpression.java | 10 +-
.../model/language/ExchangePropertyExpression.java | 8 +-
.../camel/model/language/ExpressionDefinition.java | 16 ++--
.../camel/model/language/GroovyExpression.java | 8 +-
.../camel/model/language/HeaderExpression.java | 8 +-
.../camel/model/language/Hl7TerserExpression.java | 8 +-
.../camel/model/language/JavaScriptExpression.java | 8 +-
.../camel/model/language/JoorExpression.java | 10 +-
.../apache/camel/model/language/JqExpression.java | 8 +-
.../camel/model/language/JsonPathExpression.java | 10 +-
.../camel/model/language/LanguageExpression.java | 10 +-
.../camel/model/language/MethodCallExpression.java | 10 +-
.../camel/model/language/MvelExpression.java | 8 +-
.../model/language/NamespaceAwareExpression.java | 8 +-
.../camel/model/language/OgnlExpression.java | 8 +-
.../camel/model/language/PythonExpression.java | 8 +-
.../apache/camel/model/language/RefExpression.java | 8 +-
.../camel/model/language/SimpleExpression.java | 8 +-
.../language/SingleInputExpressionDefinition.java | 4 +-
.../SingleInputTypedExpressionDefinition.java | 4 +-
.../camel/model/language/SpELExpression.java | 8 +-
.../camel/model/language/TokenizerExpression.java | 10 +-
.../model/language/TypedExpressionDefinition.java | 4 +-
.../model/language/XMLTokenizerExpression.java | 10 +-
.../camel/model/language/XPathExpression.java | 10 +-
.../camel/model/language/XQueryExpression.java | 10 +-
.../apache/camel/model/language/package-info.java | 4 +-
.../loadbalancer/CustomLoadBalancerDefinition.java | 10 +-
.../FailoverLoadBalancerDefinition.java | 12 +--
.../loadbalancer/RandomLoadBalancerDefinition.java | 6 +-
.../RoundRobinLoadBalancerDefinition.java | 6 +-
.../loadbalancer/StickyLoadBalancerDefinition.java | 8 +-
.../loadbalancer/TopicLoadBalancerDefinition.java | 6 +-
.../WeightedLoadBalancerDefinition.java | 8 +-
.../camel/model/loadbalancer/package-info.java | 4 +-
.../java/org/apache/camel/model/package-info.java | 4 +-
.../apache/camel/model/rest/ApiKeyDefinition.java | 8 +-
.../camel/model/rest/BasicAuthDefinition.java | 6 +-
.../camel/model/rest/BearerTokenDefinition.java | 8 +-
.../apache/camel/model/rest/CollectionFormat.java | 4 +-
.../apache/camel/model/rest/DeleteDefinition.java | 6 +-
.../org/apache/camel/model/rest/GetDefinition.java | 6 +-
.../apache/camel/model/rest/HeadDefinition.java | 6 +-
.../camel/model/rest/MutualTLSDefinition.java | 6 +-
.../apache/camel/model/rest/OAuth2Definition.java | 10 +-
.../camel/model/rest/OpenIdConnectDefinition.java | 8 +-
.../apache/camel/model/rest/ParamDefinition.java | 14 +--
.../apache/camel/model/rest/PatchDefinition.java | 6 +-
.../apache/camel/model/rest/PostDefinition.java | 6 +-
.../org/apache/camel/model/rest/PutDefinition.java | 6 +-
.../camel/model/rest/ResponseHeaderDefinition.java | 14 +--
.../model/rest/ResponseMessageDefinition.java | 12 +--
.../camel/model/rest/RestBindingDefinition.java | 10 +-
.../apache/camel/model/rest/RestBindingMode.java | 4 +-
.../model/rest/RestConfigurationDefinition.java | 10 +-
.../org/apache/camel/model/rest/RestContainer.java | 2 +-
.../apache/camel/model/rest/RestDefinition.java | 12 +--
.../camel/model/rest/RestHostNameResolver.java | 4 +-
.../org/apache/camel/model/rest/RestParamType.java | 4 +-
.../camel/model/rest/RestPropertyDefinition.java | 8 +-
.../camel/model/rest/RestSecuritiesDefinition.java | 12 +--
.../camel/model/rest/RestSecurityDefinition.java | 8 +-
.../apache/camel/model/rest/RestsDefinition.java | 8 +-
.../camel/model/rest/SecurityDefinition.java | 8 +-
.../apache/camel/model/rest/VerbDefinition.java | 12 +--
.../org/apache/camel/model/rest/package-info.java | 4 +-
.../transformer/CustomTransformerDefinition.java | 8 +-
.../DataFormatTransformerDefinition.java | 10 +-
.../transformer/EndpointTransformerDefinition.java | 8 +-
.../model/transformer/TransformerDefinition.java | 8 +-
.../model/transformer/TransformersDefinition.java | 10 +-
.../camel/model/transformer/package-info.java | 4 +-
.../model/validator/CustomValidatorDefinition.java | 8 +-
.../validator/EndpointValidatorDefinition.java | 8 +-
.../validator/PredicateValidatorDefinition.java | 8 +-
.../camel/model/validator/ValidatorDefinition.java | 8 +-
.../model/validator/ValidatorsDefinition.java | 10 +-
.../apache/camel/model/validator/package-info.java | 4 +-
.../AbstractCamelConsumerTemplateFactoryBean.java | 8 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 6 +-
.../core/xml/AbstractCamelEndpointFactoryBean.java | 10 +-
.../camel/core/xml/AbstractCamelFactoryBean.java | 8 +-
...ractCamelFluentProducerTemplateFactoryBean.java | 8 +-
.../AbstractCamelProducerTemplateFactoryBean.java | 8 +-
.../AbstractCamelRedeliveryPolicyFactoryBean.java | 6 +-
.../xml/AbstractCamelThreadPoolFactoryBean.java | 6 +-
.../camel/core/xml/CamelJMXAgentDefinition.java | 8 +-
.../xml/CamelPropertyPlaceholderDefinition.java | 10 +-
...CamelPropertyPlaceholderFunctionDefinition.java | 4 +-
...CamelPropertyPlaceholderLocationDefinition.java | 4 +-
.../core/xml/CamelRouteControllerDefinition.java | 8 +-
.../xml/CamelStreamCachingStrategyDefinition.java | 8 +-
.../org/apache/camel/core/xml/package-info.java | 4 +-
...bstractBaseSSLContextParametersFactoryBean.java | 4 +-
.../AbstractKeyManagersParametersFactoryBean.java | 8 +-
.../AbstractKeyStoreParametersFactoryBean.java | 8 +-
...tractSSLContextClientParametersFactoryBean.java | 8 +-
.../AbstractSSLContextParametersFactoryBean.java | 8 +-
...tractSSLContextServerParametersFactoryBean.java | 8 +-
.../AbstractSecureRandomParametersFactoryBean.java | 8 +-
...AbstractTrustManagersParametersFactoryBean.java | 8 +-
.../jsse/CipherSuitesParametersDefinition.java | 6 +-
.../xml/util/jsse/FilterParametersDefinition.java | 6 +-
.../core/xml/util/jsse/SNIHostNamesDefinition.java | 8 +-
.../SecureSocketProtocolsParametersDefinition.java | 6 +-
.../camel/core/xml/util/jsse/package-info.java | 4 +-
.../CamelContextAddRestDefinitionsFromXmlTest.java | 6 +-
...CamelContextAddRouteDefinitionsFromXmlTest.java | 6 +-
.../model/GenerateXmFromCamelContextTest.java | 4 +-
.../org/apache/camel/model/GenerateXmlTest.java | 2 +-
.../apache/camel/model/ModelSanityCheckerTest.java | 8 +-
.../java/org/apache/camel/model/XmlParseTest.java | 2 +-
.../org/apache/camel/model/XmlRestParseTest.java | 2 +-
.../org/apache/camel/model/XmlRouteGroupTest.java | 2 +-
.../apache/camel/model/XmlRoutePropertiesTest.java | 2 +-
.../org/apache/camel/model/XmlTestSupport.java | 6 +-
.../model/dataformat/Any23DataFormatTest.java | 6 +-
...ggregationStrategyBeanAdapterAllowNullTest.java | 2 +-
.../onexception/OnExceptionMisconfiguredTest.java | 2 +-
.../xml/jaxb/DefaultModelJAXBContextFactory.java | 4 +-
.../java/org/apache/camel/xml/jaxb/JaxbHelper.java | 8 +-
.../camel/xml/jaxb/JaxbModelToXMLDumper.java | 4 +-
.../dsl/ActivemqComponentBuilderFactory.java | 24 ++---
.../component/dsl/AmqpComponentBuilderFactory.java | 24 ++---
.../dsl/BeanValidatorComponentBuilderFactory.java | 30 +++---
.../component/dsl/ImapComponentBuilderFactory.java | 12 +--
.../dsl/ImapsComponentBuilderFactory.java | 12 +--
.../component/dsl/JmsComponentBuilderFactory.java | 24 ++---
.../component/dsl/JpaComponentBuilderFactory.java | 6 +-
.../component/dsl/Pop3ComponentBuilderFactory.java | 12 +--
.../dsl/Pop3sComponentBuilderFactory.java | 12 +--
.../dsl/Sjms2ComponentBuilderFactory.java | 14 +--
.../component/dsl/SjmsComponentBuilderFactory.java | 14 +--
.../component/dsl/SmtpComponentBuilderFactory.java | 12 +--
.../dsl/SmtpsComponentBuilderFactory.java | 12 +--
.../endpoint/dsl/AMQPEndpointBuilderFactory.java | 106 ++++++++++-----------
.../dsl/ActiveMQEndpointBuilderFactory.java | 106 ++++++++++-----------
.../AtmosphereWebsocketEndpointBuilderFactory.java | 4 +-
.../dsl/BeanValidatorEndpointBuilderFactory.java | 32 +++----
.../dsl/JSR356WebSocketEndpointBuilderFactory.java | 2 +-
.../dsl/JettyHttpEndpointBuilderFactory.java | 16 ++--
.../endpoint/dsl/JmsEndpointBuilderFactory.java | 106 ++++++++++-----------
.../endpoint/dsl/JpaEndpointBuilderFactory.java | 8 +-
.../endpoint/dsl/MailEndpointBuilderFactory.java | 38 ++++----
.../dsl/ResteasyEndpointBuilderFactory.java | 4 +-
.../dsl/ServletEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/Sjms2EndpointBuilderFactory.java | 76 +++++++--------
.../endpoint/dsl/SjmsEndpointBuilderFactory.java | 76 +++++++--------
.../apache/camel/dsl/java/joor/MultiCompile.java | 4 +-
.../main/download/MavenDependencyDownloader.java | 2 +-
.../injection/AnnotationDependencyInjection.java | 10 +-
.../apache/camel/main/injection/DIRegistry.java | 8 +-
.../camel/main/injection/DIRegistryTest.java | 4 +-
.../cdi/RouteDefinitionsFromXmlTest.java | 4 +-
.../maven/dsl/yaml/GenerateYamlSupportMojo.java | 20 ++--
.../activemq/common/ConnectionFactoryHelper.java | 2 +-
.../services/AbstractActiveMQEmbeddedService.java | 2 +-
.../activemq/services/ConnectionFactoryAware.java | 2 +-
.../infra/jetty/services/JettyConfiguration.java | 2 +-
.../java/org/apache/camel/itest/cdi/MyRoutes.java | 4 +-
.../org/apache/camel/itest/cdi/CamelCdiTest.java | 2 +-
.../itest/cdi/PropertiesConfigurationTest.java | 8 +-
.../camel/itest/jms2/BaseJms2TestSupport.java | 12 +--
.../org/apache/camel/itest/CamelJmsTestHelper.java | 2 +-
.../org/apache/camel/itest/greeter/Server.java | 2 +-
.../org/apache/camel/itest/issues/BaseClass.java | 4 +-
.../itest/jaxb/SpringLoadRouteFromXmlTest.java | 4 +-
.../org/apache/camel/itest/jaxb/example/Bar.java | 8 +-
.../org/apache/camel/itest/jms/PurchaseOrder.java | 8 +-
.../org/apache/camel/itest/proxy/EchoClient.java | 2 +-
.../camel/itest/security/CXFMessageProcessor.java | 4 +-
.../camel/itest/security/GreeterClientTest.java | 6 +-
.../org/apache/camel/itest/tx/JmsToHttpRoute.java | 2 +-
.../itest/tx/JmsToHttpWithOnExceptionRoute.java | 2 +-
.../camel/itest/tx/JmsToHttpWithRollbackRoute.java | 2 +-
.../camel/itest/utils/extensions/GreeterImpl.java | 2 +-
.../utils/extensions/GreeterServiceExtension.java | 2 +-
.../utils/extensions/JmsServiceExtension.java | 4 +-
.../jvnet/mock_javamail/provider/IMAPProvider.java | 2 +-
.../jvnet/mock_javamail/provider/POP3Provider.java | 2 +-
.../jvnet/mock_javamail/provider/SMTPProvider.java | 2 +-
.../packaging/ModelXmlParserGeneratorMojo.java | 28 +++---
.../camel/maven/packaging/PackageJaxbMojo.java | 6 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 14 +--
.../SpringBootProjectSourceCodeGenerator.java | 4 +-
.../SpringBootProjectSourceCodeGenerator.java | 4 +-
1428 files changed, 4956 insertions(+), 4956 deletions(-)
diff --git a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java
index 398a7ac2e4c..71699b30bd6 100644
--- a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java
+++ b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java
@@ -16,7 +16,7 @@
## ------------------------------------------------------------------------
package ${package};
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
diff --git a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java
index c3ca29a54b9..3cf12ea2ab6 100644
--- a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java
+++ b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java
@@ -16,8 +16,8 @@
## ------------------------------------------------------------------------
package ${package};
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
@Singleton
@Named("counterBean")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
index a703f74945d..c3134535e8c 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.parser.java;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
index 84dfe229e6f..fcb907fb024 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.parser.java;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
index 66f5397f339..dc8352e038e 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
@@ -43,8 +43,8 @@ public final class ActiveMQMessageConverterLoader implements TypeConverterLoader
private void registerConverters(TypeConverterRegistry registry) {
addTypeConverter(registry, org.apache.activemq.command.ActiveMQMessage.class, org.apache.camel.Exchange.class, false,
(type, exchange, value) -> getActiveMQMessageConverter().toMessage((org.apache.camel.Exchange) value));
- addTypeConverter(registry, org.apache.camel.Processor.class, javax.jms.MessageListener.class, false,
- (type, exchange, value) -> getActiveMQMessageConverter().toProcessor((javax.jms.MessageListener) value));
+ addTypeConverter(registry, org.apache.camel.Processor.class, jakarta.jms.MessageListener.class, false,
+ (type, exchange, value) -> getActiveMQMessageConverter().toProcessor((jakarta.jms.MessageListener) value));
}
private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) {
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
index e402a118a3e..09395ece300 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.activemq;
import java.lang.reflect.Constructor;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.Service;
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
index 3fbf82e1435..1c56c5d2b6c 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.activemq;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
index 61426756373..c267e456240 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.activemq.converter;
import java.io.Serializable;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ActiveMQObjectMessage;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
index 3be327d110f..f03f576a4dc 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.activemq;
import java.util.Date;
import java.util.List;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.camel.CamelContext;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
index 4c2e79a5743..b6248fa0446 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.activemq;
-import javax.jms.Message;
+import jakarta.jms.Message;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
index 4b3a4f37927..2e1b19b80ee 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
index c593311ef8f..ffc2b15787a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
@@ -59,7 +59,7 @@ public class AdvisoryConsumerExampleTest extends ActiveMQTestSupport {
Message in = exchange.getIn();
if (in instanceof JmsMessage) {
JmsMessage jmsMessage = (JmsMessage) in;
- javax.jms.Message value = jmsMessage.getJmsMessage();
+ jakarta.jms.Message value = jmsMessage.getJmsMessage();
if (value instanceof ActiveMQMessage) {
ActiveMQMessage activeMQMessage = (ActiveMQMessage) value;
DataStructure structure = activeMQMessage.getDataStructure();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
index 98ef5e6e545..7ff423c0b7a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.activemq;
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.util.ThreadTracker;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
index 0d231ae782d..3f267ed7bf9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.activemq;
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
index e448adec48e..92c4f1836ca 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.activemq;
import java.util.HashMap;
import java.util.Map;
-import javax.jms.Destination;
+import jakarta.jms.Destination;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
index 091d7254146..ecd387b463d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.activemq;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerPlugin;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
index 40e75b8c30d..84f48d8da1d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.activemq;
import java.util.Map;
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
index e1517c006ec..e95fbbd12eb 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
@@ -20,14 +20,14 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.TransactionManager;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
index fa93ff51082..f8435554d60 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
@@ -22,10 +22,10 @@ import java.sql.SQLException;
import java.util.Map;
import java.util.concurrent.Executors;
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import javax.sql.DataSource;
import org.apache.activemq.ActiveMQConnectionFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
index 48448996311..a7dde6011d5 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.activemq;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.pool.PooledConnectionFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
index 6e9192ace3f..3359f969504 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.activemq;
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
index c4e54059e9c..4b214973cee 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.activemq;
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
@@ -41,7 +41,7 @@ public class PoisonJMSPayloadTest extends ActiveMQSpringTestSupport {
getMockEndpoint("mock:dead").expectedMessageCount(1);
getMockEndpoint("mock:dead").message(0).body(String.class)
.startsWith(
- "Poison JMS message payload: Failed to extract body due to: javax.jms.JMSException: Failed to build body from content. Serializable class not available to broker.");
+ "Poison JMS message payload: Failed to extract body due to: jakarta.jms.JMSException: Failed to build body from content. Serializable class not available to broker.");
factory = new ActiveMQConnectionFactory(vmUri());
Connection conn = factory.createConnection();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
index d60efb65036..acb3794eded 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
index 24df76e0fbf..cc1c505e993 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.activemq.converter;
import java.util.ArrayList;
import java.util.List;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
index 651958b4c34..e15432f09fa 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.activemq.converter;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
index fadff8bfe5a..d7a9a2645a9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.activemq.converter;
import java.util.List;
-import javax.jms.Message;
-import javax.jms.TextMessage;
+import jakarta.jms.Message;
+import jakarta.jms.TextMessage;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index f7b974e809d..2de4e69142a 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.amqp;
import java.util.Map;
import java.util.Set;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
index 4603c692265..bfb8e80bb98 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.amqp;
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
import org.apache.camel.component.jms.JmsConfiguration;
import org.apache.camel.spi.UriParam;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
index 763670872ed..cfd3096ac09 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.amqp;
import java.util.Map;
-import javax.jms.Message;
+import jakarta.jms.Message;
import org.apache.camel.Exchange;
import org.apache.camel.component.jms.JmsBinding;
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 21079ac5aa3..1f9d332bb0b 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.amqp;
import java.util.function.Consumer;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
index 030fffe0811..f1e8c5aab35 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.atmosphere.websocket;
import java.io.IOException;
import java.util.Map;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.component.servlet.CamelHttpTransportServlet;
import org.apache.camel.http.common.HttpConsumer;
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
index db108011a59..ee0d6586fc5 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
@@ -21,10 +21,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
index 944fa4f7187..26f5eea893c 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
@@ -21,9 +21,9 @@ import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.io.FileUtils;
diff --git a/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java b/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
index d191b572134..8d3b4f6aa6e 100644
--- a/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
+++ b/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
@@ -41,7 +41,7 @@ public final class AttachmentConverterLoader implements TypeConverterLoader, Cam
}
private void registerConverters(TypeConverterRegistry registry) {
- addTypeConverter(registry, javax.activation.DataHandler.class, org.apache.camel.attachment.Attachment.class, false,
+ addTypeConverter(registry, jakarta.activation.DataHandler.class, org.apache.camel.attachment.Attachment.class, false,
(type, exchange, value) -> org.apache.camel.attachment.AttachmentConverter.toDataHandler((org.apache.camel.attachment.Attachment) value));
addTypeConverter(registry, org.apache.camel.attachment.AttachmentMessage.class, org.apache.camel.Message.class, false,
(type, exchange, value) -> org.apache.camel.attachment.AttachmentConverter.toAttachmentMessage((org.apache.camel.Message) value));
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
index 1584092035a..7bf419dace9 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
@@ -19,7 +19,7 @@ package org.apache.camel.attachment;
import java.util.Collection;
import java.util.List;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import org.apache.camel.Message;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
index 3d395a64070..d4ff827c44b 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.attachment;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import org.apache.camel.Converter;
import org.apache.camel.Message;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
index 1a13007e570..b97461a09c3 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
@@ -19,12 +19,12 @@ package org.apache.camel.attachment;
import java.util.Map;
import java.util.Set;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import org.apache.camel.Message;
/**
- * Extended {@link Message} for Java Attachment Support (with javax.activation).
+ * Extended {@link Message} for Java Attachment Support (with jakarta.activation).
*/
public interface AttachmentMessage extends Message {
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
index edde8cbc06c..1f26d9d6db7 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
import java.io.File;
-import javax.activation.FileDataSource;
-import javax.activation.FileTypeMap;
+import jakarta.activation.FileDataSource;
+import jakarta.activation.FileTypeMap;
public class CamelFileDataSource extends FileDataSource {
private final String fileName;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
index e55d1291d06..b1490975e38 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
import org.apache.camel.util.CollectionHelper;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
index 0d3e5416257..37f6c2ba202 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
@@ -21,7 +21,7 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import org.apache.camel.Exchange;
import org.apache.camel.ExtendedExchange;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
index c58cdbb9428..ac4e285902b 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.attachment;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
index 67bb0f7b9ad..01ad2464728 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
import java.net.URL;
-import javax.activation.DataHandler;
-import javax.activation.URLDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.URLDataSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
index 2519b09bdf0..65fbd740989 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
import java.io.File;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
index 5e8167ae14b..6d0aa8f18bd 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.attachment;
import java.io.File;
import java.util.Iterator;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
index 6bc9501c3ee..cb1f0376483 100644
--- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
+++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
@@ -58,7 +58,7 @@ public class Ses2Producer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
- if (!(exchange.getIn().getBody() instanceof javax.mail.Message)) {
+ if (!(exchange.getIn().getBody() instanceof jakarta.mail.Message)) {
SendEmailRequest request = createMailRequest(exchange);
LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
SendEmailResponse result = getEndpoint().getSESClient().sendEmail(request);
@@ -112,7 +112,7 @@ public class Ses2Producer extends DefaultProducer {
private software.amazon.awssdk.services.ses.model.RawMessage createRawMessage(Exchange exchange) throws Exception {
software.amazon.awssdk.services.ses.model.RawMessage.Builder message
= software.amazon.awssdk.services.ses.model.RawMessage.builder();
- javax.mail.Message content = exchange.getIn().getBody(javax.mail.Message.class);
+ jakarta.mail.Message content = exchange.getIn().getBody(jakarta.mail.Message.class);
OutputStream byteOutput = new ByteArrayOutputStream();
try {
content.writeTo(byteOutput);
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
index e82e3e50012..147b4fb12ec 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
@@ -21,12 +21,12 @@ import java.io.OutputStream;
import java.util.Date;
import java.util.Enumeration;
-import javax.activation.DataHandler;
-import javax.mail.Address;
-import javax.mail.Flags;
-import javax.mail.Header;
-import javax.mail.Message;
-import javax.mail.Multipart;
+import jakarta.activation.DataHandler;
+import jakarta.mail.Address;
+import jakarta.mail.Flags;
+import jakarta.mail.Header;
+import jakarta.mail.Message;
+import jakarta.mail.Multipart;
public class MockMessage extends Message {
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
index b794d832414..007a882e54e 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
@@ -24,19 +24,19 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
case "autowiredenabled":
case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
case "constraintvalidatorfactory":
- case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, javax.validation.ConstraintValidatorFactory.class, value)); return true;
+ case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, jakarta.validation.ConstraintValidatorFactory.class, value)); return true;
case "ignorexmlconfiguration":
case "ignoreXmlConfiguration": target.setIgnoreXmlConfiguration(property(camelContext, boolean.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
case "messageinterpolator":
- case "messageInterpolator": target.setMessageInterpolator(property(camelContext, javax.validation.MessageInterpolator.class, value)); return true;
+ case "messageInterpolator": target.setMessageInterpolator(property(camelContext, jakarta.validation.MessageInterpolator.class, value)); return true;
case "traversableresolver":
- case "traversableResolver": target.setTraversableResolver(property(camelContext, javax.validation.TraversableResolver.class, value)); return true;
+ case "traversableResolver": target.setTraversableResolver(property(camelContext, jakarta.validation.TraversableResolver.class, value)); return true;
case "validationproviderresolver":
- case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, javax.validation.ValidationProviderResolver.class, value)); return true;
+ case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, jakarta.validation.ValidationProviderResolver.class, value)); return true;
case "validatorfactory":
- case "validatorFactory": target.setValidatorFactory(property(camelContext, javax.validation.ValidatorFactory.class, value)); return true;
+ case "validatorFactory": target.setValidatorFactory(property(camelContext, jakarta.validation.ValidatorFactory.class, value)); return true;
default: return false;
}
}
@@ -52,19 +52,19 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
case "autowiredenabled":
case "autowiredEnabled": return boolean.class;
case "constraintvalidatorfactory":
- case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+ case "constraintValidatorFactory": return jakarta.validation.ConstraintValidatorFactory.class;
case "ignorexmlconfiguration":
case "ignoreXmlConfiguration": return boolean.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
case "messageinterpolator":
- case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+ case "messageInterpolator": return jakarta.validation.MessageInterpolator.class;
case "traversableresolver":
- case "traversableResolver": return javax.validation.TraversableResolver.class;
+ case "traversableResolver": return jakarta.validation.TraversableResolver.class;
case "validationproviderresolver":
- case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+ case "validationProviderResolver": return jakarta.validation.ValidationProviderResolver.class;
case "validatorfactory":
- case "validatorFactory": return javax.validation.ValidatorFactory.class;
+ case "validatorFactory": return jakarta.validation.ValidatorFactory.class;
default: return null;
}
}
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
index 0eb6d696348..09ce0db0de3 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
@@ -22,20 +22,20 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
BeanValidatorEndpoint target = (BeanValidatorEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
case "constraintvalidatorfactory":
- case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, javax.validation.ConstraintValidatorFactory.class, value)); return true;
+ case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, jakarta.validation.ConstraintValidatorFactory.class, value)); return true;
case "group": target.setGroup(property(camelContext, java.lang.String.class, value)); return true;
case "ignorexmlconfiguration":
case "ignoreXmlConfiguration": target.setIgnoreXmlConfiguration(property(camelContext, boolean.class, value)); return true;
case "lazystartproducer":
case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
case "messageinterpolator":
- case "messageInterpolator": target.setMessageInterpolator(property(camelContext, javax.validation.MessageInterpolator.class, value)); return true;
+ case "messageInterpolator": target.setMessageInterpolator(property(camelContext, jakarta.validation.MessageInterpolator.class, value)); return true;
case "traversableresolver":
- case "traversableResolver": target.setTraversableResolver(property(camelContext, javax.validation.TraversableResolver.class, value)); return true;
+ case "traversableResolver": target.setTraversableResolver(property(camelContext, jakarta.validation.TraversableResolver.class, value)); return true;
case "validationproviderresolver":
- case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, javax.validation.ValidationProviderResolver.class, value)); return true;
+ case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, jakarta.validation.ValidationProviderResolver.class, value)); return true;
case "validatorfactory":
- case "validatorFactory": target.setValidatorFactory(property(camelContext, javax.validation.ValidatorFactory.class, value)); return true;
+ case "validatorFactory": target.setValidatorFactory(property(camelContext, jakarta.validation.ValidatorFactory.class, value)); return true;
default: return false;
}
}
@@ -44,20 +44,20 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
public Class<?> getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
case "constraintvalidatorfactory":
- case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+ case "constraintValidatorFactory": return jakarta.validation.ConstraintValidatorFactory.class;
case "group": return java.lang.String.class;
case "ignorexmlconfiguration":
case "ignoreXmlConfiguration": return boolean.class;
case "lazystartproducer":
case "lazyStartProducer": return boolean.class;
case "messageinterpolator":
- case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+ case "messageInterpolator": return jakarta.validation.MessageInterpolator.class;
case "traversableresolver":
- case "traversableResolver": return javax.validation.TraversableResolver.class;
+ case "traversableResolver": return jakarta.validation.TraversableResolver.class;
case "validationproviderresolver":
- case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+ case "validationProviderResolver": return jakarta.validation.ValidationProviderResolver.class;
case "validatorfactory":
- case "validatorFactory": return javax.validation.ValidatorFactory.class;
+ case "validatorFactory": return jakarta.validation.ValidatorFactory.class;
default: return null;
}
}
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
index 68b1c58a59d..3df4f1a890e 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.validator;
import java.util.Set;
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
import org.apache.camel.Exchange;
import org.apache.camel.ValidationException;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index 5e37cbff255..ea44fcd57fd 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -18,11 +18,11 @@ package org.apache.camel.component.bean.validator;
import java.util.Map;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Metadata;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
index 46109559c9a..188010af77a 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
import org.apache.camel.Category;
import org.apache.camel.Component;
@@ -47,7 +47,7 @@ public class BeanValidatorEndpoint extends DefaultEndpoint {
@UriPath(description = "Where label is an arbitrary text value describing the endpoint")
@Metadata(required = true)
private String label;
- @UriParam(defaultValue = "javax.validation.groups.Default")
+ @UriParam(defaultValue = "jakarta.validation.groups.Default")
private String group;
@UriParam
private boolean ignoreXmlConfiguration;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
index f5f736197b7..7ad8f60ba28 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.bean.validator;
import java.util.HashSet;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidatorFactory;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
index df0a33bb24a..0751b0f57cf 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.validator;
import java.util.List;
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
import org.hibernate.validator.HibernateValidator;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
index ee4cea7a991..b78a00094d6 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
import org.apache.camel.CamelContext;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
index 65e238252c8..b088f8ec751 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
@@ -16,20 +16,20 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.Configuration;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.Validation;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Configuration;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
import org.apache.camel.CamelContext;
import org.apache.camel.support.CamelContextHelper;
/**
- * Utility class dedicated to create new {@code javax.validation.ValidatorFactory} instances.
+ * Utility class dedicated to create new {@code jakarta.validation.ValidatorFactory} instances.
*/
public final class ValidatorFactories {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index 16f741319b2..c3d8beda559 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.bean.validator;
import java.lang.annotation.ElementType;
import java.util.Locale;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.Path;
-import javax.validation.Path.Node;
-import javax.validation.TraversableResolver;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Path;
+import jakarta.validation.Path.Node;
+import jakarta.validation.TraversableResolver;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
index d0fb2db3bef..cdfb0036a37 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
@@ -21,7 +21,7 @@ import java.util.Locale;
import java.util.Set;
import java.util.stream.Stream;
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
@@ -74,7 +74,7 @@ class BeanValidatorRouteTest extends CamelTestSupport {
@MethodSource("provideValidCars")
void validateShouldSuccessWithExpliciteDefaultGroup(Object cars) {
- Exchange exchange = template.request("bean-validator://x?group=javax.validation.groups.Default", new Processor() {
+ Exchange exchange = template.request("bean-validator://x?group=jakarta.validation.groups.Default", new Processor() {
public void process(Exchange exchange) {
exchange.getIn().setBody(cars);
}
@@ -121,7 +121,7 @@ class BeanValidatorRouteTest extends CamelTestSupport {
@MethodSource("provideInvalidCarsWithoutLicensePlate")
void validateShouldFailWithExpliciteDefaultGroup(Object cars, int numberOfViolations) {
- final String url = "bean-validator://x?group=javax.validation.groups.Default";
+ final String url = "bean-validator://x?group=jakarta.validation.groups.Default";
try {
template.requestBody(url, cars);
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
index 97dd1891cf9..ea5ced43f48 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
public class CarWithAnnotations implements Car {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
index 10e450e8fa0..f9dcfa759d9 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.GroupSequence;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
@GroupSequence({ CarWithRedefinedDefaultGroup.class, OptionalChecks.class })
public class CarWithRedefinedDefaultGroup implements Car {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
index ce0c2064e19..7fce18c0512 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.bean.validator;
import java.util.List;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.spi.ValidationProvider;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.spi.ValidationProvider;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
index 0f49882b72a..0f6b4c8e482 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
index df7fd2b3f98..2a5793aae0a 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.GroupSequence;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.groups.Default;
@GroupSequence({ Default.class, OptionalChecks.class })
public interface OrderedChecks {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
index 161a5938b36..ed070a10fb9 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
index dc2808ba716..798072b0baa 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.bean.validator;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
index b76e8a8e0e2..7f85c30fa31 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.bonita.api.model.CaseCreationResponse;
@@ -31,7 +31,7 @@ import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
import org.apache.camel.component.bonita.api.util.BonitaAPIUtil;
import org.apache.camel.util.ObjectHelper;
-import static javax.ws.rs.client.Entity.entity;
+import static jakarta.ws.rs.client.Entity.entity;
public class BonitaAPI {
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
index 311d77c10c3..4e0109b779d 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.bonita.api;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
index 4160aeac283..25fef8c7b05 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
@@ -20,17 +20,17 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Map;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
index 9acc24766da..78467f91afc 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.bonita.api.filter;
import java.io.IOException;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientResponseContext;
+import jakarta.ws.rs.client.ClientResponseFilter;
public class JsonClientFilter implements ClientResponseFilter {
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
index 8761ac54044..e1f08051e36 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
@@ -25,10 +25,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
@@ -40,7 +40,7 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.AttachmentBuilder;
import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
-import static javax.ws.rs.client.Entity.entity;
+import static jakarta.ws.rs.client.Entity.entity;
public class BonitaAPIUtil {
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
index b2a75f5f582..c8950b69610 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
index d272c3eb385..57bc0aefeb1 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.bonita.api;
import java.util.HashMap;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.MultivaluedHashMap;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
index 2df382c2cf7..4cb9a722c16 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.bonita.api;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
index d6af7fa04ef..0fb5dc332b8 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("PROPAGATION_MANDATORY")
public class MandatoryJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
index 7c8394eda4a..6064b161b79 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
index 0f9fa6caf87..29eb28d92d9 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("PROPAGATION_NEVER")
public class NeverJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
index 0d5ea37ee39..ce541706427 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
@Named("PROPAGATION_NOT_SUPPORTED")
public class NotSupportedJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
index f0bced3087a..cf1ffdbb0ca 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("PROPAGATION_REQUIRED")
public class RequiredJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
index e9d763826d8..90b550d462b 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
@Named("PROPAGATION_REQUIRES_NEW")
public class RequiresNewJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
index 74bf7e52bca..541281e7a82 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.transaction;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("PROPAGATION_SUPPORTS")
public class SupportsJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
index 2f571354d55..388bf8acd13 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
@@ -21,13 +21,13 @@ import java.util.stream.Stream;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
import org.apache.camel.CamelException;
import org.apache.camel.jta.JtaTransactionPolicy;
diff --git a/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java b/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
index bfb8b21d9e3..05806922c2e 100644
--- a/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
+++ b/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
@@ -19,13 +19,13 @@ package org.apache.camel.cdi;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.context.control.RequestContextController;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.control.RequestContextController;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.UnsatisfiedResolutionException;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
index 0ae285a2dde..d670ea9327f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
@@ -21,8 +21,8 @@ import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Annotated;
import static java.util.stream.Collectors.toSet;
import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
index 6518ec40512..759fa064780 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
@@ -20,9 +20,9 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.util.Set;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedType;
@Vetoed
class AnnotatedMemberDelegate<T> extends AnnotatedDelegate implements AnnotatedMember<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
index 72d16a293db..3aa76ae0fd9 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
@@ -21,9 +21,9 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
@Vetoed
final class AnnotatedMethodDelegate<T> extends AnnotatedMemberDelegate<T> implements AnnotatedMethod<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
index 1a469a41f87..1fe8406df4e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
@@ -19,11 +19,11 @@ package org.apache.camel.cdi;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
@Vetoed
final class AnnotatedTypeDelegate<T> extends AnnotatedDelegate implements AnnotatedType<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
index 5e707ad2d32..5b316958d59 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
@Vetoed
final class ApplicationScopedLiteral extends AnnotationLiteral<ApplicationScoped> implements ApplicationScoped {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index 4111b2861fb..68dfff82528 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -22,10 +22,10 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
@Vetoed
final class BeanDelegate<T> implements Bean<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
index 1609607fde2..22d663920ed 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Annotation;
import java.util.Optional;
import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import static java.util.stream.Collectors.toSet;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
index e9eb003d42c..58eb1db8450 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
@Vetoed
final class CamelBeanInjectionTarget<T> extends DelegateInjectionTarget<T> implements InjectionTarget<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
index b3e7db9e88d..bdcd705ac06 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.camel.CamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
index 68b19581c68..f960e2340f3 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
@@ -19,17 +19,17 @@ package org.apache.camel.cdi;
import java.lang.annotation.Annotation;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Producer;
-import javax.inject.Named;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index 2d5839a8225..909976e22c2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
index 8fc7cc0a3dd..0009a1aae70 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.spi.BeanRepository;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
index 1cef27f786f..0a6bd999649 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
@Vetoed
/* package-private */ final class CdiCamelConfigurationEvent implements CdiCamelConfiguration {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
index f6f76418ea4..9d009032f05 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
import org.apache.camel.CamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 0953d9de5f8..3714418bd95 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -29,30 +29,30 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.stream.Stream;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessObserverMethod;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.ProcessProducerField;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
-import javax.enterprise.inject.spi.configurator.BeanConfigurator;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.ProcessProducerField;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
+import jakarta.inject.Named;
import org.apache.camel.BeanInject;
import org.apache.camel.CamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
index 1abad3988c5..68861635040 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
@@ -23,13 +23,13 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Optional;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
index c6f741ad664..a9c610d41bc 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
@@ -19,8 +19,8 @@ package org.apache.camel.cdi;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Injector;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
index ef2cf111b59..0a182513322 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi;
import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import org.apache.camel.Endpoint;
import org.apache.camel.support.DefaultComponent;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
index 82f83743675..c3746008ca8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
import org.apache.camel.Exchange;
import org.apache.camel.ExtendedExchange;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index ef5d5c5e3a3..c42793df9c8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -26,13 +26,13 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Stream;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Inject;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Inject;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
@@ -89,7 +89,7 @@ import static java.util.stream.Collectors.joining;
* </code>
* </pre>
*/
-@javax.enterprise.inject.Vetoed
+@jakarta.enterprise.inject.Vetoed
public final class CdiEventEndpoint<T> extends DefaultEndpoint {
private final List<CdiEventConsumer<T>> consumers = new ArrayList<>();
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
index f3d7dfe62b0..29ed0d13263 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
@@ -22,8 +22,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.RouteEvent;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
index 6c5ea8b31ec..00d1919f60f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Vetoed;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
index 0ebaf867463..beb03b9a56c 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
@@ -34,17 +34,17 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.Nonbinding;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
index bcd343a8b49..577d13f5b50 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
abstract class DelegateInjectionTarget<T> extends DelegateProducer<T> implements InjectionTarget<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
index 2d8168c47eb..842e0fbdafe 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
abstract class DelegateProducer<T> implements Producer<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
index 32a9e2bf5a3..19aaa08d0b1 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
index 6767d7553b0..29f75e92688 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
@@ -20,10 +20,10 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.event.Reception;
+import jakarta.enterprise.event.TransactionPhase;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.ObserverMethod;
import org.apache.camel.CamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
index 260df7b9456..430dc8a88a4 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Default;
+import jakarta.enterprise.inject.Default;
/**
* Indicates one or more resources representing
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
index 08ead2c1be3..207c7c3ad15 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
@@ -20,7 +20,7 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.List;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
@Vetoed
final class ListParameterizedType implements ParameterizedType {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
index 71a3d367c73..9ea781b7e13 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Named;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Named;
@Vetoed
final class NamedLiteral extends AnnotationLiteral<Named> implements Named {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
index 7c7564df17b..670be257359 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
/**
* Can be replaced by an observer: {@code void onStart(@Observes @Initialized(ApplicationScoped) Object start)}.
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
index f7cf017a718..96c138ff37f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Annotated;
import static java.util.Arrays.asList;
import static java.util.Collections.unmodifiableSet;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
index c2839021d03..825317bb811 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
@@ -21,15 +21,15 @@ import java.util.Set;
import java.util.StringJoiner;
import java.util.function.Function;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.CreationException;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.CreationException;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import static org.apache.camel.cdi.CdiSpiHelper.createBeanId;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
index 7eae85aaa41..7a1d3581915 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
@@ -20,10 +20,10 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Named;
import static java.util.Collections.emptySet;
import static java.util.stream.Collectors.toSet;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
index 852c134c35d..96a945b7f2c 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
@@ -21,9 +21,9 @@ import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
@Vetoed
class SyntheticInjectionTarget<T> implements InjectionTarget<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
index 9cb5494b54a..fc563031dbd 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
@@ -21,9 +21,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
/**
* A CDI qualifier to define the <a href="http://camel.apache.org/uris.html">Camel URI</a> associated to the annotated
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
index fe04274d566..f2654165e56 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
index 3d7917573f1..ae0be596029 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
index d690134560f..199b1e3f384 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.Body;
import org.apache.camel.Consume;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
index 9d54efe463e..1c9af419879 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.cdi.bean;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.cdi.CdiCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
index 66040ecfa6b..ccdcbbf0fe6 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
index 8beeb10b162..ddc56ad71ad 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
index 288ab88ea89..c48b3d26e29 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
index d8a4eb3f971..b08a02db8ff 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
index 48d77a43f2e..1a5a5f15b26 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
index 0c21c26473d..85c4ea8ced5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
index 876059c12d4..0fee018e5cb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
index be2e72f54ba..e71a9b2e033 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.pojo.TypeConverterOutput;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
index 6d85c68ba39..e0f54db7d22 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
index abafe7aea08..ccc8d140e51 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
index 15a4a0986e5..981debf4c02 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
index f2f9eec40e9..26f2a3395fa 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
index 9f1e9a97671..cbd59f35425 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
index 9f105bb576f..9faccefbede 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
index e0ed2268b22..5162f41ec23 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
index 010e7700ed0..9b76e3da2ea 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi.bean;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
index b9d3ac4e07f..0417790fc7f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
index f86bb407b48..ef04e1695bb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("beanName")
public class NamedCamelBean {
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
index 48ebacadf7c..1c58c1cefde 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
@@ -19,7 +19,7 @@ package org.apache.camel.cdi.bean;
import java.util.Arrays;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.Consume;
import org.apache.camel.RecipientList;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
index e7299a77b14..39372fabfc1 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi.bean;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
index ec6b8eeeac2..77edaa6df96 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.pojo.TypeConverterOutput;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
index 6875e97cfb3..e4d6041a58d 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
index cb62b02fb42..140841e5872 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
index 960853aac73..0a3802c71cf 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
index 6bb964280e1..b5fa0c6aa7a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
index 15beaf48e8f..81b15fcd746 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
index 3bc2b5c0320..eb3c5618af8 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.bean;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
index 8c0b348ea69..a4fd1f1176a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.converter;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.Converter;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
index ff35f1864ca..7dd5cddd6a5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
index 5df8a8065b0..d7a41d679ac 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
index adf176fbbe0..e662165c178 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
index 720b4fe70c2..c1490bb5b10 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.routetemplate;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.CamelEvent;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
index c93013cdc35..869942d3141 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.routetemplate;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
index b5e6b16b821..ccd77b8bea4 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.templatedroute;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
index c99f7d65950..f342147839c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
index 7514d092ecf..7cbe6756f38 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.AdviceWith;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
index 2fc33d9d7bd..efe65d06dbb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
import java.util.Properties;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.cdi.CdiCamelExtension;
import org.apache.camel.cdi.bean.BeanInjectBean;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
index 656f6ea5100..74e807e4744 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.cdi.test;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
index 32582888336..9d907f877ea 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.cdi.CdiCamelExtension;
import org.apache.camel.cdi.bean.CamelContextAwareBean;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
index 4d9c210d10c..0a55ca67cab 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
index 311d67c5b46..8bd4abf8e54 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
index b4ed2ad87b1..a87d494df09 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.EventObject;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index 7b0a913a52c..fbc9d8e1522 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -20,10 +20,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
index e25e9ef38ad..30bd2d057d3 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
index c7c343858e8..521c561f87c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.test;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelConfiguration;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
index e8186e84195..e876b298f41 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
index 3b1337a75e5..2cc802237f2 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
index 4036093b6d1..43f055e4ef5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
index 74c3975dd03..ce3621179cb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
index c6613b74afa..b4d1d4e64a3 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
index fa0844ef492..efea67bc0ac 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
index 3931e8ddd54..2dd5bd3ea43 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
index 6b98fe31301..b5b5ce913ca 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
index 3e2070f15d3..c292c4a4958 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.cdi.test;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
index e30914bddab..c3dfb84fc2b 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
@@ -20,12 +20,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
index 54f891475e0..72a1c07688f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
index 821ce5f3f02..bba3351f969 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
index 1cce06ed6f0..83bbdda331e 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.test;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
index 43595619f11..09b63fb0bc9 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
index 93ba06a7a9f..0a8ac65404f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
index a8a5545149f..90cc36fec54 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.cdi.test;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
index 2e14383b3e7..0ace791807a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi.test;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
index 063cd1a9fd4..da993b6da35 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
import java.util.Set;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
index a9fe9866fbb..38704fdbcf0 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
index 32bcfd038aa..9db8ea6abd4 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.cdi.test;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
index 7bac2e55c07..2e0e3109d2c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
index a41c79b2c20..38eb7e510b9 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.test;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
index bf655109611..75674d6a818 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.Endpoint;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
index 0ffdbb55ba5..3762f56df18 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
index ddd1d9d24f4..1212f77354f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
index eb15a250557..6c05fc2621e 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi.test;
import java.util.Properties;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
index d71c61ed3d8..f5b42d31c43 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
index febdc78e2b9..5306ca2e91f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
index 637bb583611..f36dc1cfb80 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
index 3ff1ddd021a..0333ff03005 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
index f81d2355005..8fff717ad61 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.Endpoint;
import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
index 76e0a87fbd4..47e9b227fb2 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.cdi.test;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
index 55cd3239bc3..f13cdb8728f 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cm;
import java.util.Map;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
index d5091845636..576ec928df1 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.cm;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
index f6b4684ce02..9a28f0572cd 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cm;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadRuntimeException;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
index dfbda1f6b94..2918918dc9e 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.cm.client;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
import org.apache.camel.component.cm.validation.constraints.E164;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
index 79e3124228e..2eaa6aca77c 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
@@ -22,8 +22,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
@Target({
ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER,
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
index cdc4293c60d..695ea5a2791 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cm.validation.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
index 2b0082887dc..a85dfb72dd5 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.cm.test;
import java.util.Set;
import java.util.UUID;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
import org.apache.camel.component.cm.CMConfiguration;
import org.apache.camel.test.spring.junit5.CamelSpringTest;
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
index af880c19340..f44173f3e5a 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cm.test;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index e256d623515..12f5338d5d3 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.DispatcherType;
+import jakarta.servlet.DispatcherType;
import org.apache.camel.Endpoint;
import org.apache.camel.SSLContextParametersAware;
diff --git a/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java b/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
index 993c8b54973..791c8a542e1 100644
--- a/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
+++ b/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
@@ -42,12 +42,12 @@ public final class CxfConverterLoader implements TypeConverterLoader, CamelConte
}
private void registerConverters(TypeConverterRegistry registry) {
- addTypeConverter(registry, java.io.InputStream.class, javax.xml.soap.SOAPMessage.class, false,
- (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToInputStream((javax.xml.soap.SOAPMessage) value, exchange));
+ addTypeConverter(registry, java.io.InputStream.class, jakarta.xml.soap.SOAPMessage.class, false,
+ (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToInputStream((jakarta.xml.soap.SOAPMessage) value, exchange));
addTypeConverter(registry, java.lang.Object[].class, java.lang.Object.class, false,
(type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.toArray(value));
- addTypeConverter(registry, java.lang.String.class, javax.xml.soap.SOAPMessage.class, false,
- (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToString((javax.xml.soap.SOAPMessage) value, exchange));
+ addTypeConverter(registry, java.lang.String.class, jakarta.xml.soap.SOAPMessage.class, false,
+ (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToString((jakarta.xml.soap.SOAPMessage) value, exchange));
addTypeConverter(registry, javax.xml.namespace.QName.class, java.lang.String.class, false,
(type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.toQName((java.lang.String) value));
addTypeConverter(registry, org.apache.camel.component.cxf.common.DataFormat.class, java.lang.String.class, false,
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
index 4a3f610757f..001cedbcf6d 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
@@ -119,7 +119,7 @@ public interface CxfBinding {
/**
* <p>
- * Extract the message headers which key are start from javax.xml.ws* from the CXF exchange's inMessage, and put
+ * Extract the message headers which key are start from jakarta.xml.ws* from the CXF exchange's inMessage, and put
* these headers into the context
* </p>
*
@@ -131,7 +131,7 @@ public interface CxfBinding {
/**
* <p>
- * Copy the javax.xml.ws* headers into cxfExchange's outMessage, if the cxfExchange has no outMessage, skip this
+ * Copy the jakarta.xml.ws* headers into cxfExchange's outMessage, if the cxfExchange has no outMessage, skip this
* copy
* </p>
*
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
index 31591ba8b33..f7210e2ce15 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
@@ -99,9 +99,9 @@ public final class CxfConstants {
public static final String CAMEL_CXF_ATTACHMENTS = "CamelAttachments";
public static final String CAMEL_CXF_RS_THROW_EXCEPTION_ON_FAILURE = "CamelCxfRsThrowExceptionOnFailure";
- public static final String WSA_HEADERS_INBOUND = "javax.xml.ws.addressing.context.inbound";
+ public static final String WSA_HEADERS_INBOUND = "jakarta.xml.ws.addressing.context.inbound";
- public static final String WSA_HEADERS_OUTBOUND = "javax.xml.ws.addressing.context.outbound";
+ public static final String WSA_HEADERS_OUTBOUND = "jakarta.xml.ws.addressing.context.outbound";
public static final String CAMEL_CXF_PROTOCOL_HEADERS_MERGED = "CamelCxfProtocolHeadersMerged";
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
index db5dba3727a..3944bfeabb1 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
import java.util.Collection;
import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
index 4a6c334ae6b..a9df704eb62 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
@@ -60,7 +60,7 @@ import static org.apache.camel.util.BufferCaster.cast;
* this class is an indication of a flaw 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} interface from the Java Activation Framework.
+ * 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 read operation will
* block or not, it is not possible to provide a meaningful implementation of the {@link InputStream#available()}
diff --git a/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java b/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
index a75262a6996..a55439fe762 100644
--- a/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
+++ b/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
@@ -42,14 +42,14 @@ public final class CxfConverterLoader implements TypeConverterLoader, CamelConte
}
private void registerConverters(TypeConverterRegistry registry) {
- addTypeConverter(registry, java.io.InputStream.class, javax.ws.rs.core.Response.class, false,
- (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toInputStream((javax.ws.rs.core.Response) value, exchange));
- addTypeConverter(registry, java.io.InputStream.class, javax.xml.soap.SOAPMessage.class, false,
- (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToInputStream((javax.xml.soap.SOAPMessage) value, exchange));
+ addTypeConverter(registry, java.io.InputStream.class, jakarta.ws.rs.core.Response.class, false,
+ (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toInputStream((jakarta.ws.rs.core.Response) value, exchange));
+ addTypeConverter(registry, java.io.InputStream.class, jakarta.xml.soap.SOAPMessage.class, false,
+ (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToInputStream((jakarta.xml.soap.SOAPMessage) value, exchange));
addTypeConverter(registry, java.lang.Object[].class, java.lang.Object.class, false,
(type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toArray(value));
- addTypeConverter(registry, java.lang.String.class, javax.xml.soap.SOAPMessage.class, false,
- (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToString((javax.xml.soap.SOAPMessage) value, exchange));
+ addTypeConverter(registry, java.lang.String.class, jakarta.xml.soap.SOAPMessage.class, false,
+ (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToString((jakarta.xml.soap.SOAPMessage) value, exchange));
addTypeConverter(registry, javax.xml.namespace.QName.class, java.lang.String.class, false,
(type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toQName((java.lang.String) value));
addTypeConverter(registry, org.apache.camel.component.cxf.common.DataFormat.class, java.lang.String.class, false,
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
index 6bc8b29a1c5..ee34cb91647 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
@@ -21,10 +21,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
index ceb0269d697..d273aecee99 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import java.util.Map;
-import javax.ws.rs.client.AsyncInvoker;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.AsyncInvoker;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedMap;
import org.apache.cxf.message.Exchange;
@@ -112,7 +112,7 @@ public interface CxfRsBinding {
/**
* Bind the Camel message to a request {@link Entity} that gets passed to
- * {@link AsyncInvoker#method(java.lang.String, javax.ws.rs.client.Entity, javax.ws.rs.client.InvocationCallback)}.
+ * {@link AsyncInvoker#method(java.lang.String, jakarta.ws.rs.client.Entity, jakarta.ws.rs.client.InvocationCallback)}.
*
* @param camelMessage the source message
* @param camelExchange the Camel exchange
@@ -126,7 +126,7 @@ public interface CxfRsBinding {
/**
* Bind the Camel message to a request {@link Entity} that gets passed to
- * {@link AsyncInvoker#method(java.lang.String, javax.ws.rs.client.Entity, javax.ws.rs.client.InvocationCallback)}.
+ * {@link AsyncInvoker#method(java.lang.String, jakarta.ws.rs.client.Entity, jakarta.ws.rs.client.InvocationCallback)}.
*
* @param camelMessage the source message
* @param camelExchange the Camel exchange
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 8e8a2d8d321..0254077c98b 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -18,11 +18,11 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.camel.AsyncCallback;
import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index ae06e33ebca..9e9ca28c789 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -30,13 +30,13 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.InvocationCallback;
-import javax.ws.rs.client.ResponseProcessingException;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.InvocationCallback;
+import jakarta.ws.rs.client.ResponseProcessingException;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelExchangeException;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
index a2dbf96c121..751564f0bb0 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
@@ -24,13 +24,13 @@ import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
import org.apache.camel.spi.DataFormat;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index abf9ce60650..9970c2fcbc3 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -26,12 +26,12 @@ import java.util.Map;
import java.util.TreeMap;
import javax.security.auth.Subject;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Variant;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Variant;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
index 85138d911f2..0d6a6e06846 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.jaxrs;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.ext.DefaultMethod;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index 82bb49c1217..2be412b4c82 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -29,18 +29,18 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.MatrixParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.MatrixParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
import org.apache.camel.Message;
import org.apache.camel.attachment.AttachmentMessage;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
index fa121a36c75..e9a2b427f91 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.jaxrs;
-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.apache.camel.component.cxf.jaxrs.testbean.CustomException;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
index 0ae28986eba..171d9b38aa6 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import java.util.Map;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedMap;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
index 7d111c10d09..da32417f645 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
index 06c28bdf89b..64c316aeb3c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs;
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
index 77529efa765..94a459bd53c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
index 6c346ac1eba..382eab76ebd 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.Annotation;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
index 8df91cb1f2f..3e1fd441704 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding;
import java.io.StringWriter;
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index b30a619bf69..767019c9498 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -23,8 +23,8 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
-import javax.activation.DataHandler;
-import javax.xml.bind.JAXBContext;
+import jakarta.activation.DataHandler;
+import jakarta.xml.bind.JAXBContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
index 3a2f12fe823..8f79c6a6775 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
index 10c86f96ad2..fbbd2d071f9 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "CustomerList")
public class CustomerList {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
index 5b5eb2b5983..83451610262 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.io.InputStream;
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-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.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+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.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
index 5dc1e4f88a2..363f989ac8f 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.io.InputStream;
-import javax.activation.DataHandler;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
index 2a2d8563f6a..a7b2da9f58a 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.io.InputStream;
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-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.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+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.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
index f1c043f0eda..5b62e0d0312 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.activation.DataHandler;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
index 9b427a5085a..1ab8c5af88c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
index 3731cefdb56..69bb31724f9 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
index d7e02c90a49..b435e958fdb 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
public class VipCustomerResource {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
index e0b740c8761..f00deb6bb74 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index c30fd82dd79..ae95e743fe7 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -22,15 +22,15 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-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.QueryParam;
-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.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.common.util.StringUtils;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
index e36313746a1..652fbe70ab8 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-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.Consumes;
+import jakarta.ws.rs.GET;
+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;
// START SNIPPET: example
@Path("/customerservice/")
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
index abba335cd10..5aac219f469 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
@Path("/echoservice/")
public class EchoService {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 0ac90a8e5bc..4e67a93d787 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.testbean;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
index d363af1055e..94f26b5256d 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 5e72b235b32..7c9132244e6 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.feature;
import java.util.ArrayList;
import java.util.Collection;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
import org.apache.camel.component.cxf.interceptors.CxfMessageSoapHeaderOutInterceptor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
index 3d227085777..e548632ac11 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.interceptors;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
index d81bcebb997..27cf41bf46b 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.ws.WebFault;
+import jakarta.xml.ws.WebFault;
import org.w3c.dom.Element;
@@ -297,7 +297,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
}
// bind the CXF request into a Camel exchange
binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange);
- // extract the javax.xml.ws header
+ // extract the jakarta.xml.ws header
Map<String, Object> context = new HashMap<>();
binding.extractJaxWsContext(cxfExchange, context);
// put the context into camelExchange
@@ -326,7 +326,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
// check failure again as fault could be discovered by converter
checkFailure(camelExchange, cxfExchange);
- // copy the headers javax.xml.ws header back
+ // copy the headers jakarta.xml.ws header back
binding.copyJaxWsContext(cxfExchange, (Map<String, Object>) camelExchange.getProperty(CxfConstants.JAXWS_CONTEXT));
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
index b7bcadfa0c8..fbdc5a02d53 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
@@ -39,9 +39,9 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stax.StAXSource;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.handler.Handler;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.handler.Handler;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
index dff7a9d8020..331c3a2b31f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.jaxws;
import java.lang.annotation.Annotation;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.WebServiceProvider;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
index 4ca7d58ba57..576385a63dd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.TreeMap;
import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.handler.MessageContext.Scope;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.handler.MessageContext.Scope;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
index 0d5abb73da3..b84e01f2324 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
@@ -34,13 +34,13 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import javax.security.auth.Subject;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -1069,7 +1069,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
public void extractJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, Map<String, Object> context) {
org.apache.cxf.message.Message inMessage = cxfExchange.getInMessage();
for (Map.Entry<String, Object> entry : inMessage.entrySet()) {
- if (entry.getKey().startsWith("javax.xml.ws")) {
+ if (entry.getKey().startsWith("jakarta.xml.ws")) {
context.put(entry.getKey(), entry.getValue());
}
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
index 891c49c9f5f..3ce6657e23d 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
@@ -18,12 +18,12 @@
package org.apache.camel.component.cxf.jaxws;
import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider(targetNamespace = "http://camel.apache.org/cxf/jaxws/provider")
-@ServiceMode(value = javax.xml.ws.Service.Mode.PAYLOAD)
+@ServiceMode(value = jakarta.xml.ws.Service.Mode.PAYLOAD)
public interface DefaultPayloadProviderSEI extends Provider<Source> {
@Override
Source invoke(Source request);
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
index afdb80e3b3c..0e1738d029c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.cxf.jaxws;
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
+import jakarta.jws.Oneway;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.jws.soap.SOAPBinding.ParameterStyle;
/**
* A Default Service Endpoint Interface (aka serviceClass) to be used if neither explicit serviceClass and WSDL is
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
index 81c8c6a837c..c4fd80dbd72 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
@@ -21,7 +21,7 @@ import java.util.Map;
import javax.wsdl.Definition;
import javax.wsdl.Service;
import javax.xml.namespace.QName;
-import javax.xml.ws.Provider;
+import jakarta.xml.ws.Provider;
import org.apache.camel.RuntimeCamelException;
import org.apache.cxf.endpoint.Endpoint;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
index 33807c19a57..0e6b3a16667 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.holder;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
index 88f4ed092cc..c822d8e765f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.cxf.holder;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.RequestWrapper;
@WebService
@XmlSeeAlso({ MyOrderType.class })
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
index 653b8cfe1e0..50eb14d27aa 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.cxf.holder;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD)
public class MyOrderType {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
index cab697f24c2..018e96c793a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.holder;
import java.util.List;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
index c2e4655acda..e9c016abd42 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
index 8f9b8d36761..3b876ab8cd3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxws;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.wsdl_first.PersonImpl12;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
index da63f15cbfc..1daae3a5eb8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
index 34754b33eee..e83b1ea03c6 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxws;
import java.io.StringReader;
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
index b65f67578c3..3903acc28fd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
@@ -20,8 +20,8 @@ import java.io.StringReader;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
index 294310648a6..9e6410db8cd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
index e3ad85b2b4d..e1dc999ed1e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
index 732f00aefa2..dec9a492b84 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.jaxws;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Endpoint;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
index e721024fa09..56d7851f0e2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
index 61fa96ae68e..9cea54eac56 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxws;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
index 05064803d7c..3205c39b0c2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
index 0a7479fd4ac..f7629b6fc79 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.jaxws;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
index 70e539a3bde..a7707519d60 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.w3c.dom.Document;
@@ -159,7 +159,7 @@ public class CxfProducerTest {
Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertEquals("{http://apache.org/hello_world_soap_http}greetMe",
- responseContext.get("javax.xml.ws.wsdl.operation").toString(), "Get the wrong wsdl operation name");
+ responseContext.get("jakarta.xml.ws.wsdl.operation").toString(), "Get the wrong wsdl operation name");
assertEquals("Hello " + TEST_MESSAGE, result, "reply body on Camel");
// check the other camel header copying
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
index 5a6650a2c96..cb3b6b471b9 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPFaultException;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPFaultException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
index 5944512d1b9..8a74a2a22c8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
index ede951c5a45..e338f1b148a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxws;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface EchoService {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
index 10b82c05916..f649a7b059c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.cxf.jaxws;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpSession;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.handler.MessageContext;
public class EchoServiceSessionImpl implements EchoService {
@@ -31,7 +31,7 @@ public class EchoServiceSessionImpl implements EchoService {
public String echo(String text) {
// Find the HttpSession
MessageContext mc = context.getMessageContext();
- HttpSession session = ((javax.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+ HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
if (session == null) {
throw new WebServiceException("No HTTP Session found");
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
index 9c367da45e3..915fdfe1c2e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxws;
import java.util.List;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
index 0e2ce5163cd..61834a514b5 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
@@ -17,10 +17,10 @@
package org.apache.camel.component.cxf.jaxws;
import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service.Mode;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service.Mode;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider
@ServiceMode(Mode.PAYLOAD)
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
index c867647f5b8..e4b679070be 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.cxf.jaxws;
-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.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider(portName = "SoapProviderPort", serviceName = "SOAPProviderService",
targetNamespace = "http://apache.org/hello_world_soap_http",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java
index 44c45ca0124..7d66ac24cbb 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
import java.io.InputStream;
import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPMessage;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
index a7004d69fd1..6953894eedd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.cxf.multipart;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.cxf.multipart.MultiPartInvoke;
import org.apache.camel.cxf.multipart.types.InE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@javax.jws.WebService(
+@jakarta.jws.WebService(
serviceName = "MultiPartInvokeService",
portName = "MultiPartInvokePort",
targetNamespace = "http://adapter.ti.tongtech.com/ws",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
index 85e8699ad1f..2f86b54ba2f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.noparam;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index e4558338d83..c69dd4d100f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -19,14 +19,14 @@ package org.apache.camel.component.cxf.soap.headers;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Resource;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.annotation.Resource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.handler.MessageContext;
import org.w3c.dom.Node;
@@ -37,7 +37,7 @@ import org.apache.cxf.outofband.header.OutofBandHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@javax.jws.WebService(serviceName = "HeaderService",
+@jakarta.jws.WebService(serviceName = "HeaderService",
targetNamespace = "http://apache.org/camel/cxf/soap/headers",
endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
index 41029ec3219..7857a278182 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.cxf.soap.headers;
import java.util.List;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-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.handler.MessageContext;
import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
index 1db7e00c05f..19587bcd6e0 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.wsdl;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
index 1950ec337bb..00663b28d68 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
@@ -19,9 +19,9 @@ package org.apache.camel.wsdl_first;
import java.util.Set;
import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
public class JaxwsTestHandler implements SOAPHandler<SOAPMessageContext> {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
index 96279efe816..2dd704fd02d 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.wsdl_first;
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
@WebService(serviceName = "PersonService",
targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
index 935ca20e222..cc4727cd6b3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.wsdl_first;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(serviceName = "PersonService12",
targetNamespace = "http://camel.apache.org/wsdl-first",
endpointInterface = "org.apache.camel.wsdl_first.Person",
wsdlLocation = "classpath:/person.wsdl")
-@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
+@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
public class PersonImpl12 extends PersonImpl {
}
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
index a5f0c68578c..6daa59ecc0c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.wsdl_first;
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
@WebService(serviceName = "PersonService",
targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
index c783dc6c92a..127f45a9660 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.wsdl_first;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
/**
* Test Impl class for PersonMultiPartType port type that verifies multi part SOAP message functionality.
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 3a0cb840653..5783c627ab2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.wsdl_first;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
index fa121a36c75..e9a2b427f91 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.jaxrs;
-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.apache.camel.component.cxf.jaxrs.testbean.CustomException;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java
index 4c365185f43..90eb4fb2bc8 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java
@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
index be09745c4ea..6f1d58acb8b 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
@@ -21,16 +21,16 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import javax.servlet.ServletRequest;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.ServletRequest;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
index 006e7a1c1ff..ce4245e6ad4 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs;
import java.io.InputStream;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
index 8eb25e6827f..c366f47dd41 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
index 8df91cb1f2f..3e1fd441704 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding;
import java.io.StringWriter;
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index b30a619bf69..767019c9498 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -23,8 +23,8 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
-import javax.activation.DataHandler;
-import javax.xml.bind.JAXBContext;
+import jakarta.activation.DataHandler;
+import jakarta.xml.bind.JAXBContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
index 3a2f12fe823..8f79c6a6775 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
index 10c86f96ad2..fbbd2d071f9 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "CustomerList")
public class CustomerList {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
index 5b5eb2b5983..83451610262 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.io.InputStream;
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-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.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+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.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
index 5dc1e4f88a2..363f989ac8f 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.io.InputStream;
-import javax.activation.DataHandler;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
index 2a2d8563f6a..a7b2da9f58a 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.io.InputStream;
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-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.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+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.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
index f1c043f0eda..5b62e0d0312 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.activation.DataHandler;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
index 9b427a5085a..1ab8c5af88c 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
index 3731cefdb56..69bb31724f9 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
index d7e02c90a49..b435e958fdb 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
public class VipCustomerResource {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
index e0b740c8761..f00deb6bb74 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index c30fd82dd79..ae95e743fe7 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -22,15 +22,15 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-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.QueryParam;
-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.QueryParam;
+import jakarta.ws.rs.core.Response;
import org.apache.cxf.common.util.StringUtils;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
index e36313746a1..652fbe70ab8 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-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.Consumes;
+import jakarta.ws.rs.GET;
+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;
// START SNIPPET: example
@Path("/customerservice/")
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
index abba335cd10..5aac219f469 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
@Path("/echoservice/")
public class EchoService {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 0ac90a8e5bc..4e67a93d787 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.testbean;
import java.util.HashMap;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Order")
public class Order {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
index d363af1055e..94f26b5256d 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.jaxrs.testbean;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Product")
public class Product {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
index 0f2e2a6566b..af07bb88d9c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.cxf.spring.jaxws;
import javax.xml.namespace.QName;
-import javax.xml.ws.Provider;
+import jakarta.xml.ws.Provider;
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.common.DataFormat;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java
index e1e97b406aa..5d4d41fa846 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.spring.jaxws;
import java.lang.annotation.Annotation;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.WebServiceProvider;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
index fa712227117..1b7e9fbfe8a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.cxf;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Service;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
index 9d05802f3be..7f6aaee8f92 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceException;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java
index 5f5ba7a9298..3d1d2c17f5b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
index ce42d974a27..16d20bc6bdd 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
index 391650e82d4..d3157c7da64 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
index cb61130e19d..ffbd25f865a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
@@ -20,10 +20,10 @@ import java.net.URL;
import java.util.ResourceBundle;
import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPFaultException;
+import jakarta.xml.soap.SOAPFault;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPFaultException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
index d04354e5a93..8c63fb1ed34 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.cxf;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
index 484d3c08c16..129240dcf9b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java
index 309e2872049..d808e103cb5 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
index 85f6eb555dd..697af08a694 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java
index 84c37ba8bf8..c47318ec450 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
index 55a58c0efd4..540c3a9a6e7 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
index 9b4a862f1d5..72f4b8f75ec 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
index 05187a4290e..f4683953ac2 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.component.cxf.common.DataFormat;
import org.apache.camel.component.cxf.jaxws.CxfEndpoint;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java
index 171e06fe042..ec4e68dd669 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
index 4d989806534..79c3addc563 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
index c26b41c7adf..1216cb4c580 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
index 453c4bc17b1..d840e53427c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf;
import java.io.ByteArrayOutputStream;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Service;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java
index 90c8cf76b07..24b64442945 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java
@@ -22,8 +22,8 @@ import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java
index 18b7018b74e..85e1d5d8702 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
index 803097895bd..98b3134827e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.cxf;
import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Service;
import org.apache.camel.builder.RouteBuilder;
import org.apache.cxf.interceptor.Fault;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
index 430e6bf5fcb..7dae13bf30b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
index 75f979d524d..9913ac8c955 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
index c6f297b86b2..614b825d8fa 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
@@ -20,7 +20,7 @@ import java.lang.reflect.UndeclaredThrowableException;
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
index c87e38fca98..275df0092ce 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
@@ -20,7 +20,7 @@ import java.net.SocketTimeoutException;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
index db29e966bcf..6fa91fced38 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.wsdl_first.JaxwsTestHandler;
import org.apache.camel.wsdl_first.PersonImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
index 158710fa8d4..b9d7b4cabdc 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.wsdl_first.JaxwsTestHandler;
import org.apache.camel.wsdl_first.PersonImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
index dac31dbc3c5..412c45828fc 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.wsdl_first.PersonImpl;
import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java
index c76eaef46e1..2160744a1f0 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface EchoService {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
index d5a7c189d8d..df1709984b1 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.cxf;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpSession;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.handler.MessageContext;
public class EchoServiceSessionImpl implements EchoService {
@@ -31,7 +31,7 @@ public class EchoServiceSessionImpl implements EchoService {
public String echo(String text) {
// Find the HttpSession
MessageContext mc = context.getMessageContext();
- HttpSession session = ((javax.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+ HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
if (session == null) {
throw new WebServiceException("No HTTP Session found");
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
index b0d8a217969..9bac211cec8 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.cxf;
import java.awt.*;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingType;
+import jakarta.xml.ws.Holder;
import org.apache.camel.cxf.mtom_feature.Hello;
-@BindingType(value = javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING)
+@BindingType(value = jakarta.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING)
public class HelloImpl implements Hello {
public void detail(Holder<byte[]> photo, Holder<Image> image) {
// echo through Holder
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java
index 5d36cfbb872..46654474b96 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf;
import java.util.List;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java
index 64b6adf04e3..9db3c60981c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java
@@ -17,10 +17,10 @@
package org.apache.camel.component.cxf;
import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service.Mode;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service.Mode;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider
@ServiceMode(Mode.PAYLOAD)
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java
index 7e65cf42ad7..5b3b7af1ff5 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.cxf;
-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.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
@WebServiceProvider(portName = "SoapProviderPort", serviceName = "SOAPProviderService",
targetNamespace = "http://apache.org/hello_world_soap_http",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java
index 2d05605394b..21a21cd8f0f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf;
import java.io.InputStream;
import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPMessage;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
index 88f4ed092cc..c822d8e765f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.cxf.holder;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.RequestWrapper;
@WebService
@XmlSeeAlso({ MyOrderType.class })
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
index 653b8cfe1e0..50eb14d27aa 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.cxf.holder;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD)
public class MyOrderType {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
index cab697f24c2..018e96c793a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.holder;
import java.util.List;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
index 05d17089ab9..67ebff084b0 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.mtom;
import java.awt.*;
import java.util.List;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
index b23d14ea4de..d10ce45dba5 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.activation.DataHandler;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.mail.util.ByteArrayDataSource;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.xpath.XPathConstants;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
index b4d135c2018..2921c8ba6a2 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
@@ -22,9 +22,9 @@ import java.util.List;
import javax.imageio.ImageIO;
import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPBinding;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
index af9a2a0ab3a..19410ad12af 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
@@ -20,8 +20,8 @@ import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
-import javax.activation.DataHandler;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.mail.util.ByteArrayDataSource;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
index e64cec70524..cf58612690c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
@@ -25,16 +25,16 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.annotation.Resource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.annotation.Resource;
import javax.imageio.ImageIO;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.mail.util.ByteArrayDataSource;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.handler.MessageContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
index 18ee897773e..44c3c6893e3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
@@ -20,9 +20,9 @@ import java.awt.*;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPBinding;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
index 92d2c122723..103fefa861f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
@@ -24,13 +24,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import javax.imageio.ImageIO;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.mail.util.ByteArrayDataSource;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.soap.SOAPBinding;
import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
index 895a9e5d9c8..8a7088d64eb 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.mtom;
import java.net.URL;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.camel.cxf.mtom_feature.HelloService;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java
index 17aec6df612..dfc067f524d 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.mtom;
import java.net.URL;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.camel.cxf.mtom_feature.HelloService12;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
index a00d2a92fa1..5079164410b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
@@ -21,10 +21,10 @@ import java.awt.image.BufferedImage;
import java.net.URL;
import javax.imageio.ImageIO;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPBinding;
import org.apache.camel.CamelContext;
import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java
index 3f70e819b24..aea512d677f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.mtom;
import java.net.URL;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.camel.cxf.mtom_feature.HelloService;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
index 010408748a6..071c9266d67 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
@@ -21,7 +21,7 @@ import java.awt.image.BufferedImage;
import java.io.IOException;
import javax.imageio.ImageIO;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.cxf.mtom_feature.Hello;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
index e445baa33bf..9ecefda31c3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.mtom;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
import org.apache.camel.cxf.mtom_feature.Hello;
@@ -28,7 +28,7 @@ import org.apache.camel.cxf.mtom_feature.Hello;
@WebService(serviceName = "HelloService12")
@XmlSeeAlso({ org.apache.camel.cxf.mtom_feature.types.ObjectFactory.class })
-@javax.xml.ws.BindingType(value = javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING)
+@jakarta.xml.ws.BindingType(value = jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING)
public class HelloImpl12 extends HelloImpl implements Hello {
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
index 52a62d82484..9b310f2222b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.cxf.multipart;
import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Service;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.cxf.multipart.MultiPartInvoke;
@@ -83,8 +83,8 @@ public class CXFMultiPartTest extends CamelSpringTestSupport {
e0.setV(in0);
e1.setV(in1);
- javax.xml.ws.Holder<InE> h = new javax.xml.ws.Holder<>();
- javax.xml.ws.Holder<InE> h1 = new javax.xml.ws.Holder<>();
+ jakarta.xml.ws.Holder<InE> h = new jakarta.xml.ws.Holder<>();
+ jakarta.xml.ws.Holder<InE> h1 = new jakarta.xml.ws.Holder<>();
multiPartClient.foo(e0, e1, h, h1);
return h.value.getV() + " " + h1.value.getV();
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
index a7004d69fd1..6953894eedd 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.cxf.multipart;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.cxf.multipart.MultiPartInvoke;
import org.apache.camel.cxf.multipart.types.InE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@javax.jws.WebService(
+@jakarta.jws.WebService(
serviceName = "MultiPartInvokeService",
portName = "MultiPartInvokePort",
targetNamespace = "http://adapter.ti.tongtech.com/ws",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
index 85e8699ad1f..2f86b54ba2f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.noparam;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
index 6b333e7089c..dc91560601e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
@@ -24,15 +24,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index e4558338d83..c69dd4d100f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -19,14 +19,14 @@ package org.apache.camel.component.cxf.soap.headers;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Resource;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.annotation.Resource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.handler.MessageContext;
import org.w3c.dom.Node;
@@ -37,7 +37,7 @@ import org.apache.cxf.outofband.header.OutofBandHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@javax.jws.WebService(serviceName = "HeaderService",
+@jakarta.jws.WebService(serviceName = "HeaderService",
targetNamespace = "http://apache.org/camel/cxf/soap/headers",
endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
index 41029ec3219..7857a278182 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.cxf.soap.headers;
import java.util.List;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-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.handler.MessageContext;
import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
index 1db7e00c05f..19587bcd6e0 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cxf.wsdl;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java
index 233895c1a27..985b3b86d77 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.wsrm;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(targetNamespace = "http://camel.apache.org/cxf/wsrm")
public interface HelloWorld {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
index 2436ad2da50..f18296f3d0a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.wssecurity.camel;
import java.net.URL;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
import org.apache.camel.component.cxf.common.CXFTestSupport;
import org.apache.camel.component.cxf.wssecurity.server.CxfServer;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
index 67262f3ff4d..078c1ed2c46 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
@@ -20,7 +20,7 @@ import java.util.logging.Logger;
import org.apache.camel.hello_world_soap_http.Greeter;
-@javax.jws.WebService(serviceName = "GreeterService",
+@jakarta.jws.WebService(serviceName = "GreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.camel.hello_world_soap_http.Greeter",
targetNamespace = "http://camel.apache.org/hello_world_soap_http")
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
index 1950ec337bb..00663b28d68 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
@@ -19,9 +19,9 @@ package org.apache.camel.wsdl_first;
import java.util.Set;
import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
public class JaxwsTestHandler implements SOAPHandler<SOAPMessageContext> {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
index 96279efe816..2dd704fd02d 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.wsdl_first;
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
@WebService(serviceName = "PersonService",
targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
index 935ca20e222..cc4727cd6b3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.wsdl_first;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(serviceName = "PersonService12",
targetNamespace = "http://camel.apache.org/wsdl-first",
endpointInterface = "org.apache.camel.wsdl_first.Person",
wsdlLocation = "classpath:/person.wsdl")
-@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
+@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
public class PersonImpl12 extends PersonImpl {
}
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
index a5f0c68578c..6daa59ecc0c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.wsdl_first;
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
@WebService(serviceName = "PersonService",
targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
index c783dc6c92a..127f45a9660 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.wsdl_first;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
/**
* Test Impl class for PersonMultiPartType port type that verifies multi part SOAP message functionality.
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 3a0cb840653..5783c627ab2 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.wsdl_first;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
index fc009501a70..e63bdaa5598 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Collections;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.component.cxf.transport.CamelTransportConstants;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
index 8a2dd3f0651..fb8e05845e7 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.io.InputStream;
import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceException;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceException;
import org.apache.camel.CamelContext;
import org.apache.camel.NoSuchEndpointException;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
index 0ac28932324..a3ba552bf2d 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.transport;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
index 9172d042fca..ea75082ccd3 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.transport;
import java.util.concurrent.Future;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
import javax.xml.namespace.QName;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Response;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Response;
+import jakarta.xml.ws.Service;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.cxf.Bus;
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
index 0c5373cf9be..c2ac2a38401 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
@@ -20,7 +20,7 @@ import java.security.Principal;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
index fc009501a70..e63bdaa5598 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Collections;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.component.cxf.transport.CamelTransportConstants;
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
index 0ac28932324..a3ba552bf2d 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.transport;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
index 9172d042fca..ea75082ccd3 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.transport;
import java.util.concurrent.Future;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
import javax.xml.namespace.QName;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Response;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Response;
+import jakarta.xml.ws.Service;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.cxf.Bus;
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
index 16c02ebdbb1..20fa5382ebd 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
@@ -90,7 +90,7 @@ public class MapperFactory {
answer = new DefaultELEngine(ELExpressionFactory.newInstance());
}
} else {
- LOG.warn("Expressions are not supported by Dozer. Are you missing javax.el dependency?");
+ LOG.warn("Expressions are not supported by Dozer. Are you missing jakarta.el dependency?");
answer = new NoopELEngine();
}
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
index 1c4d8cdf41e..5c49db0410a 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.dozer.example.abc;
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.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* <p>
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java
index 6ac08931fb8..d7ef90af9b6 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.dozer.example.abc;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
/**
* This object contains factory methods for each Java content interface and Java element interface generated in the
diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java
index 960265b7c72..3b01d905f57 100644
--- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java
+++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.freemarker;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
index a394907c921..54d6f497ae5 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
@@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
import com.google.api.services.gmail.model.ListMessagesResponse;
import com.google.api.services.gmail.model.Message;
@@ -141,7 +141,7 @@ public class GmailUsersMessagesIT extends AbstractGoogleMailTestSupport {
Properties props = new Properties();
Session session = Session.getDefaultInstance(props, null);
MimeMessage mm = new MimeMessage(session);
- mm.addRecipients(javax.mail.Message.RecipientType.TO, profile.getEmailAddress());
+ mm.addRecipients(jakarta.mail.Message.RecipientType.TO, profile.getEmailAddress());
mm.setSubject("Hello from camel-google-mail");
mm.setContent("Camel rocks!", "text/plain");
Message createMessageWithEmail = createMessageWithEmail(mm);
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
index a5ae18031bf..cb3fb6eb31b 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
@@ -22,9 +22,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
import com.google.api.services.gmail.model.Message;
import org.apache.camel.builder.RouteBuilder;
@@ -56,7 +56,7 @@ public class GmailUsersThreadsIT extends AbstractGoogleMailTestSupport {
Properties props = new Properties();
Session session = Session.getDefaultInstance(props, null);
MimeMessage mm = new MimeMessage(session);
- mm.addRecipients(javax.mail.Message.RecipientType.TO, profile.getEmailAddress());
+ mm.addRecipients(jakarta.mail.Message.RecipientType.TO, profile.getEmailAddress());
mm.setSubject("Hello from camel-google-mail");
mm.setContent("Camel rocks!", "text/plain");
Message createMessageWithEmail = createMessageWithEmail(mm);
diff --git a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java
index 81eaf5cd825..a49a43d7e92 100644
--- a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java
+++ b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java
@@ -26,15 +26,15 @@ import java.util.Map;
import java.util.Optional;
import java.util.zip.GZIPInputStream;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
import com.consol.citrus.Citrus;
import com.consol.citrus.dsl.runner.DefaultTestRunner;
diff --git a/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java b/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java
index bcacebd1a75..2a6785a702b 100644
--- a/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java
+++ b/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java
@@ -43,15 +43,15 @@ public final class HttpConverterLoader implements TypeConverterLoader, CamelCont
private void registerConverters(TypeConverterRegistry registry) {
addTypeConverter(registry, java.io.BufferedReader.class, org.apache.camel.http.common.HttpMessage.class, false,
(type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toReader((org.apache.camel.http.common.HttpMessage) value));
- addTypeConverter(registry, java.io.InputStream.class, javax.servlet.http.HttpServletRequest.class, false,
- (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toInputStream((javax.servlet.http.HttpServletRequest) value, exchange));
+ addTypeConverter(registry, java.io.InputStream.class, jakarta.servlet.http.HttpServletRequest.class, false,
+ (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toInputStream((jakarta.servlet.http.HttpServletRequest) value, exchange));
addTypeConverter(registry, java.io.InputStream.class, org.apache.camel.http.common.HttpMessage.class, false,
(type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toInputStream((org.apache.camel.http.common.HttpMessage) value, exchange));
- addTypeConverter(registry, javax.servlet.ServletInputStream.class, org.apache.camel.http.common.HttpMessage.class, false,
+ addTypeConverter(registry, jakarta.servlet.ServletInputStream.class, org.apache.camel.http.common.HttpMessage.class, false,
(type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toServletInputStream((org.apache.camel.http.common.HttpMessage) value));
- addTypeConverter(registry, javax.servlet.http.HttpServletRequest.class, org.apache.camel.Message.class, false,
+ addTypeConverter(registry, jakarta.servlet.http.HttpServletRequest.class, org.apache.camel.Message.class, false,
(type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toServletRequest((org.apache.camel.Message) value));
- addTypeConverter(registry, javax.servlet.http.HttpServletResponse.class, org.apache.camel.Message.class, false,
+ addTypeConverter(registry, jakarta.servlet.http.HttpServletResponse.class, org.apache.camel.Message.class, false,
(type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toServletResponse((org.apache.camel.Message) value));
}
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
index e9fdb717a83..1b2239ad5b3 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
@@ -28,12 +28,12 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
@@ -390,7 +390,7 @@ public class CamelServlet extends HttpServlet implements HttpRegistryProvider {
/**
* @deprecated use
- * {@link ServletResolveConsumerStrategy#resolve(javax.servlet.http.HttpServletRequest, java.util.Map)}
+ * {@link ServletResolveConsumerStrategy#resolve(jakarta.servlet.http.HttpServletRequest, java.util.Map)}
*/
@Deprecated
protected HttpConsumer resolve(HttpServletRequest request) {
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 4d0033c5ae2..6b559b58200 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -35,10 +35,10 @@ import java.util.TimeZone;
import java.util.concurrent.TimeoutException;
import java.util.zip.GZIPOutputStream;
-import javax.activation.DataHandler;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.activation.DataHandler;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
index d8761440cb7..73958f8034e 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
index 47e71359ead..51b51c87e65 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
@@ -18,8 +18,8 @@ package org.apache.camel.http.common;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -106,9 +106,9 @@ public interface HttpBinding {
boolean isUseReaderForPayload();
/**
- * Should the {@link javax.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages
+ * Should the {@link jakarta.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages
* in the Camel {@link org.apache.camel.Message#getBody()} or not. If false then the
- * {@link javax.servlet.http.HttpServletRequest#getInputStream()} will be exposed.
+ * {@link jakarta.servlet.http.HttpServletRequest#getInputStream()} will be exposed.
* <p/>
* Is default <tt>false</tt>.
*
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 506ef8d288e..c69c7dbd34e 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -100,7 +100,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head
description = "Used to only allow consuming if the HttpMethod matches, such as GET/POST/PUT etc. Multiple methods can be specified separated by comma.")
String httpMethodRestrict;
@UriParam(label = "consumer",
- description = "To use a custom buffer size on the javax.servlet.ServletResponse.")
+ description = "To use a custom buffer size on the jakarta.servlet.ServletResponse.")
Integer responseBufferSize;
@UriParam(label = "producer",
description = "If this option is true, The http producer won't read response body and cache the input stream")
@@ -459,7 +459,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head
}
/**
- * To use a custom buffer size on the javax.servlet.ServletResponse.
+ * To use a custom buffer size on the jakarta.servlet.ServletResponse.
*/
public void setResponseBufferSize(Integer responseBufferSize) {
this.responseBufferSize = responseBufferSize;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java
index 3d136083eab..29e27a5e8d0 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java
@@ -20,9 +20,9 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 21be3c16835..ef7fcf1565b 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -27,8 +27,8 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java
index f0a21bada8b..9fd3abb84e1 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java
@@ -18,8 +18,8 @@ package org.apache.camel.http.common;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java
index 9b2f11cc7db..d7bb7abc359 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.support.RestConsumerContextPathMatcher;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java
index 07c7ee032cc..67d3b61825e 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java
@@ -22,7 +22,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.support.RestConsumerContextPathMatcher;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java
index 587863085d2..7bdf565b787 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java
@@ -18,10 +18,10 @@ package org.apache.camel.http.common;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
- * Strategy to resolve which consumer to service an incoming {@link javax.servlet.http.HttpServletRequest}.
+ * Strategy to resolve which consumer to service an incoming {@link jakarta.servlet.http.HttpServletRequest}.
*/
public interface ServletResolveConsumerStrategy {
@@ -31,7 +31,7 @@ public interface ServletResolveConsumerStrategy {
* @param request the http request
* @param consumers the map of registered consumers
* @return the consumer to service the request, or <tt>null</tt> if no match, which sends back a
- * {@link javax.servlet.http.HttpServletResponse#SC_NOT_FOUND} to the client.
+ * {@link jakarta.servlet.http.HttpServletResponse#SC_NOT_FOUND} to the client.
*/
HttpConsumer resolve(HttpServletRequest request, Map<String, HttpConsumer> consumers);
@@ -42,7 +42,7 @@ public interface ServletResolveConsumerStrategy {
* @param method the http method
* @param consumers the map of registered consumers
* @return <tt>true</tt> if the method is allowed and can be serviced. Otherwise a
- * {@link javax.servlet.http.HttpServletResponse#SC_METHOD_NOT_ALLOWED} is returned to the client.
+ * {@link jakarta.servlet.http.HttpServletResponse#SC_METHOD_NOT_ALLOWED} is returned to the client.
*/
boolean isHttpMethodAllowed(HttpServletRequest request, String method, Map<String, HttpConsumer> consumers);
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
index 5e64874fa0d..05d35b92ac3 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.http.handler;
import java.io.IOException;
import java.io.OutputStream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.camel.util.IOHelper;
import org.eclipse.jetty.server.Request;
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java
index 8b9827d45c2..6c62eec1cc1 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jackson;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "XMLPojo")
public class TestJAXBPojo {
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java
index 3cdcee7db4a..ef314405e46 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.jackson.converter;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "order")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java
index e933186e8a4..9ae33286e5a 100644
--- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java
+++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jacksonxml;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "XMLPojo")
public class TestJAXBPojo {
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 6cba113b505..26e2a534328 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -29,12 +29,12 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 865d882cbcc..21094c6fb49 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -31,15 +31,15 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.JAXBIntrospector;
-import javax.xml.bind.MarshalException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBIntrospector;
+import jakarta.xml.bind.MarshalException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java
index d096d722b3b..bd42e11358e 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java
@@ -18,7 +18,7 @@ package org.apache.camel.converter.jaxb;
import java.lang.reflect.Method;
-import javax.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlElementDecl;
import org.apache.camel.CamelContext;
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
index 3e799c12f60..6c30762827f 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
@@ -24,7 +24,7 @@ import java.util.Map;
public interface JaxbNamespacePrefixMapper {
/**
- * JAXB requires the mapper to be registered as a property on the {@link javax.xml.bind.JAXBContext}.
+ * JAXB requires the mapper to be registered as a property on the {@link jakarta.xml.bind.JAXBContext}.
*/
String getRegistrationKey();
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
index fcb7409ec0a..3b1a65758ce 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.converter.jaxb;
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
index c5001eac508..35c046345ce 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
@@ -20,8 +20,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
import org.xml.sax.InputSource;
@@ -103,7 +103,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.a"));
}
@@ -144,7 +144,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
}
@@ -157,7 +157,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
}
@@ -177,7 +177,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
}
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
index 9bde308fa29..8969831875a 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
@@ -84,7 +84,7 @@ public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport {
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.a"));
}
@@ -125,7 +125,7 @@ public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport {
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
}
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
index 56e5b1768b9..68741e95d9b 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.converter.jaxb;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
@@ -68,7 +68,7 @@ public class JaxbDataFormatSchemaValidationWithObjectFactoryTest extends CamelTe
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
}
@@ -88,7 +88,7 @@ public class JaxbDataFormatSchemaValidationWithObjectFactoryTest extends CamelTe
Throwable cause = ex.getCause();
assertIsInstanceOf(IOException.class, cause);
- assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+ assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
}
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java
index e20247d79ec..6218db9ef1d 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.converter.jaxb.address;
-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;
/**
* <p>
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java
index a242d0109a0..f165ab5d276 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.converter.jaxb.address;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
/**
* This object contains factory methods for each Java content interface and Java element interface generated in the
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
index 0e38a34b1a4..36f090bb16c 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
@@ -14,6 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "address.jaxb.converter.camel.apache.org",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "address.jaxb.converter.camel.apache.org",
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.camel.converter.jaxb.address;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java
index d1281049a4e..0696dd9b4a1 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.converter.jaxb.message;
-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;
/**
* <p>
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
index c1ac836ecba..7b3189c4108 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.converter.jaxb.message;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
/**
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
index bd5591d0b1d..970ab8072c5 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
@@ -14,5 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "message.jaxb.converter.camel.apache.org")
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "message.jaxb.converter.camel.apache.org")
package org.apache.camel.converter.jaxb.message;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java
index 6fdd15042dc..ab2cbf1f002 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.converter.jaxb.person;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
/**
* This object contains factory methods for each Java content interface and Java element interface generated in the
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java
index ebc4556e5c2..49083108d6f 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.converter.jaxb.person;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-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.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.camel.converter.jaxb.address.Address;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
index 512a5781039..f618959e212 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
@@ -14,6 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "person.jaxb.converter.camel.apache.org",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "person.jaxb.converter.camel.apache.org",
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.camel.converter.jaxb.person;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java
index 6918ef267c8..8e0a5216a38 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.example;
-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 = "Address")
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java
index d4a42da51c7..0f9825d9541 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.example;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
index 8bc5fc4083b..aef6cea671a 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
@@ -22,8 +22,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
index 2dadfd8556a..0394473a161 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
@@ -23,8 +23,8 @@ import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
index edb83557182..bbf467f1efb 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.example;
import java.nio.file.Path;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java
index b91d9f6495c..638ab4999f9 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java
@@ -19,11 +19,11 @@ package org.apache.camel.example;
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.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
index 77cececbadf..a47fe125d80 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.example;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.Body;
import org.apache.camel.Handler;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java
index 7d54dcc87b4..2d6b1abc154 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.example;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(namespace = "http://www.camel.apache.org/jaxb/example/order/1")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java
index 94fa0b7cb36..ad9d631a641 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.example;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-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.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* Partial element without XmlRootElement annotation for partial testing.
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java
index c3612a350cb..d7be6054804 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.example;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java
index cfb62d2c3dd..195bb14c2b6 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.example;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
index 560bb80682e..204a5862afa 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
@@ -21,5 +21,5 @@
})
package org.apache.camel.example;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
index dd848b760ab..86f6729a329 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.foo.bar;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
/**
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
index a78ebc2e63f..8ec0ad97c38 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.foo.bar;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-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.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
index f525363a30d..17904d53c19 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.jaxb;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
index e6a96f82da8..76f6ed69e5b 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.jaxb;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
index 3d470065438..d8185656d8c 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.jaxb;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.InvalidPayloadException;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java
index 4e927561a1a..f352016f1ab 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.jaxb;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-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.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
@XmlRootElement(name = "Notification")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
index 2a7084c3182..4a617f4f19e 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
@@ -20,11 +20,11 @@ import java.io.Serializable;
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.XmlRootElement;
-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.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
index 4f7cbe3cd08..4c675c4adc3 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
import com.google.common.base.Strings;
import org.jclouds.blobstore.BlobStore;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
index 3a542729d73..d29ec69c55d 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -23,9 +23,9 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
index f66543ddc37..4b51b2a4198 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
@@ -20,12 +20,12 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +59,7 @@ public class CamelFilterWrapper implements Filter {
@Override
public void init(FilterConfig config) throws ServletException {
- Object o = config.getServletContext().getAttribute("javax.servlet.context.tempdir");
+ Object o = config.getServletContext().getAttribute("jakarta.servlet.context.tempdir");
if (o == null) {
//when run in embedded mode, Jetty 8 will forget to set this property,
//but the MultiPartFilter requires it (will NPE if not set) so we'll
@@ -70,7 +70,7 @@ public class CamelFilterWrapper implements Filter {
if (!result) {
LOG.error("failed to delete {}", file);
}
- config.getServletContext().setAttribute("javax.servlet.context.tempdir",
+ config.getServletContext().setAttribute("jakarta.servlet.context.tempdir",
file.getParentFile());
} catch (IOException e) {
//ignore
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
index 3af7105f9f8..8aa93bbf476 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jetty;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
/**
* Please use the CamelFilterWrapper instead of using this classs
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c69a50c96ae..9bbb6b9ef80 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -31,12 +31,12 @@ import java.util.List;
import java.util.Map;
import javax.management.MBeanServer;
-import javax.servlet.Filter;
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
@@ -436,7 +436,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
"The temp file directory of camel-jetty is not exists, please recheck it with directory name :"
+ camelContext.getGlobalOptions().get(TMP_DIR));
}
- context.setAttribute("javax.servlet.context.tempdir", file);
+ context.setAttribute("jakarta.servlet.context.tempdir", file);
}
// if a filter ref was provided, use it.
Filter filter = ((JettyHttpEndpoint) endpoint).getMultipartFilter();
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
index 1eda82dbe82..16fc9ccf223 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
@@ -20,7 +20,7 @@ import java.net.URI;
import java.util.List;
import java.util.Map;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java
index 147e8fa563b..e6205c117a2 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jetty;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.http.common.DefaultHttpBinding;
import org.apache.camel.http.common.HttpCommonEndpoint;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
index 0a3392def04..fd03e944f8e 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
@@ -19,13 +19,13 @@ package org.apache.camel.component.jetty;
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
/**
* To enable handle attachments with Jetty 9 when this filter is set.
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
index 5e258336b5f..104821f1cb9 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
@@ -60,7 +60,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
case "matchonuriprefix":
case "matchOnUriPrefix": target.setMatchOnUriPrefix(property(camelContext, boolean.class, value)); return true;
case "multipartfilter":
- case "multipartFilter": target.setMultipartFilter(property(camelContext, javax.servlet.Filter.class, value)); return true;
+ case "multipartFilter": target.setMultipartFilter(property(camelContext, jakarta.servlet.Filter.class, value)); return true;
case "muteexception":
case "muteException": target.setMuteException(property(camelContext, boolean.class, value)); return true;
case "optionsenabled":
@@ -127,7 +127,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
case "matchonuriprefix":
case "matchOnUriPrefix": return boolean.class;
case "multipartfilter":
- case "multipartFilter": return javax.servlet.Filter.class;
+ case "multipartFilter": return jakarta.servlet.Filter.class;
case "muteexception":
case "muteException": return boolean.class;
case "optionsenabled":
@@ -225,7 +225,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
switch (ignoreCase ? name.toLowerCase() : name) {
case "filterinitparameters":
case "filterInitParameters": return java.lang.String.class;
- case "filters": return javax.servlet.Filter.class;
+ case "filters": return jakarta.servlet.Filter.class;
case "handlers": return org.eclipse.jetty.server.Handler.class;
default: return null;
}
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
index d7b54b1d1a7..bfb5288ac61 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
@@ -23,10 +23,10 @@ import java.util.Collection;
import java.util.Enumeration;
import java.util.Map;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
index 4c1127d70a4..28107e03e39 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
@@ -20,13 +20,13 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java
index 498e45aca0c..6aebea9a36b 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jetty;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java
index 13a0034bc90..771b5326bf8 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jetty;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
index 68a0804e16b..e437a65410a 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
import java.security.Principal;
import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
index cfa6d564ffb..f96fd607b18 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
import java.security.Principal;
import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
index 3d5143e6d26..61990160c21 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
import java.security.Principal;
import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
index 78874efb689..b07e5b98fb0 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty;
import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java
index 4552de5116b..c8a934cf78a 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.jetty;
import java.io.InputStream;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
index 0b6ea62393e..bf955f6ae37 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty;
import java.io.ByteArrayInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java
index 88b05f7fda3..4e15d204e3b 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
import java.util.Map;
import java.util.Map.Entry;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java
index c94f1e6a780..31e81d16437 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jetty;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
index efc59d78e7a..12142982029 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
@@ -23,7 +23,7 @@ import java.net.URL;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
index 9aca8caebc7..de61a48fbd4 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jetty;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java
index 182bbef8802..207946ff3c1 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
index eadb33158e5..9393cb70022 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty;
import java.io.File;
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
index cdb4307fc35..8041c26d9f7 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.jetty;
import java.io.File;
import java.io.IOException;
-import javax.activation.DataHandler;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.activation.DataHandler;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java
index 0bdb72c2ad1..f287d4d9cb1 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
import java.io.IOException;
import java.io.Writer;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.eclipse.jetty.server.handler.ErrorHandler;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
index 60434c55969..f02fffbe091 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java
index 1095005bfab..be4d46655a8 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty.rest;
import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
index 0812c40364e..592576a27d2 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty.rest;
import java.security.Principal;
import javax.security.auth.Subject;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.eclipse.jetty.security.DefaultIdentityService;
import org.eclipse.jetty.security.IdentityService;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java
index 275e7151879..086f467c87c 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.jetty.rest;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "user")
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
index 82d7c5ae430..5de21fe9197 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
@@ -70,7 +70,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
case "concurrentConsumers": getOrCreateConfiguration(target).setConcurrentConsumers(property(camelContext, int.class, value)); return true;
case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.jms.JmsConfiguration.class, value)); return true;
case "connectionfactory":
- case "connectionFactory": getOrCreateConfiguration(target).setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
+ case "connectionFactory": getOrCreateConfiguration(target).setConnectionFactory(property(camelContext, jakarta.jms.ConnectionFactory.class, value)); return true;
case "consumertype":
case "consumerType": getOrCreateConfiguration(target).setConsumerType(property(camelContext, org.apache.camel.component.jms.ConsumerType.class, value)); return true;
case "correlationproperty":
@@ -102,7 +102,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
case "errorhandlerlogginglevel":
case "errorHandlerLoggingLevel": getOrCreateConfiguration(target).setErrorHandlerLoggingLevel(property(camelContext, org.apache.camel.LoggingLevel.class, value)); return true;
case "exceptionlistener":
- case "exceptionListener": getOrCreateConfiguration(target).setExceptionListener(property(camelContext, javax.jms.ExceptionListener.class, value)); return true;
+ case "exceptionListener": getOrCreateConfiguration(target).setExceptionListener(property(camelContext, jakarta.jms.ExceptionListener.class, value)); return true;
case "explicitqosenabled":
case "explicitQosEnabled": getOrCreateConfiguration(target).setExplicitQosEnabled(property(camelContext, java.lang.Boolean.class, value)); return true;
case "exposelistenersession":
@@ -268,7 +268,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
case "concurrentConsumers": return int.class;
case "configuration": return org.apache.camel.component.jms.JmsConfiguration.class;
case "connectionfactory":
- case "connectionFactory": return javax.jms.ConnectionFactory.class;
+ case "connectionFactory": return jakarta.jms.ConnectionFactory.class;
case "consumertype":
case "consumerType": return org.apache.camel.component.jms.ConsumerType.class;
case "correlationproperty":
@@ -300,7 +300,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
case "errorhandlerlogginglevel":
case "errorHandlerLoggingLevel": return org.apache.camel.LoggingLevel.class;
case "exceptionlistener":
- case "exceptionListener": return javax.jms.ExceptionListener.class;
+ case "exceptionListener": return jakarta.jms.ExceptionListener.class;
case "explicitqosenabled":
case "explicitQosEnabled": return java.lang.Boolean.class;
case "exposelistenersession":
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java
index 58926231cf2..aa6e21c00fa 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java
@@ -56,7 +56,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
case "concurrentconsumers":
case "concurrentConsumers": target.getConfiguration().setConcurrentConsumers(property(camelContext, int.class, value)); return true;
case "connectionfactory":
- case "connectionFactory": target.getConfiguration().setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
+ case "connectionFactory": target.getConfiguration().setConnectionFactory(property(camelContext, jakarta.jms.ConnectionFactory.class, value)); return true;
case "consumertype":
case "consumerType": target.getConfiguration().setConsumerType(property(camelContext, org.apache.camel.component.jms.ConsumerType.class, value)); return true;
case "correlationproperty":
@@ -90,7 +90,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
case "exceptionhandler":
case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
case "exceptionlistener":
- case "exceptionListener": target.getConfiguration().setExceptionListener(property(camelContext, javax.jms.ExceptionListener.class, value)); return true;
+ case "exceptionListener": target.getConfiguration().setExceptionListener(property(camelContext, jakarta.jms.ExceptionListener.class, value)); return true;
case "exchangepattern":
case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
case "explicitqosenabled":
@@ -249,7 +249,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
case "concurrentconsumers":
case "concurrentConsumers": return int.class;
case "connectionfactory":
- case "connectionFactory": return javax.jms.ConnectionFactory.class;
+ case "connectionFactory": return jakarta.jms.ConnectionFactory.class;
case "consumertype":
case "consumerType": return org.apache.camel.component.jms.ConsumerType.class;
case "correlationproperty":
@@ -283,7 +283,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
case "exceptionhandler":
case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
case "exceptionlistener":
- case "exceptionListener": return javax.jms.ExceptionListener.class;
+ case "exceptionListener": return jakarta.jms.ExceptionListener.class;
case "exchangepattern":
case "exchangePattern": return org.apache.camel.ExchangePattern.class;
case "explicitqosenabled":
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
index 4f349f510f3..ed89501af06 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
@@ -20,10 +20,10 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.QueueBrowser;
+import jakarta.jms.Session;
import org.apache.camel.Exchange;
import org.springframework.jms.core.BrowserCallback;
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
index bbb87b5f739..f0f4f384e2c 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
/**
* An optional interface that a {@link JmsEndpoint} may implement to return the underlying {@link Destination} object
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
index 3f2df72ced7..be704310287 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Session;
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
@@ -346,7 +346,7 @@ public class EndpointMessageListener implements SessionAwareMessageListener {
* Provides an explicit reply to destination which overrides any incoming value of {@link Message#getJMSReplyTo()}
*
* @param replyToDestination the destination that should be used to send replies to as either a String or
- * {@link javax.jms.Destination} type.
+ * {@link jakarta.jms.Destination} type.
*/
public void setReplyToDestination(Object replyToDestination) {
this.replyToDestination = replyToDestination;
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
index 78e26712545..a3a201d2b38 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
import org.apache.camel.Exchange;
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index 76f2fd8e65a..b031c86eb97 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -34,16 +34,16 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
... 20554 lines suppressed ...