You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/04/29 10:19:22 UTC
[myfaces] branch 3.0.x updated: moved to Jakarta CDI,EL,Servlet
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new 3d6b84f moved to Jakarta CDI,EL,Servlet
3d6b84f is described below
commit 3d6b84f72eb819f7909978b03139e1db7d069c5f
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Apr 29 12:18:59 2020 +0200
moved to Jakarta CDI,EL,Servlet
---
api/pom.xml | 21 ++-
.../jakarta/faces/annotation/ApplicationMap.java | 2 +-
.../java/jakarta/faces/annotation/FacesConfig.java | 4 +-
.../java/jakarta/faces/annotation/FlowMap.java | 2 +-
.../java/jakarta/faces/annotation/HeaderMap.java | 2 +-
.../jakarta/faces/annotation/HeaderValuesMap.java | 2 +-
.../jakarta/faces/annotation/InitParameterMap.java | 2 +-
.../jakarta/faces/annotation/ManagedProperty.java | 2 +-
.../jakarta/faces/annotation/RequestCookieMap.java | 2 +-
.../java/jakarta/faces/annotation/RequestMap.java | 2 +-
.../faces/annotation/RequestParameterMap.java | 2 +-
.../annotation/RequestParameterValuesMap.java | 2 +-
.../java/jakarta/faces/annotation/SessionMap.java | 2 +-
.../java/jakarta/faces/annotation/ViewMap.java | 2 +-
.../jakarta/faces/application/Application.java | 26 +--
.../faces/application/ApplicationWrapper.java | 10 +-
.../jakarta/faces/application/NavigationCase.java | 4 +-
.../jakarta/faces/component/ActionSource2.java | 2 +-
.../java/jakarta/faces/component/UICommand.java | 2 +-
.../java/jakarta/faces/component/UIComponent.java | 4 +-
.../jakarta/faces/component/UIComponentBase.java | 2 +-
.../main/java/jakarta/faces/component/UIData.java | 8 +-
.../java/jakarta/faces/component/UIGraphic.java | 2 +-
.../jakarta/faces/component/UIImportConstants.java | 2 +-
.../main/java/jakarta/faces/component/UIInput.java | 2 +-
.../java/jakarta/faces/component/UIOutput.java | 2 +-
.../jakarta/faces/component/UISelectBoolean.java | 2 +-
.../java/jakarta/faces/component/UISelectMany.java | 2 +-
.../java/jakarta/faces/component/UISelectOne.java | 2 +-
.../java/jakarta/faces/component/UIViewAction.java | 2 +-
.../jakarta/faces/component/UIViewParameter.java | 2 +-
.../java/jakarta/faces/component/UIViewRoot.java | 4 +-
.../java/jakarta/faces/component/_ClassUtils.java | 2 +-
.../faces/component/_ComponentAttributesMap.java | 2 +-
.../jakarta/faces/component/_ComponentUtils.java | 2 +-
.../jakarta/faces/component/_DeltaStateHelper.java | 2 +-
.../faces/component/_LabeledFacesMessage.java | 2 +-
.../jakarta/faces/component/_MessageUtils.java | 2 +-
.../_MethodBindingToMethodExpression.java | 12 +-
.../_MethodExpressionToMethodBinding.java | 8 +-
.../component/_ParametrizableFacesMessage.java | 2 +-
.../faces/component/_SelectItemsIterator.java | 2 +-
.../faces/component/_SharedRendererUtils.java | 2 +-
.../java/jakarta/faces/component/_UIWebsocket.java | 2 +-
.../component/_ValueBindingToValueExpression.java | 10 +-
.../component/_ValueExpressionToValueBinding.java | 12 +-
.../faces/component/behavior/AjaxBehavior.java | 2 +-
.../faces/component/behavior/FacesBehavior.java | 2 +-
.../behavior/_AjaxBehaviorDeltaStateHelper.java | 2 +-
.../component/behavior/_DeltaStateHelper.java | 2 +-
.../jakarta/faces/component/html/_ClassUtils.java | 2 +-
.../faces/component/html/_HtmlInputFile.java | 4 +-
.../faces/component/html/_MessageUtils.java | 2 +-
.../html/_ParametrizableFacesMessage.java | 2 +-
.../java/jakarta/faces/context/FacesContext.java | 2 +-
.../jakarta/faces/context/FacesContextWrapper.java | 2 +-
.../jakarta/faces/context/RequestCookieMap.java | 2 +-
.../java/jakarta/faces/context/SessionMap.java | 2 +-
.../java/jakarta/faces/convert/FacesConverter.java | 2 +-
.../jakarta/faces/convert/NumberConverter.java | 2 +-
.../faces/convert/_LabeledFacesMessage.java | 2 +-
.../java/jakarta/faces/convert/_MessageUtils.java | 2 +-
.../faces/convert/_ParametrizableFacesMessage.java | 2 +-
.../el/CompositeComponentExpressionHolder.java | 2 +-
.../event/MethodExpressionActionListener.java | 10 +-
.../event/MethodExpressionValueChangeListener.java | 10 +-
.../java/jakarta/faces/event/WebsocketEvent.java | 4 +-
api/src/main/java/jakarta/faces/flow/Flow.java | 4 +-
.../main/java/jakarta/faces/flow/FlowScoped.java | 2 +-
.../java/jakarta/faces/flow/MethodCallNode.java | 4 +-
.../main/java/jakarta/faces/flow/Parameter.java | 2 +-
.../jakarta/faces/flow/builder/FlowBuilder.java | 6 +-
.../faces/flow/builder/FlowBuilderParameter.java | 2 +-
.../faces/flow/builder/FlowCallBuilder.java | 2 +-
.../jakarta/faces/flow/builder/FlowDefinition.java | 2 +-
.../faces/flow/builder/MethodCallBuilder.java | 4 +-
.../faces/flow/builder/NavigationCaseBuilder.java | 2 +-
.../jakarta/faces/flow/builder/ReturnBuilder.java | 2 +-
.../jakarta/faces/flow/builder/SwitchBuilder.java | 2 +-
.../faces/flow/builder/SwitchCaseBuilder.java | 2 +-
.../java/jakarta/faces/model/FacesDataModel.java | 2 +-
.../java/jakarta/faces/model/ResultDataModel.java | 4 +-
api/src/main/java/jakarta/faces/push/Push.java | 4 +-
.../jakarta/faces/validator/BeanValidator.java | 12 +-
.../jakarta/faces/validator/FacesValidator.java | 2 +-
.../faces/validator/MethodExpressionValidator.java | 4 +-
.../faces/validator/_LabeledFacesMessage.java | 2 +-
.../jakarta/faces/validator/_MessageUtils.java | 2 +-
.../validator/_ParametrizableFacesMessage.java | 2 +-
.../main/java/jakarta/faces/view/ViewScoped.java | 2 +-
.../view/facelets/DelegatingMetaTagHandler.java | 2 +-
.../faces/view/facelets/FaceletContext.java | 8 +-
.../faces/view/facelets/FaceletHandler.java | 2 +-
.../jakarta/faces/view/facelets/TagAttribute.java | 12 +-
.../java/jakarta/faces/webapp/AttributeTag.java | 6 +-
.../java/jakarta/faces/webapp/ConverterELTag.java | 6 +-
.../java/jakarta/faces/webapp/ConverterTag.java | 6 +-
.../java/jakarta/faces/webapp/FacesServlet.java | 16 +-
.../main/java/jakarta/faces/webapp/FacetTag.java | 4 +-
.../webapp/PreJsf2ExceptionHandlerFactory.java | 2 +-
.../faces/webapp/UIComponentClassicTagBase.java | 18 +--
.../jakarta/faces/webapp/UIComponentELTag.java | 6 +-
.../java/jakarta/faces/webapp/UIComponentTag.java | 6 +-
.../jakarta/faces/webapp/UIComponentTagBase.java | 4 +-
.../java/jakarta/faces/webapp/ValidatorELTag.java | 6 +-
.../java/jakarta/faces/webapp/ValidatorTag.java | 10 +-
.../faces/webapp/_PageContextOutWriter.java | 2 +-
.../main/resources/META-INF/componentClass20.vm | 2 +-
impl-test/pom.xml | 72 ++++++++-
.../core/AbstractMyFacesCDIRequestTestCase.java | 2 +-
.../test/core/AbstractMyFacesRequestTestCase.java | 2 +-
.../mc/test/core/AbstractMyFacesTestCase.java | 8 +-
.../mock/MockDefaultViewDeclarationLanguage.java | 2 +-
.../mc/test/core/mock/MockMyFacesClient.java | 6 +-
.../MockMyFacesFaceletViewDeclarationLanguage.java | 2 +-
.../runner/AbstractJsfRequestTestContainer.java | 2 +-
.../test/core/runner/AbstractJsfTestContainer.java | 12 +-
impl/pom.xml | 132 ++++++++++------
.../myfaces/application/ActionListenerImpl.java | 2 +-
.../myfaces/application/ApplicationImpl.java | 16 +-
.../myfaces/application/NavigationHandlerImpl.java | 2 +-
.../myfaces/application/ResourceHandlerImpl.java | 2 +-
.../myfaces/application/ViewHandlerImpl.java | 2 +-
.../application/_SystemEventServletRequest.java | 14 +-
.../application/_SystemEventServletResponse.java | 4 +-
.../jsp/ServletViewResponseWrapper.java | 8 +-
.../myfaces/cdi/JsfApplicationArtifactHolder.java | 4 +-
.../cdi/JsfApplicationArtifactHolderExtension.java | 10 +-
.../myfaces/cdi/JsfArtifactFlowMapProducer.java | 4 +-
.../apache/myfaces/cdi/JsfArtifactProducer.java | 6 +-
.../myfaces/cdi/JsfArtifactProducerExtension.java | 14 +-
.../behavior/FacesBehaviorAnnotationLiteral.java | 2 +-
.../cdi/behavior/FacesBehaviorExtension.java | 12 +-
.../cdi/behavior/FacesBehaviorProducer.java | 8 +-
.../myfaces/cdi/config/FacesConfigBeanHolder.java | 2 +-
.../myfaces/cdi/config/FacesConfigExtension.java | 16 +-
.../converter/FacesConverterAnnotationLiteral.java | 2 +-
.../cdi/converter/FacesConverterCDIWrapper.java | 4 +-
.../cdi/converter/FacesConverterExtension.java | 12 +-
.../cdi/converter/FacesConverterProducer.java | 8 +-
.../cdi/impl/CDIAnnotationInjectionProvider.java | 8 +-
.../cdi/impl/CDIManagedBeanHandlerImpl.java | 4 +-
.../managedproperty/ManagedPropertyExtension.java | 14 +-
.../managedproperty/ManagedPropertyProducer.java | 8 +-
.../myfaces/cdi/model/DataModelBuilderProxy.java | 2 +-
.../cdi/model/DynamicDataModelProducer.java | 8 +-
.../cdi/model/FacesDataModelAnnotationLiteral.java | 2 +-
.../cdi/model/FacesDataModelClassBeanHolder.java | 2 +-
.../myfaces/cdi/model/FacesDataModelExtension.java | 18 +--
.../myfaces/cdi/scope/FacesScopeBeanHolder.java | 4 +-
.../org/apache/myfaces/cdi/scope/FacesScoped.java | 2 +-
.../myfaces/cdi/scope/FacesScopedContextImpl.java | 14 +-
.../apache/myfaces/cdi/scope/ScopeExtension.java | 10 +-
.../cdi/scope/ViewTransientScopeBeanHolder.java | 2 +-
.../myfaces/cdi/scope/ViewTransientScoped.java | 2 +-
.../cdi/scope/ViewTransientScopedContextImpl.java | 14 +-
.../apache/myfaces/cdi/util/AbstractContext.java | 12 +-
.../myfaces/cdi/util/AbstractDynamicProducer.java | 12 +-
.../org/apache/myfaces/cdi/util/AnyLiteral.java | 6 +-
.../org/apache/myfaces/cdi/util/BeanProvider.java | 8 +-
.../java/org/apache/myfaces/cdi/util/CDIUtils.java | 12 +-
.../myfaces/cdi/util/ContextualInstanceInfo.java | 4 +-
.../apache/myfaces/cdi/util/ContextualStorage.java | 10 +-
.../apache/myfaces/cdi/util/DefaultLiteral.java | 6 +-
.../validator/FacesValidatorAnnotationLiteral.java | 2 +-
.../cdi/validator/FacesValidatorCDIWrapper.java | 4 +-
.../cdi/validator/FacesValidatorExtension.java | 12 +-
.../cdi/validator/FacesValidatorProducer.java | 8 +-
.../myfaces/cdi/view/ViewScopeBeanHolder.java | 12 +-
.../apache/myfaces/cdi/view/ViewScopeCDIMap.java | 2 +-
.../cdi/view/ViewScopeContextExtension.java | 12 +-
.../myfaces/cdi/view/ViewScopeContextImpl.java | 14 +-
.../cdi/view/ViewScopeContextualStorage.java | 12 +-
.../search/CompositeSearchKeywordResolver.java | 6 +-
.../validate/CopyBeanInterceptorELResolver.java | 4 +-
.../component/validate/WholeBeanValidator.java | 6 +-
.../component/validate/_ELContextDecorator.java | 8 +-
.../validate/_ValueReferenceResolver.java | 6 +-
.../apache/myfaces/config/FacesConfigurator.java | 2 +-
.../apache/myfaces/config/ManagedBeanBuilder.java | 10 +-
.../org/apache/myfaces/config/RuntimeConfig.java | 4 +-
.../annotation/CdiAnnotationProviderExtension.java | 8 +-
.../annotation/DefaultAnnotationProvider.java | 2 +-
.../myfaces/config/element/FacesConfigData.java | 2 +-
.../apache/myfaces/config/element/ManagedBean.java | 2 +-
.../impl/digester/elements/ManagedBeanImpl.java | 2 +-
.../context/ExternalContextFactoryImpl.java | 6 +-
.../myfaces/context/FacesContextWrapper.java | 2 +-
.../MyFacesExceptionHandlerWrapperImpl.java | 2 +-
.../myfaces/context/servlet/ApplicationMap.java | 2 +-
.../apache/myfaces/context/servlet/CookieMap.java | 4 +-
.../myfaces/context/servlet/FacesContextImpl.java | 6 +-
.../context/servlet/FacesContextImplBase.java | 6 +-
.../myfaces/context/servlet/InitParameterMap.java | 2 +-
.../myfaces/context/servlet/RequestHeaderMap.java | 2 +-
.../context/servlet/RequestHeaderValuesMap.java | 2 +-
.../apache/myfaces/context/servlet/RequestMap.java | 2 +-
.../context/servlet/RequestParameterMap.java | 2 +-
.../context/servlet/RequestParameterValuesMap.java | 2 +-
.../servlet/ServletExternalContextImpl.java | 20 +--
.../servlet/ServletExternalContextImplBase.java | 2 +-
.../apache/myfaces/context/servlet/SessionMap.java | 4 +-
.../servlet/StartupServletExternalContextImpl.java | 2 +-
.../myfaces/ee/MyFacesContainerInitializer.java | 12 +-
.../org/apache/myfaces/el/CompositeELResolver.java | 6 +-
.../org/apache/myfaces/el/FlashELResolver.java | 12 +-
.../apache/myfaces/el/NullPropertyResolver.java | 2 +-
.../apache/myfaces/el/PropertyResolverImpl.java | 8 +-
.../myfaces/el/ResolverForJSPInitializer.java | 4 +-
.../apache/myfaces/el/VariableResolverImpl.java | 6 +-
...ableResolverToApplicationELResolverAdapter.java | 2 +-
.../el/convert/ELResolverToPropertyResolver.java | 22 +--
.../el/convert/ELResolverToVariableResolver.java | 6 +-
.../convert/MethodExpressionToMethodBinding.java | 8 +-
.../el/convert/PropertyResolverToELResolver.java | 12 +-
.../el/convert/ValueBindingToValueExpression.java | 10 +-
.../el/convert/ValueExpressionToValueBinding.java | 12 +-
.../el/convert/VariableResolverToELResolver.java | 10 +-
.../unified/CustomFirstELResolverComparator.java | 2 +-
.../el/unified/CustomLastELResolverComparator.java | 2 +-
.../myfaces/el/unified/ELResolverBuilder.java | 2 +-
.../apache/myfaces/el/unified/FacesELContext.java | 8 +-
.../unified/OpenWebBeansELResolverComparator.java | 2 +-
.../myfaces/el/unified/ResolverBuilderBase.java | 4 +-
.../el/unified/ResolverBuilderForFaces.java | 23 +--
.../myfaces/el/unified/ResolverBuilderForJSP.java | 9 +-
.../resolver/CompositeComponentELResolver.java | 6 +-
.../unified/resolver/FacesCompositeELResolver.java | 4 +-
.../myfaces/el/unified/resolver/GuiceResolver.java | 6 +-
.../resolver/ImportConstantsELResolver.java | 10 +-
.../el/unified/resolver/ImportHandlerResolver.java | 10 +-
.../el/unified/resolver/ManagedBeanResolver.java | 10 +-
.../unified/resolver/ResourceBundleResolver.java | 12 +-
.../el/unified/resolver/ResourceResolver.java | 6 +-
.../unified/resolver/ScopedAttributeResolver.java | 10 +-
.../implicitobject/ApplicationImplicitObject.java | 2 +-
.../ApplicationScopeImplicitObject.java | 2 +-
.../implicitobject/ComponentImplicitObject.java | 2 +-
.../CompositeComponentImplicitObject.java | 2 +-
.../implicitobject/CookieImplicitObject.java | 2 +-
.../implicitobject/FacesContextImplicitObject.java | 2 +-
.../implicitobject/FlowScopeImplicitObject.java | 2 +-
.../implicitobject/HeaderImplicitObject.java | 2 +-
.../implicitobject/HeaderValuesImplicitObject.java | 2 +-
.../resolver/implicitobject/ImplicitObject.java | 4 +-
.../implicitobject/ImplicitObjectResolver.java | 10 +-
.../implicitobject/InitParamImplicitObject.java | 2 +-
.../implicitobject/ParamImplicitObject.java | 2 +-
.../implicitobject/ParamValuesImplicitObject.java | 2 +-
.../implicitobject/RequestImplicitObject.java | 2 +-
.../implicitobject/RequestScopeImplicitObject.java | 2 +-
.../implicitobject/ResourceImplicitObject.java | 2 +-
.../implicitobject/SessionImplicitObject.java | 2 +-
.../implicitobject/SessionScopeImplicitObject.java | 2 +-
.../implicitobject/ViewImplicitObject.java | 2 +-
.../implicitobject/ViewScopeImplicitObject.java | 2 +-
.../myfaces/event/SetPropertyActionListener.java | 4 +-
.../org/apache/myfaces/flow/FlowCallNodeImpl.java | 2 +-
.../java/org/apache/myfaces/flow/FlowImpl.java | 2 +-
.../apache/myfaces/flow/MethodCallNodeImpl.java | 4 +-
.../apache/myfaces/flow/NavigationCaseImpl.java | 4 +-
.../org/apache/myfaces/flow/ParameterImpl.java | 2 +-
.../org/apache/myfaces/flow/ReturnNodeImpl.java | 2 +-
.../org/apache/myfaces/flow/SwitchCaseImpl.java | 2 +-
.../org/apache/myfaces/flow/SwitchNodeImpl.java | 2 +-
.../myfaces/flow/builder/FlowBuilderImpl.java | 4 +-
.../myfaces/flow/builder/FlowCallBuilderImpl.java | 2 +-
.../flow/builder/MethodCallBuilderImpl.java | 4 +-
.../flow/builder/NavigationCaseBuilderImpl.java | 2 +-
.../myfaces/flow/builder/ReturnBuilderImpl.java | 2 +-
.../myfaces/flow/builder/SwitchBuilderImpl.java | 2 +-
.../flow/builder/SwitchCaseBuilderImpl.java | 2 +-
.../flow/cdi/DefaultCDIFacesFlowProvider.java | 2 +-
.../myfaces/flow/cdi/FlowBuilderCDIExtension.java | 14 +-
.../myfaces/flow/cdi/FlowBuilderFactoryBean.java | 12 +-
.../myfaces/flow/cdi/FlowScopeBeanHolder.java | 12 +-
.../myfaces/flow/cdi/FlowScopeCDIExtension.java | 16 +-
.../org/apache/myfaces/flow/cdi/FlowScopeMap.java | 2 +-
.../myfaces/flow/cdi/FlowScopedContextImpl.java | 16 +-
.../myfaces/lifecycle/CODIClientSideWindow.java | 4 +-
.../org/apache/myfaces/lifecycle/ClientConfig.java | 4 +-
.../myfaces/lifecycle/RestoreViewExecutor.java | 4 +-
.../java/org/apache/myfaces/push/EndpointImpl.java | 16 +-
.../myfaces/push/WebsocketComponentRenderer.java | 2 +-
.../apache/myfaces/push/WebsocketConfigurator.java | 10 +-
.../myfaces/push/cdi/PushContextCDIExtension.java | 14 +-
.../myfaces/push/cdi/PushContextFactoryBean.java | 10 +-
.../apache/myfaces/push/cdi/PushContextImpl.java | 4 +-
.../myfaces/push/cdi/WebsocketApplicationBean.java | 2 +-
.../cdi/WebsocketApplicationSessionHolder.java | 2 +-
.../push/cdi/WebsocketChannelTokenBuilderBean.java | 2 +-
.../myfaces/push/cdi/WebsocketSessionBean.java | 2 +-
.../apache/myfaces/push/cdi/WebsocketViewBean.java | 2 +-
.../apache/myfaces/renderkit/ErrorPageWriter.java | 6 +-
.../myfaces/spi/ServiceProviderFinderFactory.java | 2 +-
.../myfaces/taglib/core/ActionListenerTag.java | 6 +-
.../apache/myfaces/taglib/core/AttributeTag.java | 12 +-
.../myfaces/taglib/core/ConvertDateTimeTag.java | 6 +-
.../myfaces/taglib/core/ConvertNumberTag.java | 8 +-
.../myfaces/taglib/core/ConverterImplTag.java | 10 +-
.../apache/myfaces/taglib/core/ConverterTag.java | 6 +-
.../taglib/core/DelegateActionListener.java | 4 +-
.../myfaces/taglib/core/DelegateConverter.java | 4 +-
.../myfaces/taglib/core/DelegateValidator.java | 4 +-
.../taglib/core/DelegateValueChangeListener.java | 4 +-
.../myfaces/taglib/core/GenericListenerTag.java | 10 +-
.../taglib/core/GenericMinMaxValidatorTag.java | 6 +-
.../apache/myfaces/taglib/core/LoadBundleTag.java | 10 +-
.../org/apache/myfaces/taglib/core/ParamTag.java | 2 +-
.../myfaces/taglib/core/PhaseListenerTag.java | 12 +-
.../taglib/core/SetPropertyActionListenerTag.java | 10 +-
.../taglib/core/ValidateDoubleRangeTag.java | 2 +-
.../myfaces/taglib/core/ValidateLengthTag.java | 2 +-
.../myfaces/taglib/core/ValidateLongRangeTag.java | 2 +-
.../myfaces/taglib/core/ValidateRegexTag.java | 6 +-
.../myfaces/taglib/core/ValidateRequiredTag.java | 6 +-
.../myfaces/taglib/core/ValidatorImplTag.java | 14 +-
.../apache/myfaces/taglib/core/ValidatorTag.java | 8 +-
.../taglib/core/ValueChangeListenerTag.java | 6 +-
.../apache/myfaces/taglib/core/VerbatimTag.java | 10 +-
.../org/apache/myfaces/taglib/core/ViewTag.java | 10 +-
.../org/apache/myfaces/util/ContainerUtils.java | 2 +-
.../java/org/apache/myfaces/util/DebugUtils.java | 4 +-
.../myfaces/util/ExternalSpecifications.java | 175 +++++++++++----------
.../main/java/org/apache/myfaces/util/Lazy.java | 77 +++++++++
.../myfaces/view/facelets/AbstractFacelet.java | 4 +-
.../view/facelets/AbstractFaceletContext.java | 2 +-
.../DefaultFaceletsStateManagementStrategy.java | 2 +-
.../myfaces/view/facelets/FaceletFactory.java | 2 +-
.../facelets/FaceletViewDeclarationLanguage.java | 12 +-
.../apache/myfaces/view/facelets/PageContext.java | 2 +-
.../myfaces/view/facelets/TemplateClient.java | 4 +-
.../myfaces/view/facelets/TemplateContext.java | 4 +-
.../compiler/AddFacesMessageInstruction.java | 4 +-
.../facelets/compiler/AttributeInstruction.java | 6 +-
.../compiler/BodyEndElementInstruction.java | 4 +-
.../view/facelets/compiler/CommentInstruction.java | 4 +-
.../view/facelets/compiler/CompilationUnit.java | 2 +-
.../myfaces/view/facelets/compiler/Compiler.java | 4 +-
.../compiler/CompositeTextInstruction.java | 4 +-
.../view/facelets/compiler/DoctypeInstruction.java | 4 +-
.../view/facelets/compiler/EncodingHandler.java | 2 +-
.../facelets/compiler/EndElementInstruction.java | 4 +-
.../view/facelets/compiler/Instruction.java | 4 +-
.../compiler/LiteralAttributeInstruction.java | 4 +-
.../compiler/LiteralCommentInstruction.java | 4 +-
.../compiler/LiteralNonExcapedTextInstruction.java | 4 +-
.../facelets/compiler/LiteralTextInstruction.java | 4 +-
.../facelets/compiler/LiteralXMLInstruction.java | 4 +-
.../view/facelets/compiler/NamespaceHandler.java | 6 +-
.../view/facelets/compiler/SAXCompiler.java | 6 +-
.../facelets/compiler/StartElementInstruction.java | 4 +-
.../view/facelets/compiler/TextInstruction.java | 4 +-
.../myfaces/view/facelets/compiler/TextUnit.java | 2 +-
.../facelets/compiler/UIInstructionHandler.java | 2 +-
.../myfaces/view/facelets/compiler/UILeaf.java | 2 +-
.../view/facelets/compiler/XMLInstruction.java | 4 +-
.../myfaces/view/facelets/component/UIRepeat.java | 2 +-
.../el/CacheableValueExpressionWrapper.java | 6 +-
.../view/facelets/el/CompositeFunctionMapper.java | 6 +-
.../view/facelets/el/CompositeVariableMapper.java | 12 +-
.../myfaces/view/facelets/el/ContextAware.java | 2 +-
.../view/facelets/el/ContextAwareELException.java | 2 +-
.../view/facelets/el/ContextAwareException.java | 2 +-
.../el/ContextAwareMethodNotFoundException.java | 2 +-
.../el/ContextAwarePropertyNotFoundException.java | 4 +-
.../ContextAwarePropertyNotWritableException.java | 4 +-
.../el/ContextAwareTagMethodExpression.java | 12 +-
.../el/ContextAwareTagValueExpression.java | 12 +-
.../view/facelets/el/ContextAwareUtils.java | 4 +-
.../view/facelets/el/DefaultFunctionMapper.java | 6 +-
.../view/facelets/el/DefaultVariableMapper.java | 12 +-
.../apache/myfaces/view/facelets/el/ELText.java | 12 +-
.../facelets/el/FaceletStateValueExpression.java | 12 +-
.../view/facelets/el/LegacyMethodBinding.java | 8 +-
.../view/facelets/el/LocationMethodExpression.java | 6 +-
.../view/facelets/el/LocationValueExpression.java | 6 +-
.../el/MethodExpressionMethodExpression.java | 12 +-
...hodExpressionValueExpressionActionListener.java | 6 +-
...ctMethodExpressionValueExpressionValidator.java | 6 +-
...pressionValueExpressionValueChangeListener.java | 6 +-
.../el/ResourceLocationValueExpression.java | 6 +-
.../view/facelets/el/TagMethodExpression.java | 12 +-
.../view/facelets/el/TagValueExpression.java | 12 +-
.../el/ValueExpressionMethodExpression.java | 8 +-
.../view/facelets/el/VariableMapperBase.java | 2 +-
.../view/facelets/el/VariableMapperWrapper.java | 10 +-
.../myfaces/view/facelets/impl/DefaultFacelet.java | 4 +-
.../view/facelets/impl/DefaultFaceletContext.java | 14 +-
.../view/facelets/impl/DefaultFaceletFactory.java | 2 +-
.../impl/FaceletCompositionContextImpl.java | 2 +-
.../view/facelets/impl/PageContextImpl.java | 2 +-
.../view/facelets/impl/TemplateContextImpl.java | 4 +-
.../view/facelets/tag/AbstractTagLibrary.java | 4 +-
.../tag/ComponentTagDeclarationLibrary.java | 2 +-
.../view/facelets/tag/CompositeFaceletHandler.java | 2 +-
.../view/facelets/tag/LegacyUserTagHandler.java | 6 +-
.../myfaces/view/facelets/tag/MethodRule.java | 2 +-
.../view/facelets/tag/TagAttributeImpl.java | 14 +-
.../view/facelets/tag/TagHandlerFactory.java | 2 +-
.../myfaces/view/facelets/tag/UserTagHandler.java | 6 +-
.../tag/composite/AttachedObjectTargetHandler.java | 4 +-
.../tag/composite/AttachedObjectTargetImpl.java | 2 +-
.../facelets/tag/composite/AttributeHandler.java | 24 +--
.../ClientBehaviorAttachedObjectTargetImpl.java | 2 +-
.../tag/composite/ClientBehaviorHandler.java | 8 +-
...lientBehaviorRedirectEventComponentWrapper.java | 2 +-
.../CompositeComponentResourceTagHandler.java | 6 +-
.../tag/composite/CompositeMetadataTargetImpl.java | 2 +-
.../view/facelets/tag/composite/FacetHandler.java | 14 +-
.../facelets/tag/composite/InsertFacetHandler.java | 4 +-
.../facelets/tag/composite/InterfaceHandler.java | 14 +-
.../facelets/tag/composite/RenderFacetHandler.java | 4 +-
.../composite/RetargetMethodExpressionRule.java | 2 +-
.../view/facelets/tag/jsf/ActionSourceRule.java | 2 +-
.../tag/jsf/BehaviorTagHandlerDelegate.java | 2 +-
.../jsf/ClearBindingValueExpressionListener.java | 2 +-
.../view/facelets/tag/jsf/ComponentHandler.java | 4 +-
.../tag/jsf/ComponentTagHandlerDelegate.java | 2 +-
.../view/facelets/tag/jsf/ConvertHandler.java | 4 +-
.../tag/jsf/ConverterTagHandlerDelegate.java | 2 +-
.../facelets/tag/jsf/EditableValueHolderRule.java | 2 +-
.../view/facelets/tag/jsf/FaceletState.java | 2 +-
.../jsf/PartialMethodExpressionActionListener.java | 2 +-
.../tag/jsf/PartialMethodExpressionValidator.java | 2 +-
...PartialMethodExpressionValueChangeListener.java | 2 +-
.../view/facelets/tag/jsf/ValidateHandler.java | 4 +-
.../tag/jsf/ValidatorTagHandlerDelegate.java | 2 +-
.../tag/jsf/core/ActionListenerHandler.java | 4 +-
.../view/facelets/tag/jsf/core/AjaxHandler.java | 22 +--
.../facelets/tag/jsf/core/AttributeHandler.java | 4 +-
.../facelets/tag/jsf/core/AttributesHandler.java | 2 +-
.../tag/jsf/core/ConvertDateTimeHandler.java | 2 +-
.../tag/jsf/core/ConvertDelegateHandler.java | 2 +-
.../tag/jsf/core/ConvertNumberHandler.java | 2 +-
.../view/facelets/tag/jsf/core/EventHandler.java | 12 +-
.../view/facelets/tag/jsf/core/FacetHandler.java | 2 +-
.../facelets/tag/jsf/core/LoadBundleHandler.java | 2 +-
.../tag/jsf/core/PassThroughAttributeHandler.java | 2 +-
.../tag/jsf/core/PhaseListenerHandler.java | 4 +-
.../jsf/core/ResetValuesActionListenerHandler.java | 6 +-
.../facelets/tag/jsf/core/SelectItemsHandler.java | 2 +-
.../jsf/core/SetPropertyActionListenerHandler.java | 8 +-
.../tag/jsf/core/ValueChangeListenerHandler.java | 4 +-
.../view/facelets/tag/jsf/core/ViewHandler.java | 4 +-
.../facelets/tag/jsf/core/WebsocketHandler.java | 2 +-
.../view/facelets/tag/jstl/core/CatchHandler.java | 2 +-
.../view/facelets/tag/jstl/core/ChooseHandler.java | 2 +-
.../tag/jstl/core/ChooseOtherwiseHandler.java | 2 +-
.../facelets/tag/jstl/core/ChooseWhenHandler.java | 2 +-
.../facelets/tag/jstl/core/ForEachHandler.java | 6 +-
.../view/facelets/tag/jstl/core/IfHandler.java | 2 +-
.../tag/jstl/core/IndexedValueExpression.java | 4 +-
.../tag/jstl/core/IteratedValueExpression.java | 6 +-
.../tag/jstl/core/IterationStatusExpression.java | 4 +-
.../tag/jstl/core/LegacyForEachHandler.java | 6 +-
.../facelets/tag/jstl/core/LegacySetHandler.java | 8 +-
.../tag/jstl/core/MappedValueExpression.java | 4 +-
.../view/facelets/tag/jstl/core/SetHandler.java | 8 +-
.../view/facelets/tag/ui/CompositionHandler.java | 4 +-
.../view/facelets/tag/ui/DebugPhaseListener.java | 4 +-
.../view/facelets/tag/ui/DecorateHandler.java | 4 +-
.../view/facelets/tag/ui/DefineHandler.java | 4 +-
.../view/facelets/tag/ui/IncludeHandler.java | 8 +-
.../view/facelets/tag/ui/InsertHandler.java | 4 +-
.../facelets/tag/ui/LegacyCompositionHandler.java | 6 +-
.../facelets/tag/ui/LegacyDecorateHandler.java | 6 +-
.../view/facelets/tag/ui/LegacyIncludeHandler.java | 8 +-
.../view/facelets/tag/ui/LegacyParamHandler.java | 8 +-
.../myfaces/view/facelets/tag/ui/ParamHandler.java | 8 +-
.../myfaces/view/facelets/tag/ui/UIDebug.java | 2 +-
.../myfaces/view/facelets/util/Resource.java | 2 +-
.../view/jsp/JspViewDeclarationLanguage.java | 8 +-
.../myfaces/webapp/AbstractFacesInitializer.java | 16 +-
.../myfaces/webapp/FaceletsInitilializer.java | 8 +-
.../myfaces/webapp/FacesELContextListener.java | 4 +-
.../apache/myfaces/webapp/FacesInitializer.java | 2 +-
.../myfaces/webapp/FacesInitializerFactory.java | 2 +-
.../myfaces/webapp/Jsp20FacesInitializer.java | 10 +-
.../myfaces/webapp/Jsp21FacesInitializer.java | 8 +-
.../webapp/ManagedBeanDestroyerListener.java | 28 ++--
.../org/apache/myfaces/webapp/MyFacesServlet.java | 12 +-
.../org/apache/myfaces/webapp/StartupListener.java | 2 +-
.../webapp/StartupServletContextListener.java | 6 +-
.../main/resources/META-INF/componentClass20.vm | 2 +-
impl/src/main/resources/META-INF/tagClass12.vm | 4 +-
.../jakarta/faces/application/ApplicationTest.java | 8 +-
.../component/AbstractUIComponentPropertyTest.java | 4 +-
.../component/UIComponentBaseValueBindingTest.java | 2 +-
.../component/UIComponentValueExpressionTest.java | 8 +-
.../java/jakarta/faces/component/UIDataTest.java | 2 +-
.../jakarta/faces/component/UIGraphicTest.java | 2 +-
.../java/jakarta/faces/component/UIInputTest.java | 10 +-
.../jakarta/faces/component/UISelectItemsTest.java | 2 +-
.../jakarta/faces/component/UIViewRootTest.java | 8 +-
.../_MethodBindingToMethodExpressionTest.java | 10 +-
.../faces/component/_SharedRendererUtilsTest.java | 2 +-
.../_ValueBindingToValueExpressionTest.java | 20 +--
.../_ValueExpressionToValueBindingTest.java | 10 +-
.../jakarta/faces/context/MockFacesContext.java | 2 +-
.../jakarta/faces/convert/MessageUtilsTest.java | 2 +-
.../jakarta/faces/convert/NumberConverterTest.java | 2 +-
.../event/MethodExpressionActionListenerTest.java | 4 +-
.../MethodExpressionValueChangeListenerTest.java | 4 +-
.../jakarta/faces/validator/_MessageUtilsTest.java | 6 +-
.../java/org/apache/myfaces/FacesTestCase.java | 2 +-
.../application/ApplicationImplAnnotationTest.java | 2 +-
.../application/ApplicationImplJsfTest.java | 2 +-
.../myfaces/application/ApplicationImplTest.java | 6 +-
.../apache/myfaces/application/flow/Flow1Bean.java | 2 +-
.../myfaces/application/flow/Flow21Bean.java | 4 +-
.../apache/myfaces/application/flow/Flow2Bean.java | 2 +-
.../apache/myfaces/application/flow/Flow5Bean.java | 2 +-
.../flow/FlowMyFacesCDIRequestTestCase.java | 2 +-
.../flow/FlowMyFacesRequestTestCase.java | 2 +-
.../cdi/bean/CDIGenericConverterValidatorTest.java | 2 +-
.../bean/DynamicManagedPropertyProducerTest.java | 2 +-
.../myfaces/cdi/bean/ManagedPropertyBean.java | 6 +-
.../java/org/apache/myfaces/cdi/bean/TestBean.java | 4 +-
...FacesConfiguratorDefaultValidatorsTestCase.java | 3 +-
.../myfaces/context/ContextTestRequestWrapper.java | 4 +-
.../myfaces/context/ResponseWrapperSwitchTest.java | 8 +-
.../apache/myfaces/el/CompositeELResolverTest.java | 4 +-
.../apache/myfaces/el/LiteralValueExpression.java | 4 +-
.../convert/ValueBindingToValueExpressionTest.java | 20 +--
.../convert/ValueExpressionToValueBindingTest.java | 10 +-
.../apache/myfaces/el/unified/NoOpElResolver.java | 4 +-
.../el/unified/ResolverBuilderBaseTest.java | 2 +-
.../el/unified/resolver/GuiceResolverTestCase.java | 2 +-
.../unified/resolver/ManagedBeanResolverTest.java | 2 +-
.../core/AbstractMyFacesCDIRequestTestCase.java | 2 +-
.../test/core/AbstractMyFacesRequestTestCase.java | 2 +-
.../mc/test/core/AbstractMyFacesTestCase.java | 8 +-
.../mock/MockDefaultViewDeclarationLanguage.java | 2 +-
.../mc/test/core/mock/MockMyFacesClient.java | 6 +-
.../MockMyFacesFaceletViewDeclarationLanguage.java | 2 +-
.../runner/AbstractJsfRequestTestContainer.java | 2 +-
.../test/core/runner/AbstractJsfTestContainer.java | 12 +-
.../myfaces/mock/MockRenderedValueExpression.java | 2 +-
.../myfaces/renderkit/ErrorPageWriterTest.java | 2 +-
...eturningGetExpressionStringValueExpression.java | 10 +-
.../html/HtmlRolePassedThroughTestCase.java | 2 +-
.../renderkit/html/HtmlTextRendererTest.java | 2 +-
.../myfaces/view/facelets/ExceptionTestCase.java | 2 +-
.../facelets/FaceletMultipleRequestsTestCase.java | 2 +-
.../myfaces/view/facelets/FaceletTestCase.java | 2 +-
.../MockFaceletViewDeclarationLanguage.java | 2 +-
.../facelets/TemplateInResourcesDirTestCase.java | 2 +-
.../view/facelets/component/UIRepeatTest.java | 2 +-
.../CacheELExpressionsAlwaysRecompileTestCase.java | 2 +-
.../facelets/el/CacheELExpressionsTestCase.java | 2 +-
.../el/CompositeComponentELUtilsTestCase.java | 2 +-
.../el/SerializableELExpressionsTestCase.java | 4 +-
.../view/facelets/mock/MockHttpServletRequest.java | 10 +-
.../view/facelets/mock/MockRequestDispatcher.java | 8 +-
.../view/facelets/mock/MockServletContext.java | 2 +-
.../view/facelets/mock/MockServletInputStream.java | 6 +-
.../pool/ViewPoolMyFacesRequestTestCase.java | 2 +-
.../pss/acid/AcidMyFacesRequestTestCase.java | 2 +-
.../CompositeComponentActionListenerTestCase.java | 2 +-
.../CompositeComponentAttributeTestCase.java | 4 +-
.../CompositeComponentBeanValidationTest.java | 2 +-
.../composite/CompositeComponentCCRefTestCase.java | 2 +-
.../CompositeComponentCConIncludeTestCase.java | 2 +-
...ompositeComponentConditionalButtonTestCase.java | 2 +-
...CompositeComponentMethodExpressionTestCase.java | 4 +-
.../CompositeComponentNestedCCTestCase.java | 2 +-
.../tag/composite/CompositeComponentTestCase.java | 4 +-
.../CompositeComponentValidatorTestCase.java | 2 +-
...positeComponentValueChangeListenerTestCase.java | 2 +-
.../facelets/tag/composite/SimpleComponent.java | 2 +-
.../tag/composite/SimpleComponentTagHandler.java | 2 +-
.../tag/jsf/core/ValidateBeanTestCase.java | 3 +-
.../tag/jsf/core/validation/CustomerBean.java | 2 +-
.../view/facelets/tag/jsf/html/HtmlTestCase.java | 2 +-
.../view/facelets/tag/jstl/core/CsetTestCase.java | 2 +-
.../facelets/tag/jstl/core/JstlCoreTestCase.java | 2 +-
.../view/facelets/tag/ui/IncludeParamTestCase.java | 2 +-
.../view/facelets/tag/ui/RepeatTestCase.java | 6 +-
.../myfaces/view/facelets/tag/ui/TestUserTags.java | 2 +-
...sComponentAnnotationMyFacesRequestTestCase.java | 2 +-
.../myfaces/webapp/FacesELContextListenerTest.java | 8 +-
.../myfaces/webapp/Jsp21FacesInitializerTest.java | 8 +-
.../apache/myfaces/webapp/MyFacesServletTest.java | 4 +-
.../webapp/StartupServletContextListenerTest.java | 4 +-
.../myfaces/view/facelets/pss/acid/common.xhtml | 2 +-
parent/pom.xml | 98 ++++++------
shared-public/pom.xml | 12 +-
.../org/apache/myfaces/shared/util/ClassUtils.java | 2 +-
.../myfaces/shared/util/ExternalContextUtils.java | 10 +-
.../apache/myfaces/shared/util/MessageUtils.java | 2 +-
.../shared/util/ParametrizableFacesMessage.java | 2 +-
.../myfaces/shared/util/SelectItemsIterator.java | 2 +-
.../org/apache/myfaces/shared/util/TagUtils.java | 6 +-
shared/pom.xml | 12 +-
.../application/FacesServletMappingUtils.java | 4 +-
.../myfaces/shared/config/MyfacesConfig.java | 2 +-
.../shared/context/AjaxExceptionHandlerImpl.java | 2 +-
.../shared/context/ExceptionHandlerImpl.java | 2 +-
.../myfaces/shared/context/flash/FlashImpl.java | 4 +-
.../myfaces/shared/renderkit/RendererUtils.java | 2 +-
.../shared/renderkit/_SharedRendererUtils.java | 2 +-
.../renderkit/html/HtmlInputFileRendererBase.java | 6 +-
.../renderkit/html/HtmlResponseWriterImpl.java | 2 +-
.../renderkit/html/util/HttpPartWrapper.java | 2 +-
.../resource/ValueExpressionFilterInputStream.java | 6 +-
.../shared/taglib/UIComponentELTagBase.java | 4 +-
.../shared/taglib/UIComponentELTagUtils.java | 6 +-
.../shared/taglib/core/SelectItemTagBase.java | 2 +-
.../org/apache/myfaces/shared/util/StateUtils.java | 2 +-
.../shared/util/servlet/SourceCodeServlet.java | 10 +-
.../shared/view/HttpServletResponseSwitch.java | 8 +-
.../view/JspViewDeclarationLanguageBase.java | 6 +-
.../myfaces/shared/view/ServletResponseSwitch.java | 6 +-
.../shared/view/SwitchableOutputStream.java | 4 +-
.../shared/context/flash/FlashImplTest.java | 8 +-
.../shared/renderkit/RendererUtilsTest.java | 2 +-
test/pom.xml | 5 +-
.../apache/myfaces/test/el/AbstractELResolver.java | 2 +-
.../test/el/FacesImplicitObjectELResolver.java | 6 +-
.../test/el/FacesResourceBundleELResolver.java | 6 +-
.../test/el/FacesScopedAttributeELResolver.java | 4 +-
.../test/el/FacesVariableResolverChainWrapper.java | 4 +-
.../test/el/MockCompositeValueExpression.java | 4 +-
.../org/apache/myfaces/test/el/MockELContext.java | 8 +-
.../myfaces/test/el/MockExpressionFactory.java | 8 +-
.../apache/myfaces/test/el/MockFunctionMapper.java | 2 +-
.../myfaces/test/el/MockMethodExpression.java | 12 +-
.../myfaces/test/el/MockValueExpression.java | 6 +-
.../apache/myfaces/test/el/MockVariableMapper.java | 4 +-
.../test/el/MockVariableValueExpression.java | 6 +-
.../myfaces/test/el/ReservedWordsELResolver.java | 4 +-
.../myfaces/test/mock/MockApplication12.java | 22 +--
.../myfaces/test/mock/MockApplication20.java | 4 +-
.../myfaces/test/mock/MockExceptionHandler.java | 2 +-
.../myfaces/test/mock/MockExternalContext.java | 8 +-
.../myfaces/test/mock/MockExternalContext10.java | 12 +-
.../myfaces/test/mock/MockExternalContext12.java | 6 +-
.../myfaces/test/mock/MockExternalContext20.java | 10 +-
.../myfaces/test/mock/MockFacesContext12.java | 6 +-
.../myfaces/test/mock/MockFacesContextFactory.java | 6 +-
.../org/apache/myfaces/test/mock/MockFlash.java | 4 +-
.../myfaces/test/mock/MockHttpServletRequest.java | 36 ++---
.../myfaces/test/mock/MockHttpServletResponse.java | 6 +-
.../apache/myfaces/test/mock/MockHttpSession.java | 14 +-
.../myfaces/test/mock/MockHttpSessionProxy.java | 8 +-
.../myfaces/test/mock/MockRequestDispatcher.java | 8 +-
.../org/apache/myfaces/test/mock/MockServlet.java | 10 +-
.../myfaces/test/mock/MockServletConfig.java | 4 +-
.../myfaces/test/mock/MockServletContext.java | 26 +--
.../myfaces/test/mock/MockServletInputStream.java | 4 +-
.../myfaces/test/mock/MockServletOutputStream.java | 4 +-
.../myfaces/test/mock/MockServletRegistration.java | 2 +-
.../apache/myfaces/test/mock/MockWebContainer.java | 24 +--
.../myfaces/test/mock/MockedJsfTestContainer.java | 6 +-
.../apache/myfaces/test/mock/_ApplicationMap.java | 2 +-
.../org/apache/myfaces/test/mock/_CookieMap.java | 4 +-
.../java/org/apache/myfaces/test/mock/_ELText.java | 12 +-
.../myfaces/test/mock/_InitParameterMap.java | 2 +-
.../myfaces/test/mock/_RequestHeaderMap.java | 2 +-
.../myfaces/test/mock/_RequestHeaderValuesMap.java | 2 +-
.../org/apache/myfaces/test/mock/_RequestMap.java | 2 +-
.../myfaces/test/mock/_RequestParameterMap.java | 2 +-
.../test/mock/_RequestParameterValuesMap.java | 2 +-
.../org/apache/myfaces/test/mock/_SessionMap.java | 4 +-
.../mock/lifecycle/DefaultRestoreViewSupport.java | 2 +-
666 files changed, 2094 insertions(+), 1916 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index babcdf1..852a2bb 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -609,22 +609,19 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
- <!-- JSP 2.1 -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
</dependency>
-
- <!-- JSTL 1.2 -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</dependency>
- <!-- el 2.2 (javax.el.*) -->
+ <!-- JSTL -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
</dependency>
<!-- bean-validation 1.0 (javax.validation.*) -->
@@ -642,12 +639,14 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
diff --git a/api/src/main/java/jakarta/faces/annotation/ApplicationMap.java b/api/src/main/java/jakarta/faces/annotation/ApplicationMap.java
index 634ac98..86e683a 100644
--- a/api/src/main/java/jakarta/faces/annotation/ApplicationMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/ApplicationMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/FacesConfig.java b/api/src/main/java/jakarta/faces/annotation/FacesConfig.java
index 729f97c..97e87b8 100644
--- a/api/src/main/java/jakarta/faces/annotation/FacesConfig.java
+++ b/api/src/main/java/jakarta/faces/annotation/FacesConfig.java
@@ -23,8 +23,8 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/FlowMap.java b/api/src/main/java/jakarta/faces/annotation/FlowMap.java
index 464534c..599ac2a 100644
--- a/api/src/main/java/jakarta/faces/annotation/FlowMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/FlowMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/HeaderMap.java b/api/src/main/java/jakarta/faces/annotation/HeaderMap.java
index 486b36c..3e68415 100644
--- a/api/src/main/java/jakarta/faces/annotation/HeaderMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/HeaderMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/HeaderValuesMap.java b/api/src/main/java/jakarta/faces/annotation/HeaderValuesMap.java
index 9ddfb21..e0169a8 100644
--- a/api/src/main/java/jakarta/faces/annotation/HeaderValuesMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/HeaderValuesMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/InitParameterMap.java b/api/src/main/java/jakarta/faces/annotation/InitParameterMap.java
index 1789117..ec8cd22 100644
--- a/api/src/main/java/jakarta/faces/annotation/InitParameterMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/InitParameterMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/ManagedProperty.java b/api/src/main/java/jakarta/faces/annotation/ManagedProperty.java
index 0a3c4ab..b0f3524 100644
--- a/api/src/main/java/jakarta/faces/annotation/ManagedProperty.java
+++ b/api/src/main/java/jakarta/faces/annotation/ManagedProperty.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/RequestCookieMap.java b/api/src/main/java/jakarta/faces/annotation/RequestCookieMap.java
index 2890e4a..50d27c6 100644
--- a/api/src/main/java/jakarta/faces/annotation/RequestCookieMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/RequestCookieMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/RequestMap.java b/api/src/main/java/jakarta/faces/annotation/RequestMap.java
index 5de39f0..4feb92b 100644
--- a/api/src/main/java/jakarta/faces/annotation/RequestMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/RequestMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/RequestParameterMap.java b/api/src/main/java/jakarta/faces/annotation/RequestParameterMap.java
index 2a1291c..6b6fdd3 100644
--- a/api/src/main/java/jakarta/faces/annotation/RequestParameterMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/RequestParameterMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/RequestParameterValuesMap.java b/api/src/main/java/jakarta/faces/annotation/RequestParameterValuesMap.java
index 17116c3..560dd80 100644
--- a/api/src/main/java/jakarta/faces/annotation/RequestParameterValuesMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/RequestParameterValuesMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/SessionMap.java b/api/src/main/java/jakarta/faces/annotation/SessionMap.java
index 4038700..d852382 100644
--- a/api/src/main/java/jakarta/faces/annotation/SessionMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/SessionMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/annotation/ViewMap.java b/api/src/main/java/jakarta/faces/annotation/ViewMap.java
index 830559c..e8c9e74 100644
--- a/api/src/main/java/jakarta/faces/annotation/ViewMap.java
+++ b/api/src/main/java/jakarta/faces/annotation/ViewMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/application/Application.java b/api/src/main/java/jakarta/faces/application/Application.java
index 0da320f..53e469c 100644
--- a/api/src/main/java/jakarta/faces/application/Application.java
+++ b/api/src/main/java/jakarta/faces/application/Application.java
@@ -33,11 +33,11 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.el.ELContextListener;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ELContextListener;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.ExternalContext;
@@ -516,10 +516,10 @@ public abstract class Application
*
* <p>
* Call <code>{@link #getExpressionFactory()}</code> then call
- * <code>ExpressionFactory.createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)</code>
+ * <code>ExpressionFactory.createValueExpression(jakarta.el.ELContext, java.lang.String, java.lang.Class)</code>
* passing the argument <code>expression</code> and <code>expectedType</code>. Call
* <code>{@link FacesContext#getELContext()}</code> and pass it to
- * <code>ValueExpression.getValue(javax.el.ELContext)</code>, returning the result.
+ * <code>ValueExpression.getValue(jakarta.el.ELContext)</code>, returning the result.
* </p>
*
* <p>
@@ -527,7 +527,7 @@ public abstract class Application
* the <code>Application</code> continue to work.
* <p>
*
- * @throws javax.el.ELException
+ * @throws jakarta.el.ELException
*/
public <T> T evaluateExpressionGet(FacesContext context, String expression, Class<? extends T> expectedType)
throws ELException
@@ -651,14 +651,14 @@ public abstract class Application
/**
* <p>
- * If no calls have been made to <code>addELContextListener(javax.el.ELContextListener)</code>, this method must
+ * If no calls have been made to <code>addELContextListener(jakarta.el.ELContextListener)</code>, this method must
* return an empty array
* <p>
* .
*
* <p>
* Otherwise, return an array representing the list of listeners added by calls to
- * <code>addELContextListener(javax.el.ELContextListener)</code>.
+ * <code>addELContextListener(jakarta.el.ELContextListener)</code>.
* <p>
*
* <p>
@@ -693,7 +693,7 @@ public abstract class Application
* <code>PropertyResolver ChainWrapper</code> in Chapter 5 in the spec document.</li>
*
* <li>Any <code>ELResolver</code> instances added by calls to
- * <code>{@link #addELResolver(javax.el.ELResolver)}</code>.</li>
+ * <code>{@link #addELResolver(jakarta.el.ELResolver)}</code>.</li>
*
* <li>The default implementation throws <code>UnsupportedOperationException</code> and is provided for the sole
* purpose of not breaking existing applications that extend <code>{@link Application}</code>.</li>
@@ -1077,7 +1077,7 @@ public abstract class Application
* The recommended way to affect the execution of the EL is to provide an <el-resolver> element at the right
* place in the application configuration resources which will be considered in the normal course of expression
* evaluation. This method now will cause the argument resolver to be wrapped inside an implementation of ELResolver
- * and exposed to the EL resolution system as if the user had called addELResolver(javax.el.ELResolver).
+ * and exposed to the EL resolution system as if the user had called addELResolver(jakarta.el.ELResolver).
*
* @deprecated
*/
@@ -1129,7 +1129,7 @@ public abstract class Application
* The recommended way to affect the execution of the EL is to provide an <el-resolver> element at the right
* place in the application configuration resources which will be considered in the normal course of expression
* evaluation. This method now will cause the argument resolver to be wrapped inside an implementation of ELResolver
- * and exposed to the EL resolution system as if the user had called addELResolver(javax.el.ELResolver).
+ * and exposed to the EL resolution system as if the user had called addELResolver(jakarta.el.ELResolver).
*
* @deprecated
*/
diff --git a/api/src/main/java/jakarta/faces/application/ApplicationWrapper.java b/api/src/main/java/jakarta/faces/application/ApplicationWrapper.java
index 152b495..476d24a 100644
--- a/api/src/main/java/jakarta/faces/application/ApplicationWrapper.java
+++ b/api/src/main/java/jakarta/faces/application/ApplicationWrapper.java
@@ -29,11 +29,11 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.el.ELContextListener;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ELContextListener;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.UIComponent;
diff --git a/api/src/main/java/jakarta/faces/application/NavigationCase.java b/api/src/main/java/jakarta/faces/application/NavigationCase.java
index 86b68f0..84803d1 100644
--- a/api/src/main/java/jakarta/faces/application/NavigationCase.java
+++ b/api/src/main/java/jakarta/faces/application/NavigationCase.java
@@ -23,8 +23,8 @@ import java.net.URL;
import java.util.List;
import java.util.Map;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/component/ActionSource2.java b/api/src/main/java/jakarta/faces/component/ActionSource2.java
index 93933e1..eb1c437 100644
--- a/api/src/main/java/jakarta/faces/component/ActionSource2.java
+++ b/api/src/main/java/jakarta/faces/component/ActionSource2.java
@@ -19,7 +19,7 @@
package jakarta.faces.component;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
/**
* See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
diff --git a/api/src/main/java/jakarta/faces/component/UICommand.java b/api/src/main/java/jakarta/faces/component/UICommand.java
index 9e15f82..4e31df1 100644
--- a/api/src/main/java/jakarta/faces/component/UICommand.java
+++ b/api/src/main/java/jakarta/faces/component/UICommand.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.component;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.MethodBinding;
import jakarta.faces.event.AbortProcessingException;
diff --git a/api/src/main/java/jakarta/faces/component/UIComponent.java b/api/src/main/java/jakarta/faces/component/UIComponent.java
index aa12a8b..263be48 100644
--- a/api/src/main/java/jakarta/faces/component/UIComponent.java
+++ b/api/src/main/java/jakarta/faces/component/UIComponent.java
@@ -34,8 +34,8 @@ import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import java.util.Set;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.component.visit.VisitCallback;
diff --git a/api/src/main/java/jakarta/faces/component/UIComponentBase.java b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
index 3a37890..9f18540 100644
--- a/api/src/main/java/jakarta/faces/component/UIComponentBase.java
+++ b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFCompone
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.visit.VisitCallback;
import jakarta.faces.component.visit.VisitContext;
diff --git a/api/src/main/java/jakarta/faces/component/UIData.java b/api/src/main/java/jakarta/faces/component/UIData.java
index b436bf9..7f5bc57 100644
--- a/api/src/main/java/jakarta/faces/component/UIData.java
+++ b/api/src/main/java/jakarta/faces/component/UIData.java
@@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.application.StateManager;
@@ -54,7 +54,7 @@ import jakarta.faces.model.ListDataModel;
import jakarta.faces.model.ResultDataModel;
import jakarta.faces.model.ResultSetDataModel;
import jakarta.faces.model.ScalarDataModel;
-import javax.servlet.jsp.jstl.sql.Result;
+import jakarta.servlet.jsp.jstl.sql.Result;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFacet;
@@ -1612,7 +1612,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
}
/**
- * @deprecated This has been replaced by {@link #setValueExpression(java.lang.String, javax.el.ValueExpression)}.
+ * @deprecated This has been replaced by {@link #setValueExpression(java.lang.String, jakarta.el.ValueExpression)}.
*/
@Override
public void setValueBinding(String name, ValueBinding binding)
@@ -2214,7 +2214,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
* <ul>
* <li>A value of type DataModel is used directly.</li>
* <li>Array-like parameters of type array-of-Object, java.util.List, java.sql.ResultSet or
- * javax.servlet.jsp.jstl.sql.Result are wrapped in a corresponding DataModel that knows how to iterate over the
+ * jakarta.servlet.jsp.jstl.sql.Result are wrapped in a corresponding DataModel that knows how to iterate over the
* elements.</li>
* <li>Other values are wrapped in a DataModel as a single row.</li>
* </ul>
diff --git a/api/src/main/java/jakarta/faces/component/UIGraphic.java b/api/src/main/java/jakarta/faces/component/UIGraphic.java
index d83c2d8..3e0ff46 100644
--- a/api/src/main/java/jakarta/faces/component/UIGraphic.java
+++ b/api/src/main/java/jakarta/faces/component/UIGraphic.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.component;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.el.ValueBinding;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
diff --git a/api/src/main/java/jakarta/faces/component/UIImportConstants.java b/api/src/main/java/jakarta/faces/component/UIImportConstants.java
index 4c52a52..80a2f5c 100644
--- a/api/src/main/java/jakarta/faces/component/UIImportConstants.java
+++ b/api/src/main/java/jakarta/faces/component/UIImportConstants.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.component;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
diff --git a/api/src/main/java/jakarta/faces/component/UIInput.java b/api/src/main/java/jakarta/faces/component/UIInput.java
index 574ec06..1c10c9f 100644
--- a/api/src/main/java/jakarta/faces/component/UIInput.java
+++ b/api/src/main/java/jakarta/faces/component/UIInput.java
@@ -34,7 +34,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFListene
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.event.AbortProcessingException;
import jakarta.faces.event.ExceptionQueuedEvent;
diff --git a/api/src/main/java/jakarta/faces/component/UIOutput.java b/api/src/main/java/jakarta/faces/component/UIOutput.java
index 58aa832..281c9ac 100644
--- a/api/src/main/java/jakarta/faces/component/UIOutput.java
+++ b/api/src/main/java/jakarta/faces/component/UIOutput.java
@@ -19,7 +19,7 @@
package jakarta.faces.component;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
diff --git a/api/src/main/java/jakarta/faces/component/UISelectBoolean.java b/api/src/main/java/jakarta/faces/component/UISelectBoolean.java
index 7b44b17..849adcc 100644
--- a/api/src/main/java/jakarta/faces/component/UISelectBoolean.java
+++ b/api/src/main/java/jakarta/faces/component/UISelectBoolean.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.component;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.el.ValueBinding;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
diff --git a/api/src/main/java/jakarta/faces/component/UISelectMany.java b/api/src/main/java/jakarta/faces/component/UISelectMany.java
index 22f1dd0..adf32f5 100644
--- a/api/src/main/java/jakarta/faces/component/UISelectMany.java
+++ b/api/src/main/java/jakarta/faces/component/UISelectMany.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/component/UISelectOne.java b/api/src/main/java/jakarta/faces/component/UISelectOne.java
index 5640704..aea6c60 100644
--- a/api/src/main/java/jakarta/faces/component/UISelectOne.java
+++ b/api/src/main/java/jakarta/faces/component/UISelectOne.java
@@ -21,7 +21,7 @@ package jakarta.faces.component;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.visit.VisitCallback;
import jakarta.faces.component.visit.VisitContext;
import jakarta.faces.component.visit.VisitResult;
diff --git a/api/src/main/java/jakarta/faces/component/UIViewAction.java b/api/src/main/java/jakarta/faces/component/UIViewAction.java
index d178f7b..5a198bd 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewAction.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewAction.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.component;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.FacesContextWrapper;
import jakarta.faces.el.MethodBinding;
diff --git a/api/src/main/java/jakarta/faces/component/UIViewParameter.java b/api/src/main/java/jakarta/faces/component/UIViewParameter.java
index 0f34104..3af01e9 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewParameter.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewParameter.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/component/UIViewRoot.java b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
index 9dfa6c0..bf06013 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewRoot.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
@@ -33,8 +33,8 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.ProjectStage;
import jakarta.faces.application.StateManager;
diff --git a/api/src/main/java/jakarta/faces/component/_ClassUtils.java b/api/src/main/java/jakarta/faces/component/_ClassUtils.java
index 430cd2d..88b051e 100644
--- a/api/src/main/java/jakarta/faces/component/_ClassUtils.java
+++ b/api/src/main/java/jakarta/faces/component/_ClassUtils.java
@@ -37,7 +37,7 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ExpressionFactory;
+import jakarta.el.ExpressionFactory;
final class _ClassUtils
{
diff --git a/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java b/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
index 05d6102..fc57863 100644
--- a/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
+++ b/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
@@ -35,7 +35,7 @@ import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* <p>
diff --git a/api/src/main/java/jakarta/faces/component/_ComponentUtils.java b/api/src/main/java/jakarta/faces/component/_ComponentUtils.java
index 39c329f..8df2141 100644
--- a/api/src/main/java/jakarta/faces/component/_ComponentUtils.java
+++ b/api/src/main/java/jakarta/faces/component/_ComponentUtils.java
@@ -26,7 +26,7 @@ import jakarta.faces.el.ValueBinding;
import jakarta.faces.validator.Validator;
import jakarta.faces.validator.ValidatorException;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import java.util.Collection;
/**
diff --git a/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
index e2eae8b..45aa150 100644
--- a/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/_DeltaStateHelper.java
@@ -28,7 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* A delta enabled state holder implementing the StateHolder Interface.
diff --git a/api/src/main/java/jakarta/faces/component/_LabeledFacesMessage.java b/api/src/main/java/jakarta/faces/component/_LabeledFacesMessage.java
index 459b57d..e1022bb 100644
--- a/api/src/main/java/jakarta/faces/component/_LabeledFacesMessage.java
+++ b/api/src/main/java/jakarta/faces/component/_LabeledFacesMessage.java
@@ -21,7 +21,7 @@ package jakarta.faces.component;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* This class encapsulates a FacesMessage to evaluate the label expression on render response, where f:loadBundle is
diff --git a/api/src/main/java/jakarta/faces/component/_MessageUtils.java b/api/src/main/java/jakarta/faces/component/_MessageUtils.java
index d05598e..1bdb123 100644
--- a/api/src/main/java/jakarta/faces/component/_MessageUtils.java
+++ b/api/src/main/java/jakarta/faces/component/_MessageUtils.java
@@ -21,7 +21,7 @@ package jakarta.faces.component;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import java.util.Locale;
import java.util.MissingResourceException;
diff --git a/api/src/main/java/jakarta/faces/component/_MethodBindingToMethodExpression.java b/api/src/main/java/jakarta/faces/component/_MethodBindingToMethodExpression.java
index fa3bb59..fe9d018 100644
--- a/api/src/main/java/jakarta/faces/component/_MethodBindingToMethodExpression.java
+++ b/api/src/main/java/jakarta/faces/component/_MethodBindingToMethodExpression.java
@@ -23,12 +23,12 @@ import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.MethodBinding;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
-import javax.el.MethodNotFoundException;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
+import jakarta.el.MethodNotFoundException;
+import jakarta.el.PropertyNotFoundException;
/**
* Converts a MethodBinding to a MethodExpression
diff --git a/api/src/main/java/jakarta/faces/component/_MethodExpressionToMethodBinding.java b/api/src/main/java/jakarta/faces/component/_MethodExpressionToMethodBinding.java
index eac2a06..78e19b3 100644
--- a/api/src/main/java/jakarta/faces/component/_MethodExpressionToMethodBinding.java
+++ b/api/src/main/java/jakarta/faces/component/_MethodExpressionToMethodBinding.java
@@ -24,8 +24,8 @@ import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.MethodBinding;
import jakarta.faces.el.MethodNotFoundException;
-import javax.el.ELException;
-import javax.el.MethodExpression;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
/**
* Converts a MethodExpression to a MethodBinding. See JSF 1.2 spec section 5.8.4
@@ -67,7 +67,7 @@ class _MethodExpressionToMethodBinding extends MethodBinding implements StateHol
{
return methodExpression.getMethodInfo(facesContext.getELContext()).getReturnType();
}
- catch (javax.el.MethodNotFoundException e)
+ catch (jakarta.el.MethodNotFoundException e)
{
throw new MethodNotFoundException(e);
}
@@ -86,7 +86,7 @@ class _MethodExpressionToMethodBinding extends MethodBinding implements StateHol
{
return methodExpression.invoke(facesContext.getELContext(), params);
}
- catch (javax.el.MethodNotFoundException e)
+ catch (jakarta.el.MethodNotFoundException e)
{
throw new MethodNotFoundException(e);
}
diff --git a/api/src/main/java/jakarta/faces/component/_ParametrizableFacesMessage.java b/api/src/main/java/jakarta/faces/component/_ParametrizableFacesMessage.java
index 5fdc851..7c27c2b 100644
--- a/api/src/main/java/jakarta/faces/component/_ParametrizableFacesMessage.java
+++ b/api/src/main/java/jakarta/faces/component/_ParametrizableFacesMessage.java
@@ -25,7 +25,7 @@ import jakarta.faces.el.ValueBinding;
import java.text.MessageFormat;
import java.util.Locale;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* This class encapsulates a FacesMessage to evaluate the label
diff --git a/api/src/main/java/jakarta/faces/component/_SelectItemsIterator.java b/api/src/main/java/jakarta/faces/component/_SelectItemsIterator.java
index 93724c7..339dbbe 100644
--- a/api/src/main/java/jakarta/faces/component/_SelectItemsIterator.java
+++ b/api/src/main/java/jakarta/faces/component/_SelectItemsIterator.java
@@ -31,7 +31,7 @@ import java.util.NoSuchElementException;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
// ATTENTION
// This class is associated with org.apache.myfaces.shared.util.SelectItemsIterator.
diff --git a/api/src/main/java/jakarta/faces/component/_SharedRendererUtils.java b/api/src/main/java/jakarta/faces/component/_SharedRendererUtils.java
index 045407f..6549a0f 100644
--- a/api/src/main/java/jakarta/faces/component/_SharedRendererUtils.java
+++ b/api/src/main/java/jakarta/faces/component/_SharedRendererUtils.java
@@ -38,7 +38,7 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* The util methods in this class are shared between the jakarta.faces.component package and the
diff --git a/api/src/main/java/jakarta/faces/component/_UIWebsocket.java b/api/src/main/java/jakarta/faces/component/_UIWebsocket.java
index 0ee48be..439c09a 100644
--- a/api/src/main/java/jakarta/faces/component/_UIWebsocket.java
+++ b/api/src/main/java/jakarta/faces/component/_UIWebsocket.java
@@ -20,7 +20,7 @@
package jakarta.faces.component;
import java.io.Serializable;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
diff --git a/api/src/main/java/jakarta/faces/component/_ValueBindingToValueExpression.java b/api/src/main/java/jakarta/faces/component/_ValueBindingToValueExpression.java
index beab7da..ae00d25 100644
--- a/api/src/main/java/jakarta/faces/component/_ValueBindingToValueExpression.java
+++ b/api/src/main/java/jakarta/faces/component/_ValueBindingToValueExpression.java
@@ -26,11 +26,11 @@ import jakarta.faces.el.ValueBinding;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.el.ValueExpression;
/**
diff --git a/api/src/main/java/jakarta/faces/component/_ValueExpressionToValueBinding.java b/api/src/main/java/jakarta/faces/component/_ValueExpressionToValueBinding.java
index 083dcd8..bb59175 100644
--- a/api/src/main/java/jakarta/faces/component/_ValueExpressionToValueBinding.java
+++ b/api/src/main/java/jakarta/faces/component/_ValueExpressionToValueBinding.java
@@ -24,8 +24,8 @@ import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.PropertyNotFoundException;
import jakarta.faces.el.ValueBinding;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
/**
* Converter for legacy ValueBinding objects. See JSF 1.2 section 5.8.3
@@ -134,7 +134,7 @@ class _ValueExpressionToValueBinding extends ValueBinding implements StateHolder
{
getNotNullValueExpression().setValue(facesContext.getELContext(), value);
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -152,7 +152,7 @@ class _ValueExpressionToValueBinding extends ValueBinding implements StateHolder
{
return getNotNullValueExpression().isReadOnly(facesContext.getELContext());
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -170,7 +170,7 @@ class _ValueExpressionToValueBinding extends ValueBinding implements StateHolder
{
return getNotNullValueExpression().getValue(facesContext.getELContext());
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -187,7 +187,7 @@ class _ValueExpressionToValueBinding extends ValueBinding implements StateHolder
{
return getNotNullValueExpression().getType(facesContext.getELContext());
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
diff --git a/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java b/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java
index 2055453..1ec6140 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java
@@ -25,7 +25,7 @@ import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHelper;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.AjaxBehaviorListener;
diff --git a/api/src/main/java/jakarta/faces/component/behavior/FacesBehavior.java b/api/src/main/java/jakarta/faces/component/behavior/FacesBehavior.java
index 62682a7..64a455c 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/FacesBehavior.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/FacesBehavior.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* @since 2.0
diff --git a/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
index 29140f8..8877014 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.component.behavior;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHelper;
import jakarta.faces.component.StateHolder;
import jakarta.faces.component.UIComponentBase;
diff --git a/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java b/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
index 4976929..153b9be 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/_DeltaStateHelper.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHelper;
import jakarta.faces.component.StateHolder;
import jakarta.faces.component.UIComponentBase;
diff --git a/api/src/main/java/jakarta/faces/component/html/_ClassUtils.java b/api/src/main/java/jakarta/faces/component/html/_ClassUtils.java
index 43d0002..4c02ce5 100644
--- a/api/src/main/java/jakarta/faces/component/html/_ClassUtils.java
+++ b/api/src/main/java/jakarta/faces/component/html/_ClassUtils.java
@@ -37,7 +37,7 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ExpressionFactory;
+import jakarta.el.ExpressionFactory;
final class _ClassUtils
{
diff --git a/api/src/main/java/jakarta/faces/component/html/_HtmlInputFile.java b/api/src/main/java/jakarta/faces/component/html/_HtmlInputFile.java
index 8cd1105..62ef95e 100644
--- a/api/src/main/java/jakarta/faces/component/html/_HtmlInputFile.java
+++ b/api/src/main/java/jakarta/faces/component/html/_HtmlInputFile.java
@@ -144,9 +144,9 @@ abstract class _HtmlInputFile extends UIInput implements _AccesskeyProperty,
return true;
}
}
- else if (value instanceof javax.servlet.http.Part)
+ else if (value instanceof jakarta.servlet.http.Part)
{
- if (((javax.servlet.http.Part)value).getSize() <= 0)
+ if (((jakarta.servlet.http.Part)value).getSize() <= 0)
{
return true;
}
diff --git a/api/src/main/java/jakarta/faces/component/html/_MessageUtils.java b/api/src/main/java/jakarta/faces/component/html/_MessageUtils.java
index 1b8ee79..715799f 100644
--- a/api/src/main/java/jakarta/faces/component/html/_MessageUtils.java
+++ b/api/src/main/java/jakarta/faces/component/html/_MessageUtils.java
@@ -22,7 +22,7 @@ import jakarta.faces.application.FacesMessage;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import java.util.Locale;
import java.util.MissingResourceException;
diff --git a/api/src/main/java/jakarta/faces/component/html/_ParametrizableFacesMessage.java b/api/src/main/java/jakarta/faces/component/html/_ParametrizableFacesMessage.java
index dde0c64..46eb3ce 100644
--- a/api/src/main/java/jakarta/faces/component/html/_ParametrizableFacesMessage.java
+++ b/api/src/main/java/jakarta/faces/component/html/_ParametrizableFacesMessage.java
@@ -25,7 +25,7 @@ import jakarta.faces.el.ValueBinding;
import java.text.MessageFormat;
import java.util.Locale;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* This class encapsulates a FacesMessage to evaluate the label
diff --git a/api/src/main/java/jakarta/faces/context/FacesContext.java b/api/src/main/java/jakarta/faces/context/FacesContext.java
index 5d33974..0ca0a46 100644
--- a/api/src/main/java/jakarta/faces/context/FacesContext.java
+++ b/api/src/main/java/jakarta/faces/context/FacesContext.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.component.UINamingContainer;
import jakarta.faces.component.UIViewRoot;
diff --git a/api/src/main/java/jakarta/faces/context/FacesContextWrapper.java b/api/src/main/java/jakarta/faces/context/FacesContextWrapper.java
index 6bcc26b..cbacd61 100644
--- a/api/src/main/java/jakarta/faces/context/FacesContextWrapper.java
+++ b/api/src/main/java/jakarta/faces/context/FacesContextWrapper.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.component.UIViewRoot;
diff --git a/api/src/main/java/jakarta/faces/context/RequestCookieMap.java b/api/src/main/java/jakarta/faces/context/RequestCookieMap.java
index 90b9a98..1dfcb67 100644
--- a/api/src/main/java/jakarta/faces/context/RequestCookieMap.java
+++ b/api/src/main/java/jakarta/faces/context/RequestCookieMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* NOTE: This class was not supposed to be here, and instead it should be on jakarta.faces.annotation package in
diff --git a/api/src/main/java/jakarta/faces/context/SessionMap.java b/api/src/main/java/jakarta/faces/context/SessionMap.java
index c92a924..9d54253 100644
--- a/api/src/main/java/jakarta/faces/context/SessionMap.java
+++ b/api/src/main/java/jakarta/faces/context/SessionMap.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* NOTE: This class was not supposed to be here, and instead it should be on jakarta.faces.annotation package in
diff --git a/api/src/main/java/jakarta/faces/convert/FacesConverter.java b/api/src/main/java/jakarta/faces/convert/FacesConverter.java
index 2c2a3b9..5fae057 100644
--- a/api/src/main/java/jakarta/faces/convert/FacesConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/FacesConverter.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* @since 2.0
diff --git a/api/src/main/java/jakarta/faces/convert/NumberConverter.java b/api/src/main/java/jakarta/faces/convert/NumberConverter.java
index 62ca715..101081d 100644
--- a/api/src/main/java/jakarta/faces/convert/NumberConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/NumberConverter.java
@@ -27,7 +27,7 @@ import java.text.ParseException;
import java.util.Currency;
import java.util.Locale;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/convert/_LabeledFacesMessage.java b/api/src/main/java/jakarta/faces/convert/_LabeledFacesMessage.java
index 3084f73..9d1bb6c 100644
--- a/api/src/main/java/jakarta/faces/convert/_LabeledFacesMessage.java
+++ b/api/src/main/java/jakarta/faces/convert/_LabeledFacesMessage.java
@@ -21,7 +21,7 @@ package jakarta.faces.convert;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* This class encapsulates a FacesMessage to evaluate the label expression on render response, where f:loadBundle is
diff --git a/api/src/main/java/jakarta/faces/convert/_MessageUtils.java b/api/src/main/java/jakarta/faces/convert/_MessageUtils.java
index 06a8b9b..ed42c6d 100644
--- a/api/src/main/java/jakarta/faces/convert/_MessageUtils.java
+++ b/api/src/main/java/jakarta/faces/convert/_MessageUtils.java
@@ -22,7 +22,7 @@ import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
diff --git a/api/src/main/java/jakarta/faces/convert/_ParametrizableFacesMessage.java b/api/src/main/java/jakarta/faces/convert/_ParametrizableFacesMessage.java
index f258c33..e2ff219 100644
--- a/api/src/main/java/jakarta/faces/convert/_ParametrizableFacesMessage.java
+++ b/api/src/main/java/jakarta/faces/convert/_ParametrizableFacesMessage.java
@@ -25,7 +25,7 @@ import jakarta.faces.el.ValueBinding;
import java.text.MessageFormat;
import java.util.Locale;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* This class encapsulates a FacesMessage to evaluate the label
diff --git a/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java b/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java
index 946e407..fe08aa2 100644
--- a/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java
+++ b/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.el;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
diff --git a/api/src/main/java/jakarta/faces/event/MethodExpressionActionListener.java b/api/src/main/java/jakarta/faces/event/MethodExpressionActionListener.java
index 5aea9f4..5ef764e 100644
--- a/api/src/main/java/jakarta/faces/event/MethodExpressionActionListener.java
+++ b/api/src/main/java/jakarta/faces/event/MethodExpressionActionListener.java
@@ -19,11 +19,11 @@
package jakarta.faces.event;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.MethodExpression;
-import javax.el.MethodNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodNotFoundException;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/event/MethodExpressionValueChangeListener.java b/api/src/main/java/jakarta/faces/event/MethodExpressionValueChangeListener.java
index 8219466..945fa44 100644
--- a/api/src/main/java/jakarta/faces/event/MethodExpressionValueChangeListener.java
+++ b/api/src/main/java/jakarta/faces/event/MethodExpressionValueChangeListener.java
@@ -18,11 +18,11 @@
*/
package jakarta.faces.event;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.MethodExpression;
-import javax.el.MethodNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodNotFoundException;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/event/WebsocketEvent.java b/api/src/main/java/jakarta/faces/event/WebsocketEvent.java
index 8f552b8..1008490 100644
--- a/api/src/main/java/jakarta/faces/event/WebsocketEvent.java
+++ b/api/src/main/java/jakarta/faces/event/WebsocketEvent.java
@@ -25,8 +25,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.Objects;
-import javax.inject.Qualifier;
-import javax.websocket.CloseReason;
+import jakarta.inject.Qualifier;
+import jakarta.websocket.CloseReason;
/**
*
diff --git a/api/src/main/java/jakarta/faces/flow/Flow.java b/api/src/main/java/jakarta/faces/flow/Flow.java
index ee2ea7d..328d979 100644
--- a/api/src/main/java/jakarta/faces/flow/Flow.java
+++ b/api/src/main/java/jakarta/faces/flow/Flow.java
@@ -39,9 +39,9 @@ public abstract class Flow
public abstract Map<String,Parameter> getInboundParameters();
- public abstract javax.el.MethodExpression getInitializer();
+ public abstract jakarta.el.MethodExpression getInitializer();
- public abstract javax.el.MethodExpression getFinalizer();
+ public abstract jakarta.el.MethodExpression getFinalizer();
public abstract FlowCallNode getFlowCall(Flow targetFlow);
diff --git a/api/src/main/java/jakarta/faces/flow/FlowScoped.java b/api/src/main/java/jakarta/faces/flow/FlowScoped.java
index 862ebe9..c21866a 100644
--- a/api/src/main/java/jakarta/faces/flow/FlowScoped.java
+++ b/api/src/main/java/jakarta/faces/flow/FlowScoped.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
/**
*
diff --git a/api/src/main/java/jakarta/faces/flow/MethodCallNode.java b/api/src/main/java/jakarta/faces/flow/MethodCallNode.java
index dcab0b1..f3420d7 100644
--- a/api/src/main/java/jakarta/faces/flow/MethodCallNode.java
+++ b/api/src/main/java/jakarta/faces/flow/MethodCallNode.java
@@ -26,9 +26,9 @@ import java.util.List;
*/
public abstract class MethodCallNode extends FlowNode
{
- public abstract javax.el.MethodExpression getMethodExpression();
+ public abstract jakarta.el.MethodExpression getMethodExpression();
- public abstract javax.el.ValueExpression getOutcome();
+ public abstract jakarta.el.ValueExpression getOutcome();
public abstract List<Parameter> getParameters();
}
diff --git a/api/src/main/java/jakarta/faces/flow/Parameter.java b/api/src/main/java/jakarta/faces/flow/Parameter.java
index a217ac6..35a60f2 100644
--- a/api/src/main/java/jakarta/faces/flow/Parameter.java
+++ b/api/src/main/java/jakarta/faces/flow/Parameter.java
@@ -26,6 +26,6 @@ public abstract class Parameter
{
public abstract String getName();
- public abstract javax.el.ValueExpression getValue();
+ public abstract jakarta.el.ValueExpression getValue();
}
diff --git a/api/src/main/java/jakarta/faces/flow/builder/FlowBuilder.java b/api/src/main/java/jakarta/faces/flow/builder/FlowBuilder.java
index d3bd36f..89264e2 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/FlowBuilder.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/FlowBuilder.java
@@ -41,16 +41,16 @@ public abstract class FlowBuilder
public abstract FlowCallBuilder flowCallNode(String flowCallNodeId);
- public abstract FlowBuilder initializer(javax.el.MethodExpression methodExpression);
+ public abstract FlowBuilder initializer(jakarta.el.MethodExpression methodExpression);
public abstract FlowBuilder initializer(String methodExpression);
- public abstract FlowBuilder finalizer(javax.el.MethodExpression methodExpression);
+ public abstract FlowBuilder finalizer(jakarta.el.MethodExpression methodExpression);
public abstract FlowBuilder finalizer(String methodExpression);
public abstract FlowBuilder inboundParameter(String name,
- javax.el.ValueExpression value);
+ jakarta.el.ValueExpression value);
public abstract FlowBuilder inboundParameter(String name,
String value);
diff --git a/api/src/main/java/jakarta/faces/flow/builder/FlowBuilderParameter.java b/api/src/main/java/jakarta/faces/flow/builder/FlowBuilderParameter.java
index d61a64c..28be625 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/FlowBuilderParameter.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/FlowBuilderParameter.java
@@ -23,7 +23,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/flow/builder/FlowCallBuilder.java b/api/src/main/java/jakarta/faces/flow/builder/FlowCallBuilder.java
index ba8f3e5..3207883 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/FlowCallBuilder.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/FlowCallBuilder.java
@@ -29,7 +29,7 @@ public abstract class FlowCallBuilder implements NodeBuilder
String flowId);
public abstract FlowCallBuilder outboundParameter(String name,
- javax.el.ValueExpression value);
+ jakarta.el.ValueExpression value);
public abstract FlowCallBuilder outboundParameter(String name,
String value);
diff --git a/api/src/main/java/jakarta/faces/flow/builder/FlowDefinition.java b/api/src/main/java/jakarta/faces/flow/builder/FlowDefinition.java
index 99eb33e..947ab45 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/FlowDefinition.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/FlowDefinition.java
@@ -22,7 +22,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/flow/builder/MethodCallBuilder.java b/api/src/main/java/jakarta/faces/flow/builder/MethodCallBuilder.java
index 3d5939f..42f9c2e 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/MethodCallBuilder.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/MethodCallBuilder.java
@@ -29,7 +29,7 @@ import java.util.List;
public abstract class MethodCallBuilder implements NodeBuilder
{
- public abstract MethodCallBuilder expression(javax.el.MethodExpression me);
+ public abstract MethodCallBuilder expression(jakarta.el.MethodExpression me);
public abstract MethodCallBuilder expression(String methodExpression);
@@ -40,7 +40,7 @@ public abstract class MethodCallBuilder implements NodeBuilder
public abstract MethodCallBuilder defaultOutcome(String outcome);
- public abstract MethodCallBuilder defaultOutcome(javax.el.ValueExpression outcome);
+ public abstract MethodCallBuilder defaultOutcome(jakarta.el.ValueExpression outcome);
public abstract MethodCallBuilder markAsStartNode();
}
diff --git a/api/src/main/java/jakarta/faces/flow/builder/NavigationCaseBuilder.java b/api/src/main/java/jakarta/faces/flow/builder/NavigationCaseBuilder.java
index ddc0e79..2464955 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/NavigationCaseBuilder.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/NavigationCaseBuilder.java
@@ -37,7 +37,7 @@ public abstract class NavigationCaseBuilder
public abstract NavigationCaseBuilder condition(String condition);
- public abstract NavigationCaseBuilder condition(javax.el.ValueExpression condition);
+ public abstract NavigationCaseBuilder condition(jakarta.el.ValueExpression condition);
public abstract NavigationCaseBuilder.RedirectBuilder redirect();
diff --git a/api/src/main/java/jakarta/faces/flow/builder/ReturnBuilder.java b/api/src/main/java/jakarta/faces/flow/builder/ReturnBuilder.java
index 732d4b9..6651754 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/ReturnBuilder.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/ReturnBuilder.java
@@ -26,7 +26,7 @@ public abstract class ReturnBuilder implements NodeBuilder
{
public abstract ReturnBuilder fromOutcome(String outcome);
- public abstract ReturnBuilder fromOutcome(javax.el.ValueExpression outcome);
+ public abstract ReturnBuilder fromOutcome(jakarta.el.ValueExpression outcome);
public abstract ReturnBuilder markAsStartNode();
diff --git a/api/src/main/java/jakarta/faces/flow/builder/SwitchBuilder.java b/api/src/main/java/jakarta/faces/flow/builder/SwitchBuilder.java
index 561313b..289a018 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/SwitchBuilder.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/SwitchBuilder.java
@@ -28,7 +28,7 @@ public abstract class SwitchBuilder implements NodeBuilder
public abstract SwitchCaseBuilder defaultOutcome(String outcome);
- public abstract SwitchCaseBuilder defaultOutcome(javax.el.ValueExpression outcome);
+ public abstract SwitchCaseBuilder defaultOutcome(jakarta.el.ValueExpression outcome);
public abstract SwitchBuilder markAsStartNode();
}
diff --git a/api/src/main/java/jakarta/faces/flow/builder/SwitchCaseBuilder.java b/api/src/main/java/jakarta/faces/flow/builder/SwitchCaseBuilder.java
index 5535b66..48c70a6 100644
--- a/api/src/main/java/jakarta/faces/flow/builder/SwitchCaseBuilder.java
+++ b/api/src/main/java/jakarta/faces/flow/builder/SwitchCaseBuilder.java
@@ -26,7 +26,7 @@ public abstract class SwitchCaseBuilder
{
public abstract SwitchCaseBuilder condition(String expression);
- public abstract SwitchCaseBuilder condition(javax.el.ValueExpression expression);
+ public abstract SwitchCaseBuilder condition(jakarta.el.ValueExpression expression);
public abstract SwitchCaseBuilder fromOutcome(String outcome);
diff --git a/api/src/main/java/jakarta/faces/model/FacesDataModel.java b/api/src/main/java/jakarta/faces/model/FacesDataModel.java
index cf67f15..1dde29a 100644
--- a/api/src/main/java/jakarta/faces/model/FacesDataModel.java
+++ b/api/src/main/java/jakarta/faces/model/FacesDataModel.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/model/ResultDataModel.java b/api/src/main/java/jakarta/faces/model/ResultDataModel.java
index f4e3188..c643c13 100644
--- a/api/src/main/java/jakarta/faces/model/ResultDataModel.java
+++ b/api/src/main/java/jakarta/faces/model/ResultDataModel.java
@@ -20,9 +20,9 @@ package jakarta.faces.model;
import java.util.SortedMap;
-import javax.servlet.jsp.jstl.sql.Result;
+import jakarta.servlet.jsp.jstl.sql.Result;
-//import javax.servlet.jsp.
+//import jakarta.servlet.jsp.
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
*/
diff --git a/api/src/main/java/jakarta/faces/push/Push.java b/api/src/main/java/jakarta/faces/push/Push.java
index 5cf8a87..13f13d7 100644
--- a/api/src/main/java/jakarta/faces/push/Push.java
+++ b/api/src/main/java/jakarta/faces/push/Push.java
@@ -22,8 +22,8 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
/**
*
diff --git a/api/src/main/java/jakarta/faces/validator/BeanValidator.java b/api/src/main/java/jakarta/faces/validator/BeanValidator.java
index 87e433e..0eec32d 100644
--- a/api/src/main/java/jakarta/faces/validator/BeanValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/BeanValidator.java
@@ -30,12 +30,12 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.FunctionMapper;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
+import jakarta.el.VariableMapper;
import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.component.PartialStateHolder;
diff --git a/api/src/main/java/jakarta/faces/validator/FacesValidator.java b/api/src/main/java/jakarta/faces/validator/FacesValidator.java
index f2acd8c..89e2680 100644
--- a/api/src/main/java/jakarta/faces/validator/FacesValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/FacesValidator.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
/**
* @since 2.0
diff --git a/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java b/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java
index 818865e..de58ec0 100644
--- a/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java
@@ -19,8 +19,8 @@
package jakarta.faces.validator;
-import javax.el.ELException;
-import javax.el.MethodExpression;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
import jakarta.faces.component.StateHolder;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/validator/_LabeledFacesMessage.java b/api/src/main/java/jakarta/faces/validator/_LabeledFacesMessage.java
index 242d42e..b491f2c 100644
--- a/api/src/main/java/jakarta/faces/validator/_LabeledFacesMessage.java
+++ b/api/src/main/java/jakarta/faces/validator/_LabeledFacesMessage.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.validator;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/validator/_MessageUtils.java b/api/src/main/java/jakarta/faces/validator/_MessageUtils.java
index 22dabf4..8b34f1c 100644
--- a/api/src/main/java/jakarta/faces/validator/_MessageUtils.java
+++ b/api/src/main/java/jakarta/faces/validator/_MessageUtils.java
@@ -25,7 +25,7 @@ import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.component.UIComponent;
diff --git a/api/src/main/java/jakarta/faces/validator/_ParametrizableFacesMessage.java b/api/src/main/java/jakarta/faces/validator/_ParametrizableFacesMessage.java
index bcf2cb1..4fc3b90 100644
--- a/api/src/main/java/jakarta/faces/validator/_ParametrizableFacesMessage.java
+++ b/api/src/main/java/jakarta/faces/validator/_ParametrizableFacesMessage.java
@@ -21,7 +21,7 @@ package jakarta.faces.validator;
import java.text.MessageFormat;
import java.util.Locale;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.ValueBinding;
diff --git a/api/src/main/java/jakarta/faces/view/ViewScoped.java b/api/src/main/java/jakarta/faces/view/ViewScoped.java
index 0be518e..70f6daf 100644
--- a/api/src/main/java/jakarta/faces/view/ViewScoped.java
+++ b/api/src/main/java/jakarta/faces/view/ViewScoped.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
/**
* This is the CDI successor of {@link jakarta.faces.bean.ViewScoped}.
diff --git a/api/src/main/java/jakarta/faces/view/facelets/DelegatingMetaTagHandler.java b/api/src/main/java/jakarta/faces/view/facelets/DelegatingMetaTagHandler.java
index 9057213..f9d0998 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/DelegatingMetaTagHandler.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/DelegatingMetaTagHandler.java
@@ -22,7 +22,7 @@ import jakarta.faces.FacesException;
import jakarta.faces.FactoryFinder;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.component.UIComponent;
diff --git a/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java b/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
index a6087b8..5509b9b 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
@@ -21,10 +21,10 @@ package jakarta.faces.view.facelets;
import java.io.IOException;
import java.net.URL;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
-import javax.el.FunctionMapper;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.FunctionMapper;
+import jakarta.el.VariableMapper;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
diff --git a/api/src/main/java/jakarta/faces/view/facelets/FaceletHandler.java b/api/src/main/java/jakarta/faces/view/facelets/FaceletHandler.java
index 06362df..85e8a3b 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/FaceletHandler.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/FaceletHandler.java
@@ -37,7 +37,7 @@ public interface FaceletHandler
* @throws IOException
* @throws jakarta.faces.FacesException
* @throws FaceletException
- * @throws javax.el.ELException
+ * @throws jakarta.el.ELException
*/
public void apply(FaceletContext ctx, UIComponent parent) throws IOException;
}
diff --git a/api/src/main/java/jakarta/faces/view/facelets/TagAttribute.java b/api/src/main/java/jakarta/faces/view/facelets/TagAttribute.java
index e1d66c6..f4e8413 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/TagAttribute.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/TagAttribute.java
@@ -20,8 +20,8 @@ package jakarta.faces.view.facelets;
import jakarta.faces.view.Location;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
/**
* Representation of a Tag's attribute in a Facelet File
@@ -74,7 +74,7 @@ public abstract class TagAttribute
/**
* Create a MethodExpression, using this attribute's value as the expression String.
*
- * @see javax.el.ExpressionFactory#createMethodExpression(javax.el.ELContext, java.lang.String, java.lang.Class,
+ * @see jakarta.el.ExpressionFactory#createMethodExpression(jakarta.el.ELContext, java.lang.String, java.lang.Class,
* java.lang.Class[])
* @see MethodExpression
* @param ctx
@@ -108,8 +108,8 @@ public abstract class TagAttribute
* If literal, simply coerce our String literal value using an ExpressionFactory, otherwise create a ValueExpression
* and evaluate it.
*
- * @see javax.el.ExpressionFactory#coerceToType(java.lang.Object, java.lang.Class)
- * @see javax.el.ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
+ * @see jakarta.el.ExpressionFactory#coerceToType(java.lang.Object, java.lang.Class)
+ * @see jakarta.el.ExpressionFactory#createValueExpression(jakarta.el.ELContext, java.lang.String, java.lang.Class)
* @see ValueExpression
* @param ctx
* FaceletContext to use
@@ -146,7 +146,7 @@ public abstract class TagAttribute
/**
* Create a ValueExpression, using this attribute's literal value and the passed expected type.
*
- * @see javax.el.ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
+ * @see jakarta.el.ExpressionFactory#createValueExpression(jakarta.el.ELContext, java.lang.String, java.lang.Class)
* @see ValueExpression
* @param ctx
* FaceletContext to use
diff --git a/api/src/main/java/jakarta/faces/webapp/AttributeTag.java b/api/src/main/java/jakarta/faces/webapp/AttributeTag.java
index 5bc1379..17944e0 100644
--- a/api/src/main/java/jakarta/faces/webapp/AttributeTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/AttributeTag.java
@@ -22,9 +22,9 @@ import jakarta.faces.el.ValueBinding;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
diff --git a/api/src/main/java/jakarta/faces/webapp/ConverterELTag.java b/api/src/main/java/jakarta/faces/webapp/ConverterELTag.java
index 8be2930..828377f 100644
--- a/api/src/main/java/jakarta/faces/webapp/ConverterELTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/ConverterELTag.java
@@ -21,9 +21,9 @@ package jakarta.faces.webapp;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.ValueHolder;
import jakarta.faces.convert.Converter;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* @since 1.2
diff --git a/api/src/main/java/jakarta/faces/webapp/ConverterTag.java b/api/src/main/java/jakarta/faces/webapp/ConverterTag.java
index 75f0d03..43bbe2e 100644
--- a/api/src/main/java/jakarta/faces/webapp/ConverterTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/ConverterTag.java
@@ -25,9 +25,9 @@ import jakarta.faces.component.UIComponent;
import jakarta.faces.component.ValueHolder;
import jakarta.faces.convert.Converter;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
diff --git a/api/src/main/java/jakarta/faces/webapp/FacesServlet.java b/api/src/main/java/jakarta/faces/webapp/FacesServlet.java
index d0f2400..cc147b3 100644
--- a/api/src/main/java/jakarta/faces/webapp/FacesServlet.java
+++ b/api/src/main/java/jakarta/faces/webapp/FacesServlet.java
@@ -29,14 +29,14 @@ import jakarta.faces.context.FacesContext;
import jakarta.faces.context.FacesContextFactory;
import jakarta.faces.lifecycle.Lifecycle;
import jakarta.faces.lifecycle.LifecycleFactory;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
/**
diff --git a/api/src/main/java/jakarta/faces/webapp/FacetTag.java b/api/src/main/java/jakarta/faces/webapp/FacetTag.java
index af47cd1..3080836 100644
--- a/api/src/main/java/jakarta/faces/webapp/FacetTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/FacetTag.java
@@ -18,8 +18,8 @@
*/
package jakarta.faces.webapp;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* This tag adds its child as a facet of the nearest parent UIComponent. A child consisting of multiple elements should
diff --git a/api/src/main/java/jakarta/faces/webapp/PreJsf2ExceptionHandlerFactory.java b/api/src/main/java/jakarta/faces/webapp/PreJsf2ExceptionHandlerFactory.java
index 89ede63..24f0e4e 100644
--- a/api/src/main/java/jakarta/faces/webapp/PreJsf2ExceptionHandlerFactory.java
+++ b/api/src/main/java/jakarta/faces/webapp/PreJsf2ExceptionHandlerFactory.java
@@ -31,7 +31,7 @@ import java.util.Queue;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UpdateModelException;
diff --git a/api/src/main/java/jakarta/faces/webapp/UIComponentClassicTagBase.java b/api/src/main/java/jakarta/faces/webapp/UIComponentClassicTagBase.java
index b7cb099..290cbdd 100644
--- a/api/src/main/java/jakarta/faces/webapp/UIComponentClassicTagBase.java
+++ b/api/src/main/java/jakarta/faces/webapp/UIComponentClassicTagBase.java
@@ -37,14 +37,14 @@ import jakarta.faces.component.UIOutput;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.FacesContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.LoopTag;
-import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTag;
-import javax.servlet.jsp.tagext.JspIdConsumer;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.jstl.core.LoopTag;
+import jakarta.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.tagext.BodyTag;
+import jakarta.servlet.jsp.tagext.JspIdConsumer;
+import jakarta.servlet.jsp.tagext.Tag;
/**
* @since 1.2
@@ -894,7 +894,7 @@ public abstract class UIComponentClassicTagBase extends UIComponentTagBase imple
//private boolean isIncludedOrForwarded() {
// return getFacesContext().getExternalContext().getRequestMap().
- // containsKey("javax.servlet.include.request_uri");
+ // containsKey("jakarta.servlet.include.request_uri");
//}
/** Generate diagnostic output. */
diff --git a/api/src/main/java/jakarta/faces/webapp/UIComponentELTag.java b/api/src/main/java/jakarta/faces/webapp/UIComponentELTag.java
index d32d681..2752134 100644
--- a/api/src/main/java/jakarta/faces/webapp/UIComponentELTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/UIComponentELTag.java
@@ -20,12 +20,12 @@ package jakarta.faces.webapp;
import jakarta.faces.application.Application;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* Base class for all JSP tags that represent a JSF UIComponent.
diff --git a/api/src/main/java/jakarta/faces/webapp/UIComponentTag.java b/api/src/main/java/jakarta/faces/webapp/UIComponentTag.java
index 0d6b683..2259bfb 100644
--- a/api/src/main/java/jakarta/faces/webapp/UIComponentTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/UIComponentTag.java
@@ -23,9 +23,9 @@ import jakarta.faces.el.ValueBinding;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
/**
* Base class for all JSP tags that represent a JSF UIComponent.
diff --git a/api/src/main/java/jakarta/faces/webapp/UIComponentTagBase.java b/api/src/main/java/jakarta/faces/webapp/UIComponentTagBase.java
index e4f9631..f403226 100644
--- a/api/src/main/java/jakarta/faces/webapp/UIComponentTagBase.java
+++ b/api/src/main/java/jakarta/faces/webapp/UIComponentTagBase.java
@@ -21,10 +21,10 @@ package jakarta.faces.webapp;
import java.util.logging.Logger;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
-import javax.servlet.jsp.tagext.JspTag;
+import jakarta.servlet.jsp.tagext.JspTag;
/**
* @since 1.2
diff --git a/api/src/main/java/jakarta/faces/webapp/ValidatorELTag.java b/api/src/main/java/jakarta/faces/webapp/ValidatorELTag.java
index f9dacf0..bc51d6f 100644
--- a/api/src/main/java/jakarta/faces/webapp/ValidatorELTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/ValidatorELTag.java
@@ -22,9 +22,9 @@ import jakarta.faces.validator.Validator;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIComponent;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
public abstract class ValidatorELTag extends TagSupport
{
diff --git a/api/src/main/java/jakarta/faces/webapp/ValidatorTag.java b/api/src/main/java/jakarta/faces/webapp/ValidatorTag.java
index 0809ad4..850b8e4 100644
--- a/api/src/main/java/jakarta/faces/webapp/ValidatorTag.java
+++ b/api/src/main/java/jakarta/faces/webapp/ValidatorTag.java
@@ -25,9 +25,9 @@ import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
/**
* see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -116,11 +116,11 @@ public class ValidatorTag extends TagSupport
/**
*
* @param binding
- * @throws javax.servlet.jsp.JspException
+ * @throws jakarta.servlet.jsp.JspException
*
* @deprecated
*/
- public void setBinding(java.lang.String binding) throws javax.servlet.jsp.JspException
+ public void setBinding(java.lang.String binding) throws jakarta.servlet.jsp.JspException
{
if (binding != null && !UIComponentTag.isValueReference(binding))
{
diff --git a/api/src/main/java/jakarta/faces/webapp/_PageContextOutWriter.java b/api/src/main/java/jakarta/faces/webapp/_PageContextOutWriter.java
index f7faf9d..bfc2ce0 100644
--- a/api/src/main/java/jakarta/faces/webapp/_PageContextOutWriter.java
+++ b/api/src/main/java/jakarta/faces/webapp/_PageContextOutWriter.java
@@ -18,7 +18,7 @@
*/
package jakarta.faces.webapp;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
import java.io.IOException;
import java.io.Writer;
diff --git a/api/src/main/resources/META-INF/componentClass20.vm b/api/src/main/resources/META-INF/componentClass20.vm
index 68ec31a..84986eb 100644
--- a/api/src/main/resources/META-INF/componentClass20.vm
+++ b/api/src/main/resources/META-INF/componentClass20.vm
@@ -36,7 +36,7 @@ package ${component.packageName};
#if ($component.className.startsWith("jakarta.faces.component.html"))
import jakarta.faces.el.ValueBinding;
#end
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.component.behavior.ClientBehavior;
import jakarta.faces.application.FacesMessage;
diff --git a/impl-test/pom.xml b/impl-test/pom.xml
index 16749af..3d8202b 100644
--- a/impl-test/pom.xml
+++ b/impl-test/pom.xml
@@ -30,7 +30,7 @@
<name>Apache MyFaces JSF-3.0 Impl Test</name>
<properties>
- <openwebbeans.version>1.2.1</openwebbeans.version>
+ <openwebbeans.version>2.0.16</openwebbeans.version>
</properties>
<build>
@@ -178,46 +178,106 @@
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</dependency>
<!-- Openwebbeans for CDI Test -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0</version>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>${openwebbeans.version}</version>
<optional>true</optional>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>${openwebbeans.version}</version>
<optional>true</optional>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<version>${openwebbeans.version}</version>
<optional>true</optional>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
<version>${openwebbeans.version}</version>
<optional>true</optional>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-clustering</artifactId>
+ <artifactId>openwebbeans-el22</artifactId>
<version>${openwebbeans.version}</version>
<optional>true</optional>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesCDIRequestTestCase.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesCDIRequestTestCase.java
index 3bb2f45..f3d34a7 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesCDIRequestTestCase.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesCDIRequestTestCase.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.mc.test.core;
import jakarta.faces.FacesException;
import jakarta.faces.context.ExternalContext;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.spi.InjectionProvider;
import org.apache.myfaces.spi.InjectionProviderException;
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesRequestTestCase.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesRequestTestCase.java
index c4f4a87..dfc7fc2 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesRequestTestCase.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesRequestTestCase.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import jakarta.faces.application.Application;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
-import javax.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestEvent;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.apache.myfaces.test.mock.MockHttpServletResponse;
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
index 61a93d5..2b8cdcc 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/AbstractMyFacesTestCase.java
@@ -35,7 +35,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ExpressionFactory;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.FacesException;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.Application;
@@ -57,9 +57,9 @@ import jakarta.faces.lifecycle.LifecycleFactory;
import jakarta.faces.view.ViewDeclarationLanguage;
import jakarta.faces.webapp.FacesServlet;
import javax.naming.Context;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.config.ConfigFilesXmlValidationUtils;
import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguage.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguage.java
index 8caa34b..77f4279 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguage.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockDefaultViewDeclarationLanguage.java
@@ -35,7 +35,7 @@ import jakarta.faces.render.RenderKitFactory;
import jakarta.faces.view.StateManagementStrategy;
import jakarta.faces.view.ViewDeclarationLanguage;
import jakarta.faces.view.ViewMetadata;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.shared.application.InvalidViewIdException;
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesClient.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesClient.java
index e888752..321c377 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesClient.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesClient.java
@@ -34,9 +34,9 @@ import jakarta.faces.component.visit.VisitResult;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.PartialViewContext;
import jakarta.faces.render.ResponseStateManager;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.mc.test.core.AbstractMyFacesRequestTestCase;
import org.apache.myfaces.shared.renderkit.RendererUtils;
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
index 8751009..d16ba20 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/mock/MockMyFacesFaceletViewDeclarationLanguage.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.component.UIViewRoot;
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfRequestTestContainer.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfRequestTestContainer.java
index a49e552..fc989a1 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfRequestTestContainer.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfRequestTestContainer.java
@@ -24,7 +24,7 @@ import jakarta.faces.FacesException;
import jakarta.faces.application.Application;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
-import javax.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestEvent;
import org.apache.myfaces.mc.test.core.mock.MockMyFacesClient;
import org.apache.myfaces.mc.test.core.mock.ServletMockContainer;
import org.apache.myfaces.mc.test.core.annotation.AfterRequest;
diff --git a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
index 2b08e0c..8329686 100644
--- a/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
+++ b/impl-test/src/main/java/org/apache/myfaces/mc/test/core/runner/AbstractJsfTestContainer.java
@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ExpressionFactory;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.FacesException;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.Application;
@@ -55,10 +55,10 @@ import jakarta.faces.lifecycle.LifecycleFactory;
import jakarta.faces.view.ViewDeclarationLanguage;
import jakarta.faces.webapp.FacesServlet;
import javax.naming.Context;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.config.ConfigFilesXmlValidationUtils;
import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
import org.apache.myfaces.config.RuntimeConfig;
@@ -1593,7 +1593,7 @@ public class AbstractJsfTestContainer
}
private static final String CDI_SERVLET_CONTEXT_BEAN_MANAGER_ATTRIBUTE =
- "javax.enterprise.inject.spi.BeanManager";
+ "jakarta.enterprise.inject.spi.BeanManager";
protected void initCDIIntegration(
ServletContext servletContext, ExternalContext externalContext)
diff --git a/impl/pom.xml b/impl/pom.xml
index fd2b5e4..97f5a2d 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -35,7 +35,7 @@
<url>http://myfaces.apache.org/core23/myfaces-impl</url>
<properties>
- <openwebbeans.version>1.6.3</openwebbeans.version>
+ <openwebbeans.version>2.0.16</openwebbeans.version>
</properties>
<build>
@@ -1145,27 +1145,20 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
-
- <!-- JSP 2.1 -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
</dependency>
-
- <!-- JSTL 1.2 -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</dependency>
- <!-- el 2.2 (javax.el.*) -->
- <!--
- NOTE that we are also compatible with el 1.0, but we need to use el 2.2 as
- compile-dependency, because our ValueExpression wrappers need to support getValueReference().
- -->
+
+ <!-- JSTL -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
</dependency>
<!-- bean-validation 1.0 (javax.validation.*) -->
@@ -1178,7 +1171,8 @@
<!-- annotations 1.2 (javax.annotation.*) -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<!-- jpa 3.0 - needed in AllAnnotationLifecycleProvider -->
@@ -1195,10 +1189,11 @@
<optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
</dependency>
- <!-- CDI -->
+ <!-- CDI -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<!-- builder-annotations like @JSFWebConfigParam -->
@@ -1207,16 +1202,17 @@
<artifactId>myfaces-builder-annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <classifier>jakarta</classifier>
+ </dependency>
- <!-- Websockets -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-websocket-api</artifactId>
- </dependency>
+ <!-- Websockets -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket-api</artifactId>
+ </dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -1281,63 +1277,107 @@
<artifactId>easymockclassextension</artifactId>
</dependency>
- <!-- We need a real EL implementation for test ui:param tag,
- because myfaces-test MockExpressionFactory is not designed to
- handle VariableMapper stuff (see IncludeParamTestCase). Needed
- to update to 7.0.0 for method invocation to work. Later
- versions cause failures and would require org.apache.el.parser.SKIP_IDENTIFIER_CHECK=true
- to be set.-->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>7.0.0</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>7.0.0</version>
- <scope>test</scope>
+ <version>10.0.0-M4</version>
+ <scope>test</scope>
</dependency>
<!-- Openwebbeans for CDI Test -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
<scope>test</scope>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<version>${openwebbeans.version}</version>
<scope>test</scope>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>${openwebbeans.version}</version>
<scope>test</scope>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<version>${openwebbeans.version}</version>
<scope>test</scope>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
<version>${openwebbeans.version}</version>
<scope>test</scope>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!--
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-clustering</artifactId>
+ <artifactId>openwebbeans-el22</artifactId>
<version>${openwebbeans.version}</version>
<scope>test</scope>
- </dependency>-->
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.bval</groupId>
diff --git a/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
index 7958806..6a3f1ce 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.application;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.application.Application;
import jakarta.faces.application.ConfigurableNavigationHandler;
import jakarta.faces.application.NavigationCase;
diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index 7d5e011..e4de57a 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -37,14 +37,14 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.CompositeELResolver;
-import javax.el.ELContext;
-import javax.el.ELContextListener;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELContextListener;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.FacesWrapper;
import jakarta.faces.application.Application;
diff --git a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
index 5531eda..fb6a041 100755
--- a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
@@ -34,7 +34,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.ConfigurableNavigationHandler;
import jakarta.faces.application.FacesMessage;
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index dfbeda7..3b79881 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -36,7 +36,7 @@ import jakarta.faces.application.ResourceHandler;
import jakarta.faces.application.ResourceWrapper;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
index e339e3f..ae020a2 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
@@ -48,7 +48,7 @@ import jakarta.faces.render.ResponseStateManager;
import jakarta.faces.view.ViewDeclarationLanguage;
import jakarta.faces.view.ViewDeclarationLanguageFactory;
import jakarta.faces.view.ViewMetadata;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.application.viewstate.StateCacheUtils;
import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
diff --git a/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java b/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java
index 2172a7b..fb469a1 100644
--- a/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java
+++ b/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletRequest.java
@@ -31,13 +31,13 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpSession;
/**
* @author Werner Punz (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java b/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java
index e7abffc..79acf2e 100644
--- a/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java
+++ b/impl/src/main/java/org/apache/myfaces/application/_SystemEventServletResponse.java
@@ -22,8 +22,8 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
/**
* @author Werner Punz (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java b/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
index 6119489..8121a85 100644
--- a/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.application.jsp;
import org.apache.myfaces.shared.view.ViewResponseWrapper;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import java.io.ByteArrayOutputStream;
import java.io.CharArrayWriter;
import java.io.IOException;
@@ -32,7 +32,7 @@ import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
-import javax.servlet.WriteListener;
+import jakarta.servlet.WriteListener;
/**
* @author Bruno Aranda (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolder.java
index c6e2368..af32c7e 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolder.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.cdi;
-import javax.enterprise.context.ApplicationScoped;
-import javax.servlet.ServletContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.servlet.ServletContext;
/**
* This bean is used to store the ServletContext, so CDI beans can get it later. This is
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolderExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolderExtension.java
index 7c92f19..5db5898 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolderExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/JsfApplicationArtifactHolderExtension.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.cdi;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
public class JsfApplicationArtifactHolderExtension implements Extension
{
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactFlowMapProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactFlowMapProducer.java
index 763ea43..6383d2f 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactFlowMapProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactFlowMapProducer.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.cdi;
import java.lang.reflect.Type;
import java.util.Map;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.faces.annotation.FlowMap;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.FlowScoped;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
index 786fbe1..0b65104 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducer.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.cdi;
import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
import jakarta.faces.annotation.ApplicationMap;
import jakarta.faces.annotation.HeaderMap;
import jakarta.faces.annotation.HeaderValuesMap;
@@ -37,7 +37,7 @@ import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.Flash;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.apache.myfaces.cdi.scope.FacesScoped;
import org.apache.myfaces.cdi.scope.ViewTransientScoped;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java
index 15baeb8..8c23ec7 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/JsfArtifactProducerExtension.java
@@ -18,13 +18,13 @@
*/
package org.apache.myfaces.cdi;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterTypeDiscovery;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterTypeDiscovery;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
import jakarta.faces.annotation.FacesConfig;
public class JsfArtifactProducerExtension implements Extension
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorAnnotationLiteral.java b/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorAnnotationLiteral.java
index fb451b7..38c1785 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorAnnotationLiteral.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorAnnotationLiteral.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.cdi.behavior;
import java.util.Objects;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.faces.component.behavior.FacesBehavior;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java
index 71d09db..17513c1 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorExtension.java
@@ -22,12 +22,12 @@ package org.apache.myfaces.cdi.behavior;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import jakarta.faces.component.behavior.FacesBehavior;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorProducer.java
index 10fa9a9..ad93662 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/behavior/FacesBehaviorProducer.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.cdi.behavior;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.FacesException;
import jakarta.faces.component.behavior.Behavior;
import org.apache.myfaces.cdi.util.AbstractDynamicProducer;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java
index 47c60cf..9fd45ce 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigBeanHolder.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.cdi.config;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import jakarta.faces.annotation.FacesConfig;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
index 23cb609..ab03ddc 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
@@ -19,14 +19,14 @@
package org.apache.myfaces.cdi.config;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import jakarta.faces.annotation.FacesConfig;
import org.apache.myfaces.cdi.util.CDIUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterAnnotationLiteral.java b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterAnnotationLiteral.java
index 6eddd8f..fe745ee 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterAnnotationLiteral.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterAnnotationLiteral.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.cdi.converter;
import java.util.Objects;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.faces.convert.FacesConverter;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java
index 13ccb8d..b93eb5d 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.cdi.converter;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.TypeLiteral;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterExtension.java
index 23e0dc4..00299c0 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterExtension.java
@@ -22,12 +22,12 @@ package org.apache.myfaces.cdi.converter;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import jakarta.faces.convert.FacesConverter;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterProducer.java
index 8c91660..64ed1f2 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterProducer.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.cdi.converter;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.FacesException;
import jakarta.faces.convert.Converter;
import org.apache.myfaces.cdi.util.AbstractDynamicProducer;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIAnnotationInjectionProvider.java
index a627971..34bf86e 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIAnnotationInjectionProvider.java
@@ -22,10 +22,10 @@ import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.spi.InjectionProvider;
import org.apache.myfaces.spi.InjectionProviderException;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
import jakarta.faces.context.ExternalContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java
index ee819b2..e822005 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/impl/CDIManagedBeanHandlerImpl.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.cdi.impl;
import java.util.Map;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.cdi.util.BeanProvider;
import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.cdi.JsfApplicationArtifactHolder;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyExtension.java
index ee72d54..d366c00 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyExtension.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.cdi.managedproperty;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import jakarta.faces.annotation.ManagedProperty;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java
index fe294b8..804b456 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java
@@ -20,10 +20,10 @@
package org.apache.myfaces.cdi.managedproperty;
import java.lang.reflect.ParameterizedType;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.faces.FacesException;
import jakarta.faces.annotation.ManagedProperty;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/model/DataModelBuilderProxy.java b/impl/src/main/java/org/apache/myfaces/cdi/model/DataModelBuilderProxy.java
index 359d478..66a9cbd 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/model/DataModelBuilderProxy.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/model/DataModelBuilderProxy.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.cdi.model;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.FacesContext;
import jakarta.faces.model.DataModel;
import org.apache.myfaces.cdi.util.CDIUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/model/DynamicDataModelProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/model/DynamicDataModelProducer.java
index 1dd1425..c304a6f 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/model/DynamicDataModelProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/model/DynamicDataModelProducer.java
@@ -20,10 +20,10 @@
package org.apache.myfaces.cdi.model;
import java.util.Map;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.model.DataModel;
import org.apache.myfaces.cdi.util.AbstractDynamicProducer;
import org.apache.myfaces.cdi.util.CDIUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelAnnotationLiteral.java b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelAnnotationLiteral.java
index 2f8a78a..d659c2e 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelAnnotationLiteral.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelAnnotationLiteral.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.cdi.model;
import java.util.Objects;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.faces.model.FacesDataModel;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelClassBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelClassBeanHolder.java
index afd275a..d415585 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelClassBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelClassBeanHolder.java
@@ -24,7 +24,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import jakarta.faces.FacesException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.model.DataModel;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java
index 4103e6b..c0fb629 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java
@@ -23,15 +23,15 @@ import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.event.Observes;
-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.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+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.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import jakarta.faces.model.DataModel;
import jakarta.faces.model.FacesDataModel;
import org.apache.myfaces.cdi.util.CDIUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java
index 02b9754..9697577 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopeBeanHolder.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.cdi.scope;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
import org.apache.myfaces.cdi.util.ContextualStorage;
@@ -111,7 +111,7 @@ public class FacesScopeBeanHolder
* a new empty one.
* This method can be used to properly destroy the WindowBeanHolder beans
* without having to sync heavily. Any
- * {@link javax.enterprise.inject.spi.Bean#destroy(Object, javax.enterprise.context.spi.CreationalContext)}
+ * {@link jakarta.enterprise.inject.spi.Bean#destroy(Object, jakarta.enterprise.context.spi.CreationalContext)}
* should be performed on the returned old storage map.
* @return the old storageMap.
*/
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java b/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java
index 0bf81ae..c459506 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScoped.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java
index 438c79c..a07a975 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/scope/FacesScopedContextImpl.java
@@ -20,13 +20,13 @@ package org.apache.myfaces.cdi.scope;
import java.lang.annotation.Annotation;
import java.util.Map;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
import org.apache.myfaces.cdi.util.ContextualStorage;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java
index 7a7f424..45fdfbf 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/scope/ScopeExtension.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.cdi.scope;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
public class ScopeExtension implements Extension
{
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java
index fc2862c..089f2e4 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopeBeanHolder.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.cdi.scope;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
import org.apache.myfaces.cdi.util.ContextualStorage;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java b/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java
index 04c12aa..82f4601 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScoped.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.context.NormalScope;
+import jakarta.enterprise.context.NormalScope;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java
index 47f79ce..e3894cf 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/scope/ViewTransientScopedContextImpl.java
@@ -20,13 +20,13 @@ package org.apache.myfaces.cdi.scope;
import java.lang.annotation.Annotation;
import java.util.Map;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
import org.apache.myfaces.cdi.util.ContextualStorage;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractContext.java b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractContext.java
index de47a13..723f300 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractContext.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractContext.java
@@ -19,12 +19,12 @@
package org.apache.myfaces.cdi.util;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.util.Map;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
index 52068a0..6530eaf 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
@@ -26,12 +26,12 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Function;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
// Inspired by Mojarra's CdiProducer
public abstract class AbstractDynamicProducer<T> implements Bean<T>, PassivationCapable, Serializable
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/AnyLiteral.java b/impl/src/main/java/org/apache/myfaces/cdi/util/AnyLiteral.java
index da23ae5..ea9c20d 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/AnyLiteral.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/AnyLiteral.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.cdi.util;
-import javax.enterprise.inject.Any;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
- * Literal for the {@link javax.enterprise.inject.Any} annotation.
+ * Literal for the {@link jakarta.enterprise.inject.Any} annotation.
*
* NOTE: Taken from Apache DeltaSpike
*/
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java b/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java
index 0681f6b..a0902dc 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/BeanProvider.java
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.cdi.util;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.util.Arrays;
import java.util.Set;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/CDIUtils.java b/impl/src/main/java/org/apache/myfaces/cdi/util/CDIUtils.java
index f887f00..1829313 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/CDIUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/CDIUtils.java
@@ -22,13 +22,13 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.Set;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.context.spi.Context;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.view.ViewScoped;
import org.apache.myfaces.webapp.AbstractFacesInitializer;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java b/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java
index f3abe08..cb89867 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.cdi.util;
-import javax.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.context.spi.CreationalContext;
import java.io.Serializable;
/**
@@ -38,7 +38,7 @@ public class ContextualInstanceInfo<T> implements Serializable
/**
* We need to store the CreationalContext as we need it for
* properly destroying the contextual instance via
- * {@link javax.enterprise.context.spi.Contextual#destroy(Object, javax.enterprise.context.spi.CreationalContext)}
+ * {@link jakarta.enterprise.context.spi.Contextual#destroy(Object, jakarta.enterprise.context.spi.CreationalContext)}
*/
private CreationalContext<T> creationalContext;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualStorage.java b/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualStorage.java
index ba1cb93..0c1accf 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualStorage.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualStorage.java
@@ -20,10 +20,10 @@
package org.apache.myfaces.cdi.util;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -157,7 +157,7 @@ public class ContextualStorage implements Serializable
/**
* Restores the Bean from its beanKey.
- * @see #getBeanKey(javax.enterprise.context.spi.Contextual)
+ * @see #getBeanKey(jakarta.enterprise.context.spi.Contextual)
*/
public Contextual<?> getBean(Object beanKey)
{
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/DefaultLiteral.java b/impl/src/main/java/org/apache/myfaces/cdi/util/DefaultLiteral.java
index 7891c69..cb23a44 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/DefaultLiteral.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/DefaultLiteral.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.cdi.util;
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
- * Literal for the {@link javax.enterprise.inject.Default} annotation.
+ * Literal for the {@link jakarta.enterprise.inject.Default} annotation.
*/
public class DefaultLiteral extends AnnotationLiteral<Default> implements Default
{
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorAnnotationLiteral.java b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorAnnotationLiteral.java
index bdaabdd..7a334fe 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorAnnotationLiteral.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorAnnotationLiteral.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.cdi.validator;
import java.util.Objects;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.faces.validator.FacesValidator;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java
index e133f91..46aed60 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorCDIWrapper.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.cdi.validator;
import java.lang.reflect.Type;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.TypeLiteral;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.TypeLiteral;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorExtension.java
index fd537ae..90fabc6 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorExtension.java
@@ -22,12 +22,12 @@ package org.apache.myfaces.cdi.validator;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessManagedBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessManagedBean;
import jakarta.faces.validator.FacesValidator;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorProducer.java
index d93541d..80399f2 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/validator/FacesValidatorProducer.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.cdi.validator;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.FacesException;
import jakarta.faces.validator.Validator;
import org.apache.myfaces.cdi.util.AbstractDynamicProducer;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
index 36c3489..67c64a0 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
@@ -25,13 +25,13 @@ import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.ExceptionHandler;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.context.ReleaseableExternalContext;
import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
@@ -47,7 +47,7 @@ public class ViewScopeBeanHolder implements Serializable
/**
* key: the windowId for the browser tab or window
* value: the {@link ViewScopeContextualStorage} which holds all the
- * {@link javax.enterprise.inject.spi.Bean}s.
+ * {@link jakarta.enterprise.inject.spi.Bean}s.
*/
private Map<String, ViewScopeContextualStorage> storageMap;
@@ -111,7 +111,7 @@ public class ViewScopeBeanHolder implements Serializable
* a new empty one.
* This method can be used to properly destroy the WindowBeanHolder beans
* without having to sync heavily. Any
- * {@link javax.enterprise.inject.spi.Bean#destroy(Object, javax.enterprise.context.spi.CreationalContext)}
+ * {@link jakarta.enterprise.inject.spi.Bean#destroy(Object, jakarta.enterprise.context.spi.CreationalContext)}
* should be performed on the returned old storage map.
* @return the old storageMap.
*/
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java
index e387367..bbfd670 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextExtension.java
index ef3da3a..ffc0fc8 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextExtension.java
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.cdi.view;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
import jakarta.faces.view.ViewScoped;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextImpl.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextImpl.java
index 4a78c38..c429f71 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextImpl.java
@@ -18,16 +18,16 @@
*/
package org.apache.myfaces.cdi.view;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.util.Map;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
import jakarta.faces.view.ViewScoped;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextualStorage.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextualStorage.java
index 1c87576..fd95c4f 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextualStorage.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeContextualStorage.java
@@ -20,14 +20,14 @@
package org.apache.myfaces.cdi.view;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.Bean;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
@@ -116,7 +116,7 @@ public class ViewScopeContextualStorage implements Serializable
/**
* Restores the Bean from its beanKey.
- * @see #getBeanKey(javax.enterprise.context.spi.Contextual)
+ * @see #getBeanKey(jakarta.enterprise.context.spi.Contextual)
*/
public Contextual<?> getBean(FacesContext context, Object beanKey)
{
diff --git a/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java b/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java
index a75d931..34e72ca 100644
--- a/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java
@@ -39,9 +39,9 @@ public class CompositeSearchKeywordResolver extends SearchKeywordResolver
this.resolvers = new SearchKeywordResolver[2];
}
- public void add(SearchKeywordResolver elResolver)
+ public void add(SearchKeywordResolver resolver)
{
- if (elResolver == null)
+ if (resolver == null)
{
throw new NullPointerException();
}
@@ -52,7 +52,7 @@ public class CompositeSearchKeywordResolver extends SearchKeywordResolver
System.arraycopy(this.resolvers, 0, nr, 0, this.size);
this.resolvers = nr;
}
- this.resolvers[this.size++] = elResolver;
+ this.resolvers[this.size++] = resolver;
}
@Override
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/CopyBeanInterceptorELResolver.java b/impl/src/main/java/org/apache/myfaces/component/validate/CopyBeanInterceptorELResolver.java
index 10a5ee6..30f600c 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/CopyBeanInterceptorELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/CopyBeanInterceptorELResolver.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.component.validate;
import java.beans.FeatureDescriptor;
import java.util.Iterator;
-import javax.el.ELContext;
-import javax.el.ELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
index 0087e0d..8f984d4 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
@@ -37,9 +37,9 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/_ELContextDecorator.java b/impl/src/main/java/org/apache/myfaces/component/validate/_ELContextDecorator.java
index a2c3897..8bfde89 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/_ELContextDecorator.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/_ELContextDecorator.java
@@ -20,10 +20,10 @@
package org.apache.myfaces.component.validate;
import java.util.Locale;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.FunctionMapper;
+import jakarta.el.VariableMapper;
/**
* This ELContext is used to hook into the EL handling, by decorating the
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/_ValueReferenceResolver.java b/impl/src/main/java/org/apache/myfaces/component/validate/_ValueReferenceResolver.java
index b0e454c..bdd687f 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/_ValueReferenceResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/_ValueReferenceResolver.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.component.validate;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.el.CompositeComponentExpressionHolder;
final class _ValueReferenceResolver
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index c111f74..8df04dd 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -41,7 +41,7 @@ import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELResolver;
+import jakarta.el.ELResolver;
import jakarta.faces.FacesException;
import jakarta.faces.FacesWrapper;
import jakarta.faces.FactoryFinder;
diff --git a/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java b/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
index 21b6134..567473d 100755
--- a/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
@@ -32,11 +32,11 @@ import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.util.ContainerUtils;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.Application;
import jakarta.faces.application.ProjectStage;
diff --git a/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java b/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
index 42f5284..0ca0096 100755
--- a/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
@@ -32,8 +32,8 @@ import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.component.search.SearchKeywordResolver;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.el.PropertyResolver;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java b/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java
index ae1734a..a37bc50 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java
@@ -23,10 +23,10 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
import jakarta.faces.bean.ManagedBean;
import jakarta.faces.component.FacesComponent;
import jakarta.faces.component.behavior.FacesBehavior;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
index 9f9674b..1cd502a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
@@ -37,7 +37,7 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.FacesException;
import jakarta.faces.bean.ManagedBean;
diff --git a/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java b/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java
index 22d9b3b..9c162c6 100644
--- a/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java
+++ b/impl/src/main/java/org/apache/myfaces/config/element/FacesConfigData.java
@@ -225,7 +225,7 @@ public abstract class FacesConfigData implements Serializable
public abstract Collection<ResourceBundle> getResourceBundles();
/**
- * @return Iterator over {@link javax.el.ELResolver} implementation class names
+ * @return Iterator over {@link jakarta.el.ELResolver} implementation class names
*/
public abstract Collection<String> getElResolvers();
diff --git a/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java b/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
index 240f8c9..676e045 100755
--- a/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
+++ b/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.config.element;
import java.io.Serializable;
import java.util.Collection;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java
index 0b369fa..50ca8c3 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBeanImpl.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.shared.util.ClassUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/context/ExternalContextFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/context/ExternalContextFactoryImpl.java
index b22c6a8..01b06e4 100644
--- a/impl/src/main/java/org/apache/myfaces/context/ExternalContextFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/ExternalContextFactoryImpl.java
@@ -23,9 +23,9 @@ import jakarta.faces.FactoryFinder;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.ExternalContextFactory;
import jakarta.faces.context.FlashFactory;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.apache.myfaces.context.servlet.ServletExternalContextImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java b/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java
index 49cd236..c48ab3b 100755
--- a/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.context;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.application.Application;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.application.FacesMessage.Severity;
diff --git a/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java b/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
index eec59e0..38b85bd 100644
--- a/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
@@ -36,7 +36,7 @@ import jakarta.faces.event.AbortProcessingException;
import jakarta.faces.event.ExceptionQueuedEvent;
import jakarta.faces.event.ExceptionQueuedEventContext;
import jakarta.faces.event.SystemEvent;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.lifecycle.ViewNotFoundException;
import org.apache.myfaces.renderkit.ErrorPageWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ApplicationMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ApplicationMap.java
index 08e935e..2d55b4c 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/ApplicationMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/ApplicationMap.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.context.servlet;
import java.util.Enumeration;
import java.util.Map;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.util.AbstractThreadSafeAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/CookieMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/CookieMap.java
index 4a0fa1d..5241c60 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/CookieMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/CookieMap.java
@@ -22,8 +22,8 @@ import java.util.Enumeration;
import java.util.Map;
import java.util.NoSuchElementException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
index 9411761..b3b4cc9 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
@@ -37,9 +37,9 @@ import jakarta.faces.context.ResponseWriter;
import jakarta.faces.event.PhaseId;
import jakarta.faces.render.RenderKit;
import jakarta.faces.render.RenderKitFactory;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.apache.myfaces.cdi.scope.FacesScopeProvider;
import org.apache.myfaces.context.ReleaseableExternalContext;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
index 2086af0..3720509 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
@@ -24,9 +24,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.el.ELContext;
-import javax.el.ELContextEvent;
-import javax.el.ELContextListener;
+import jakarta.el.ELContext;
+import jakarta.el.ELContextEvent;
+import jakarta.el.ELContextListener;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.Application;
import jakarta.faces.application.ApplicationFactory;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/InitParameterMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/InitParameterMap.java
index a0b203f..7f1693e 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/InitParameterMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/InitParameterMap.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.context.servlet;
import java.util.Enumeration;
import java.util.Map;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.util.AbstractAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderMap.java
index 1a425a9..4d8c270 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderMap.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.context.servlet;
import java.util.Enumeration;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java
index 9b1eb19..21c72f6 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestMap.java
index 421d8ef..31b269e 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestMap.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.context.servlet;
import java.util.Enumeration;
import java.util.Map;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterMap.java
index 88a044b..f83720a 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterMap.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.context.servlet;
import java.util.Enumeration;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterValuesMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterValuesMap.java
index ccd826d..766ac78 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterValuesMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/RequestParameterValuesMap.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.context.servlet;
import java.util.Enumeration;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.apache.myfaces.util.AbstractAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
index 0f97ee8..6074fd9 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
@@ -45,15 +45,15 @@ import jakarta.faces.context.FlashFactory;
import jakarta.faces.context.PartialResponseWriter;
import jakarta.faces.context.PartialViewContext;
import jakarta.faces.lifecycle.ClientWindow;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.shared.context.flash.FlashImpl;
@@ -393,7 +393,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
FacesContext facesContext = FacesContext.getCurrentInstance();
Map<Object, Object> attributes = facesContext.getAttributes();
- javax.servlet.http.PushBuilder pushBuilder = null;
+ jakarta.servlet.http.PushBuilder pushBuilder = null;
if (!attributes.containsKey(PUSH_SUPPORTED))
{
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
index c205379..43d6694 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
@@ -26,7 +26,7 @@ import java.util.Set;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.lifecycle.ClientWindow;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.context.ReleaseableExternalContext;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java b/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
index 4d86242..d03fa6e 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/SessionMap.java
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import org.apache.myfaces.util.AbstractThreadSafeAttributeMap;
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/StartupServletExternalContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/StartupServletExternalContextImpl.java
index 78aa5d1..53a4448 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/StartupServletExternalContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/StartupServletExternalContextImpl.java
@@ -29,7 +29,7 @@ import java.util.Locale;
import java.util.Map;
import jakarta.faces.context.Flash;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* An ExternalContext implementation for Servlet environments, which is used
diff --git a/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java b/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java
index 3eaf81a..e0ddd87 100644
--- a/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/ee/MyFacesContainerInitializer.java
@@ -54,12 +54,12 @@ import jakarta.faces.render.Renderer;
import jakarta.faces.validator.FacesValidator;
import jakarta.faces.validator.Validator;
import jakarta.faces.webapp.FacesServlet;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.annotation.HandlesTypes;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.annotation.HandlesTypes;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/el/CompositeELResolver.java b/impl/src/main/java/org/apache/myfaces/el/CompositeELResolver.java
index b9f21f1..4d055cf 100644
--- a/impl/src/main/java/org/apache/myfaces/el/CompositeELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/CompositeELResolver.java
@@ -25,14 +25,14 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import javax.el.ELContext;
-import javax.el.ELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
/**
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class CompositeELResolver extends javax.el.CompositeELResolver
+public class CompositeELResolver extends jakarta.el.CompositeELResolver
{
private Collection<ELResolver> _elResolvers;
diff --git a/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java b/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
index 7be0b33..bf6da11 100644
--- a/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.el;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.Flash;
@@ -153,7 +153,7 @@ public class FlashELResolver extends ELResolver
setDoKeepPromotion(false, facesContext);
// Note that after this object is returned, Flash.get() and Flash.put()
- // methods are called from javax.el.MapELResolver, since
+ // methods are called from jakarta.el.MapELResolver, since
// Flash is instance of Map.
return flash;
}
diff --git a/impl/src/main/java/org/apache/myfaces/el/NullPropertyResolver.java b/impl/src/main/java/org/apache/myfaces/el/NullPropertyResolver.java
index 27a4ade..f8ef576 100644
--- a/impl/src/main/java/org/apache/myfaces/el/NullPropertyResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/NullPropertyResolver.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.PropertyNotFoundException;
diff --git a/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java b/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java
index 74596e2..50590e2 100755
--- a/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.el;
import java.lang.reflect.Array;
import java.util.List;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.PropertyNotFoundException;
@@ -222,7 +222,7 @@ public final class PropertyResolverImpl extends PropertyResolver
{
return invoker.invoke(getELResolver(), getELContext());
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException("property not found: " + invoker.getMessage() + ": " + e.getMessage(),
e);
diff --git a/impl/src/main/java/org/apache/myfaces/el/ResolverForJSPInitializer.java b/impl/src/main/java/org/apache/myfaces/el/ResolverForJSPInitializer.java
index eaf45ee..4ca8fcf 100644
--- a/impl/src/main/java/org/apache/myfaces/el/ResolverForJSPInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/el/ResolverForJSPInitializer.java
@@ -39,10 +39,10 @@ public final class ResolverForJSPInitializer implements PhaseListener
{
private final ELResolverBuilder _resolverBuilder;
private volatile boolean initialized;
- private final javax.el.CompositeELResolver _resolverForJSP;
+ private final jakarta.el.CompositeELResolver _resolverForJSP;
public ResolverForJSPInitializer(final ELResolverBuilder resolverBuilder,
- final javax.el.CompositeELResolver resolverForJSP)
+ final jakarta.el.CompositeELResolver resolverForJSP)
{
_resolverBuilder = resolverBuilder;
_resolverForJSP = resolverForJSP;
diff --git a/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java b/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
index 90371c3..32de8fe 100755
--- a/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.el;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.Application;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
diff --git a/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java b/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
index 97e6c21..15d4822 100644
--- a/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
+++ b/impl/src/main/java/org/apache/myfaces/el/VariableResolverToApplicationELResolverAdapter.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.VariableResolver;
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java b/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java
index 86a02fb..4bd2f85 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.el.convert;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.PropertyNotFoundException;
@@ -52,7 +52,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
return elResolver.isReadOnly(elContext(), base, Integer.valueOf(index));
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -72,7 +72,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
return elResolver.isReadOnly(elContext(), base, property);
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -91,7 +91,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
return elResolver.getValue(elContext(), base, Integer.valueOf(index));
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -111,7 +111,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
return elResolver.getValue(elContext(), base, property);
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -129,7 +129,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
return elResolver.getType(elContext(), base, Integer.valueOf(index));
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -148,7 +148,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
return elResolver.getType(elContext(), base, property);
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -167,7 +167,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
elResolver.setValue(elContext(), base, property, value);
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -186,7 +186,7 @@ public final class ELResolverToPropertyResolver extends PropertyResolver
{
elResolver.setValue(elContext(), base, Integer.valueOf(index), value);
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToVariableResolver.java b/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToVariableResolver.java
index 3bbccf5..835688e 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToVariableResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToVariableResolver.java
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.el.convert;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.VariableResolver;
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/MethodExpressionToMethodBinding.java b/impl/src/main/java/org/apache/myfaces/el/convert/MethodExpressionToMethodBinding.java
index d81a9e5..cb8cb53 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/MethodExpressionToMethodBinding.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/MethodExpressionToMethodBinding.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.el.convert;
-import javax.el.ELException;
-import javax.el.MethodExpression;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
@@ -68,7 +68,7 @@ public final class MethodExpressionToMethodBinding extends MethodBinding impleme
{
return methodExpression.getMethodInfo(facesContext.getELContext()).getReturnType();
}
- catch (javax.el.MethodNotFoundException e)
+ catch (jakarta.el.MethodNotFoundException e)
{
throw new MethodNotFoundException(e);
}
@@ -83,7 +83,7 @@ public final class MethodExpressionToMethodBinding extends MethodBinding impleme
{
return methodExpression.invoke(facesContext.getELContext(), params);
}
- catch (javax.el.MethodNotFoundException e)
+ catch (jakarta.el.MethodNotFoundException e)
{
throw new MethodNotFoundException(e);
}
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java b/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
index 1fab731..7eb322f 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.el.convert;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.ApplicationFactory;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java b/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
index b00ab1f..8018b70 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
@@ -21,11 +21,11 @@ package org.apache.myfaces.el.convert;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java b/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
index 3cda4ca..3574fba 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.el.convert;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
@@ -138,7 +138,7 @@ public class ValueExpressionToValueBinding extends ValueBinding implements State
{
getNotNullValueExpression().setValue(facesContext.getELContext(), value);
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -156,7 +156,7 @@ public class ValueExpressionToValueBinding extends ValueBinding implements State
{
return getNotNullValueExpression().isReadOnly(facesContext.getELContext());
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -174,7 +174,7 @@ public class ValueExpressionToValueBinding extends ValueBinding implements State
{
return getNotNullValueExpression().getValue(facesContext.getELContext());
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
@@ -191,7 +191,7 @@ public class ValueExpressionToValueBinding extends ValueBinding implements State
{
return getNotNullValueExpression().getType(facesContext.getELContext());
}
- catch (javax.el.PropertyNotFoundException e)
+ catch (jakarta.el.PropertyNotFoundException e)
{
throw new PropertyNotFoundException(e);
}
diff --git a/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java b/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java
index 6ddfac0..55d66ee 100644
--- a/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.el.convert;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.VariableResolver;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java b/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java
index a2aff09..7d887ee 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.el.unified;
import java.util.Comparator;
import java.util.List;
-import javax.el.ELResolver;
+import jakarta.el.ELResolver;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java b/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java
index 6829408..375aff1 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified;
import java.util.Comparator;
-import javax.el.ELResolver;
+import jakarta.el.ELResolver;
/**
* Comparator for ELResolvers that shifts the Resolvers from
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java b/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java
index 193c062..128c050 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el.unified;
-import javax.el.CompositeELResolver;
+import jakarta.el.CompositeELResolver;
import jakarta.faces.context.FacesContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/FacesELContext.java b/impl/src/main/java/org/apache/myfaces/el/unified/FacesELContext.java
index 5d3126e..7b78330 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/FacesELContext.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/FacesELContext.java
@@ -18,10 +18,10 @@
*/
package org.apache.myfaces.el.unified;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.FunctionMapper;
+import jakarta.el.VariableMapper;
import jakarta.faces.context.FacesContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java b/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
index eff3fb8..52665b5 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified;
import java.util.Comparator;
-import javax.el.ELResolver;
+import jakarta.el.ELResolver;
/**
* Comparator for ELResolvers that shifts the Resolver from OWB to the last place.
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
index 60776e7..e731fc5 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
@@ -24,8 +24,8 @@ import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELResolver;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.el.ELResolver;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.annotation.FacesConfig;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.PropertyResolver;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
index 33f54ff..24c760e 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
@@ -23,15 +23,15 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.ResourceBundleELResolver;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.el.ArrayELResolver;
+import jakarta.el.BeanELResolver;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ListELResolver;
+import jakarta.el.MapELResolver;
+import jakarta.el.ResourceBundleELResolver;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.CDIUtils;
@@ -66,7 +66,7 @@ public class ResolverBuilderForFaces extends ResolverBuilderBase implements ELRe
Method getStreamELResolverMethod = null;
try
{
- staticFieldELResolverClass = ClassUtils.classForName("javax.el.StaticFieldELResolver");
+ staticFieldELResolverClass = ClassUtils.classForName("jakarta.el.StaticFieldELResolver");
getStreamELResolverMethod = ExpressionFactory.class.getMethod("getStreamELResolver");
}
catch (NoSuchMethodException ex)
@@ -111,7 +111,8 @@ public class ResolverBuilderForFaces extends ResolverBuilderBase implements ELRe
BeanManager beanManager = CDIUtils.getBeanManager(
FacesContext.getCurrentInstance().getExternalContext());
- list.add(beanManager.getELResolver());
+ // TODO JakartaFaces
+ //list.add(beanManager.getELResolver());
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
index 7f680d2..f5d6fa7 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.el.unified;
import java.util.ArrayList;
import java.util.List;
-import javax.el.CompositeELResolver;
-import javax.el.ELResolver;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELResolver;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.cdi.util.CDIUtils;
@@ -63,7 +63,8 @@ public class ResolverBuilderForJSP extends ResolverBuilderBase implements ELReso
//Add CDI ELResolver instead.
BeanManager beanManager = CDIUtils.getBeanManager(
FacesContext.getCurrentInstance().getExternalContext());
- list.add(beanManager.getELResolver());
+ // TODO JakartaFaces
+ //list.add(beanManager.getELResolver());
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
index d6fc6fd..333e435 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/CompositeComponentELResolver.java
@@ -28,9 +28,9 @@ import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.CompositeComponentExpressionHolder;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
index 058cb41..5ed78e0 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el.unified.resolver;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.context.FacesContext;
import java.beans.FeatureDescriptor;
import java.util.Iterator;
@@ -29,7 +29,7 @@ import java.util.Arrays;
* <p>
* This composite el resolver will be used at the top level resolver for faces
* ({@link jakarta.faces.application.Application#getELResolver()})
- * and jsp (the one we add with {@link javax.servlet.jsp.JspApplicationContext#addELResolver(javax.el.ELResolver)}.
+ * and jsp (the one we add with {@link javax.servlet.jsp.JspApplicationContext#addELResolver(jakarta.el.ELResolver)}.
* It keeps track of its scope to let the variable resolver {@link org.apache.myfaces.el.VariableResolverImpl}
* know in which scope it is executed. This is
* necessarry to call either the faces or the jsp resolver head.
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java
index 4c0fbf9..913be17 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.el.unified.resolver;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.PropertyNotFoundException;
import jakarta.faces.FacesException;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportConstantsELResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportConstantsELResolver.java
index 9d2eab5..4b5a366 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportConstantsELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportConstantsELResolver.java
@@ -30,11 +30,11 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import static java.util.logging.Level.FINE;
import java.util.logging.Logger;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import jakarta.faces.component.UIImportConstants;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportHandlerResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportHandlerResolver.java
index e4395aa..7cef468 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportHandlerResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ImportHandlerResolver.java
@@ -22,9 +22,9 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.PropertyNotFoundException;
import org.apache.myfaces.shared.util.ClassUtils;
@@ -48,8 +48,8 @@ public class ImportHandlerResolver extends ScopedAttributeResolver
try
{
// These classes will only be available with EL 3+
- elClass = ClassUtils.classForName("javax.el.ELClass");
- importHandlerClass = ClassUtils.classForName("javax.el.ImportHandler");
+ elClass = ClassUtils.classForName("jakarta.el.ELClass");
+ importHandlerClass = ClassUtils.classForName("jakarta.el.ImportHandler");
getImportHandlerMethod = ELContext.class.getMethod("getImportHandler");
if (elClass != null && importHandlerClass != null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
index 75b559e..cf5a510 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
@@ -23,11 +23,11 @@ import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.element.ManagedBean;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import jakarta.faces.FacesException;
import jakarta.faces.application.ProjectStage;
import jakarta.faces.component.UIViewRoot;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
index 956bf97..f213fdd 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
@@ -23,11 +23,11 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import jakarta.faces.application.Application;
import jakarta.faces.context.FacesContext;
@@ -58,7 +58,7 @@ public final class ResourceBundleResolver extends ELResolver
// JSF 2.0 spec section 5.6.1.4
// "... If base is null and property is a String equal to the value of the
// <var> element of one of the <resource-bundle>'s in the application
- // configuration resources throw javax.el.PropertyNotWriteable, since
+ // configuration resources throw jakarta.el.PropertyNotWriteable, since
// ResourceBundles are read-only. ..."
// Since something is done only when base is null, it is better to check
// for not null and return.
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java
index 78c8f35..354deee 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.el.unified.resolver;
import java.beans.FeatureDescriptor;
import java.util.Iterator;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
import jakarta.faces.application.Resource;
import jakarta.faces.application.ResourceHandler;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
index dc59d63..654d676 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
@@ -20,11 +20,11 @@ package org.apache.myfaces.el.unified.resolver;
import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java
index 96bd4fa..06e4b2b 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java
index 35f1afe..2590bd0 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java
index acfbc4b..fe04cb03 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ComponentImplicitObject.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.component.UIComponent;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CompositeComponentImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CompositeComponentImplicitObject.java
index c1ba502..e4f952a 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CompositeComponentImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CompositeComponentImplicitObject.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
import java.util.List;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java
index 20a49de..b2c5ca1 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java
index fde50ea..9c62700 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.context.FacesContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FlowScopeImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FlowScopeImplicitObject.java
index 3d988d8..aa31516 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FlowScopeImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FlowScopeImplicitObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java
index 67d6b8a..1cc1a0b 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java
index 887dd1f..6cd7a6c 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java
index 01823c7..8a26730 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
-import javax.el.ELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
index 8822fba..59f17a2 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
import java.beans.FeatureDescriptor;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java
index d313f8e..7d408a5 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java
index 4c465d3..98bf7ee 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java
index 16fcdbd..9deac59 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
import java.util.Map;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java
index f3e9941..9027fb3 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java
index 9b099b9..1e68aa8 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestScopeImplicitObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ResourceImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ResourceImplicitObject.java
index ce2ae21..2adcafd 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ResourceImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ResourceImplicitObject.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java
index d6c2f91..8c17d2e 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionImplicitObject.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
/**
* Encapsulates information needed by the ImplicitObjectResolver
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java
index 808a40e..b99f2d3 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/SessionScopeImplicitObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java
index c132310..5498daa 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewImplicitObject.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.el.unified.resolver.implicitobject;
import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.component.UIViewRoot;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewScopeImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewScopeImplicitObject.java
index f5600df..1eb944b 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewScopeImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ViewScopeImplicitObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.el.unified.resolver.implicitobject;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import java.beans.FeatureDescriptor;
import java.util.Map;
diff --git a/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java b/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java
index a7ec6cd..dde614b 100644
--- a/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.event;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.AbortProcessingException;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java b/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java
index b04e38e..d90b8f7 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.flow;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.FlowCallNode;
import jakarta.faces.flow.Parameter;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/FlowImpl.java b/impl/src/main/java/org/apache/myfaces/flow/FlowImpl.java
index 138ddde..63e2d5d 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/FlowImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/FlowImpl.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.application.NavigationCase;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.Flow;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/MethodCallNodeImpl.java b/impl/src/main/java/org/apache/myfaces/flow/MethodCallNodeImpl.java
index 6a8f981..c6a742b 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/MethodCallNodeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/MethodCallNodeImpl.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.flow;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.MethodCallNode;
import jakarta.faces.flow.Parameter;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java b/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java
index 82b39ed..27abd21 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.flow;
import java.util.List;
import java.util.Map;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.NavigationCase;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/ParameterImpl.java b/impl/src/main/java/org/apache/myfaces/flow/ParameterImpl.java
index 5e5389c..eb8f9f5 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/ParameterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/ParameterImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.flow;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.Parameter;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java b/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java
index dd56c47..9685544 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.flow;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.ReturnNode;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/SwitchCaseImpl.java b/impl/src/main/java/org/apache/myfaces/flow/SwitchCaseImpl.java
index 4b9786c..2c2b45f 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/SwitchCaseImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/SwitchCaseImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.flow;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.SwitchCase;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java b/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java
index bae9d83..5a51a2d 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.flow;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.SwitchCase;
import jakarta.faces.flow.SwitchNode;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/FlowBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/FlowBuilderImpl.java
index 6ed1d74..92e2398 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/FlowBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/FlowBuilderImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.flow.builder;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.Flow;
import jakarta.faces.flow.builder.FlowBuilder;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/FlowCallBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/FlowCallBuilderImpl.java
index 5b23de7..f46e4ed 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/FlowCallBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/FlowCallBuilderImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.flow.builder;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.builder.FlowCallBuilder;
import org.apache.myfaces.flow.FlowCallNodeImpl;
import org.apache.myfaces.flow.FlowImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/MethodCallBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/MethodCallBuilderImpl.java
index 1cbd0eb..8789cdb 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/MethodCallBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/MethodCallBuilderImpl.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.flow.builder;
import java.util.List;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.Parameter;
import jakarta.faces.flow.builder.MethodCallBuilder;
import org.apache.myfaces.flow.FlowImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java
index d027d42..3a91150 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/NavigationCaseBuilderImpl.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.builder.NavigationCaseBuilder;
import org.apache.myfaces.flow.FlowImpl;
import org.apache.myfaces.flow.NavigationCaseImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/ReturnBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/ReturnBuilderImpl.java
index a02af39..e717f64 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/ReturnBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/ReturnBuilderImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.flow.builder;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.builder.ReturnBuilder;
import org.apache.myfaces.flow.FlowImpl;
import org.apache.myfaces.flow.ReturnNodeImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchBuilderImpl.java
index f025c3f..d2e18c8 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchBuilderImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.flow.builder;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.builder.SwitchBuilder;
import jakarta.faces.flow.builder.SwitchCaseBuilder;
import org.apache.myfaces.flow.FlowImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchCaseBuilderImpl.java b/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchCaseBuilderImpl.java
index 4deb101..b1d9716 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchCaseBuilderImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/builder/SwitchCaseBuilderImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.flow.builder;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.flow.builder.SwitchCaseBuilder;
import org.apache.myfaces.flow.FlowImpl;
import org.apache.myfaces.flow.SwitchCaseImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/DefaultCDIFacesFlowProvider.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/DefaultCDIFacesFlowProvider.java
index 1b6f8df..5275abc 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/DefaultCDIFacesFlowProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/DefaultCDIFacesFlowProvider.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.Flow;
import org.apache.myfaces.cdi.util.CDIUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderCDIExtension.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderCDIExtension.java
index e670773..8b3d183 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderCDIExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderCDIExtension.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.flow.cdi;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.Producer;
import jakarta.faces.flow.Flow;
import jakarta.faces.flow.builder.FlowDefinition;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java
index 8770923..7e8c8f1 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowBuilderFactoryBean.java
@@ -22,16 +22,16 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Producer;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.Flow;
import jakarta.faces.flow.builder.FlowBuilder;
import jakarta.faces.flow.builder.FlowBuilderParameter;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.flow.builder.FlowBuilderImpl;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
index 289abd3..6ff8284 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
@@ -29,16 +29,16 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.context.ExceptionHandler;
import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.Flow;
import jakarta.faces.flow.FlowHandler;
import jakarta.faces.lifecycle.ClientWindow;
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.cdi.util.ContextualInstanceInfo;
import org.apache.myfaces.cdi.util.ContextualStorage;
import org.apache.myfaces.cdi.JsfApplicationArtifactHolder;
@@ -64,7 +64,7 @@ public class FlowScopeBeanHolder implements Serializable
/**
* key: client window id + flow id
* value: the {@link ContextualStorage} which holds all the
- * {@link javax.enterprise.inject.spi.Bean}s.
+ * {@link jakarta.enterprise.inject.spi.Bean}s.
*/
private Map<String, ContextualStorage> storageMap;
@@ -176,7 +176,7 @@ public class FlowScopeBeanHolder implements Serializable
* a new empty one.
* This method can be used to properly destroy the WindowBeanHolder beans
* without having to sync heavily. Any
- * {@link javax.enterprise.inject.spi.Bean#destroy(Object, javax.enterprise.context.spi.CreationalContext)}
+ * {@link jakarta.enterprise.inject.spi.Bean#destroy(Object, jakarta.enterprise.context.spi.CreationalContext)}
* should be performed on the returned old storage map.
* @return the old storageMap.
*/
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeCDIExtension.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeCDIExtension.java
index 3c0cd2d..0ca17db 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeCDIExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeCDIExtension.java
@@ -20,14 +20,14 @@ package org.apache.myfaces.flow.cdi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessBean;
import jakarta.faces.flow.FlowScoped;
import org.apache.myfaces.flow.FlowReference;
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeMap.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeMap.java
index 8d5d900..eca4417 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeMap.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeMap.java
@@ -22,7 +22,7 @@ import org.apache.myfaces.cdi.util.CDIUtils;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import org.apache.myfaces.cdi.util.BeanProvider;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java
index cec3c3f..f050b8e 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java
@@ -21,14 +21,14 @@ package org.apache.myfaces.flow.cdi;
import java.lang.annotation.Annotation;
import java.util.List;
import java.util.Map;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.ContextNotActiveException;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Typed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import jakarta.faces.context.FacesContext;
import jakarta.faces.flow.Flow;
import jakarta.faces.flow.FlowHandler;
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java b/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
index 4c70d84..d66a2d3 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
@@ -31,8 +31,8 @@ import jakarta.faces.context.ExternalContext;
import jakarta.faces.context.FacesContext;
import jakarta.faces.lifecycle.ClientWindow;
import jakarta.faces.render.ResponseStateManager;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
index 6966ade..adaea1f 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.lifecycle;
import jakarta.faces.context.FacesContext;
import java.io.Serializable;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
index dc3483f..8011b82 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
@@ -24,7 +24,7 @@ import java.net.URISyntaxException;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.FacesException;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.Application;
@@ -48,7 +48,7 @@ import jakarta.faces.render.ResponseStateManager;
import jakarta.faces.view.ViewDeclarationLanguage;
import jakarta.faces.view.ViewMetadata;
import jakarta.faces.webapp.FacesServlet;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.event.PostClientWindowAndViewInitializedEvent;
import org.apache.myfaces.renderkit.ErrorPageWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java b/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
index a6e7948..34fd475 100644
--- a/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
@@ -21,17 +21,17 @@ package org.apache.myfaces.push;
import org.apache.myfaces.push.cdi.WebsocketApplicationSessionHolder;
import java.io.IOException;
import java.io.Serializable;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.enterprise.util.AnnotationLiteral;
import jakarta.faces.event.WebsocketEvent;
import jakarta.faces.event.WebsocketEvent.Closed;
import jakarta.faces.event.WebsocketEvent.Opened;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java b/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java
index 9056fda..96129a3 100644
--- a/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/push/WebsocketComponentRenderer.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIWebsocket;
diff --git a/impl/src/main/java/org/apache/myfaces/push/WebsocketConfigurator.java b/impl/src/main/java/org/apache/myfaces/push/WebsocketConfigurator.java
index 43da5a9..183608a 100644
--- a/impl/src/main/java/org/apache/myfaces/push/WebsocketConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/push/WebsocketConfigurator.java
@@ -19,12 +19,12 @@
package org.apache.myfaces.push;
import java.io.Serializable;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.faces.context.ExternalContext;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.push.cdi.WebsocketSessionBean;
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextCDIExtension.java b/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextCDIExtension.java
index 765899a..d2a4b46 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextCDIExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextCDIExtension.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.push.cdi;
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.Producer;
import jakarta.faces.push.Push;
import jakarta.faces.push.PushContext;
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextFactoryBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextFactoryBean.java
index 5565a29..e987e2b 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextFactoryBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextFactoryBean.java
@@ -18,13 +18,13 @@
*/
package org.apache.myfaces.push.cdi;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
import jakarta.faces.push.Push;
import jakarta.faces.push.PushContext;
-import javax.inject.Named;
+import jakarta.inject.Named;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextImpl.java b/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextImpl.java
index e02272a..6a988fc 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/PushContextImpl.java
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.faces.FacesException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.push.PushContext;
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationBean.java
index bc663f3..abacb85 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationBean.java
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationSessionHolder.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationSessionHolder.java
index 3f30943..e779553 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationSessionHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketApplicationSessionHolder.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;
import java.util.logging.Logger;
import jakarta.faces.context.ExternalContext;
-import javax.websocket.Session;
+import jakarta.websocket.Session;
import org.apache.myfaces.push.WebsocketSessionClusterSerializedRestore;
import org.apache.myfaces.push.util.Json;
import org.apache.myfaces.shared.util.ClassUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java
index 5e63b5c..25dfe82 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java
@@ -20,7 +20,7 @@
package org.apache.myfaces.push.cdi;
import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.shared.util.WebConfigParamUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java
index 5ec60c3..bd69543 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PreDestroy;
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
/**
* The purpose of this bean is to keep track of the active tokens and Session instances in the current session,
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java
index edb1ee3..a91f991 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.CDI;
import jakarta.faces.view.ViewScoped;
import org.apache.myfaces.cdi.util.CDIUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
index 9757368..9c75f59 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
@@ -46,8 +46,8 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.el.Expression;
-import javax.el.ValueExpression;
+import jakarta.el.Expression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIColumn;
@@ -66,7 +66,7 @@ import jakarta.faces.el.MethodBinding;
import jakarta.faces.el.ValueBinding;
import jakarta.faces.render.Renderer;
import jakarta.faces.view.Location;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.lifecycle.ViewNotFoundException;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
index 74a7b74..65be868 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.spi;
import jakarta.faces.FacesException;
import jakarta.faces.context.ExternalContext;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.shared.util.ClassUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java
index a135df3..626ba3b 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ActionListenerTag.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.ActionSource;
import jakarta.faces.event.ActionListener;
@@ -60,7 +60,7 @@ public class ActionListenerTag extends GenericListenerTag<ActionSource, ActionLi
* The fully qualified class name of the ActionListener class.
*/
@Override
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
public void setType(ValueExpression type)
{
@@ -71,7 +71,7 @@ public class ActionListenerTag extends GenericListenerTag<ActionSource, ActionLi
* Value binding expression that evaluates to an object that implements jakarta.faces.event.ActionListener.
*/
@Override
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="jakarta.faces.event.ActionListener")
public void setBinding(ValueExpression binding)
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java
index d803334..7705b43 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/AttributeTag.java
@@ -18,14 +18,14 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
import jakarta.faces.webapp.UIComponentClassicTagBase;
import jakarta.faces.webapp.UIComponentELTag;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
-import javax.el.ValueExpression;
-import javax.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.el.ELContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
@@ -67,7 +67,7 @@ public class AttributeTag extends TagSupport
*
* @param nameExpression
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
public void setName(ValueExpression nameExpression)
{
@@ -79,7 +79,7 @@ public class AttributeTag extends TagSupport
*
* @param valueExpression
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.Object")
public void setValue(ValueExpression valueExpression)
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
index 2f8adad..937fdb9 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
@@ -21,12 +21,12 @@ package org.apache.myfaces.taglib.core;
import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
import org.apache.myfaces.shared.util.LocaleUtils;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
import jakarta.faces.convert.DateTimeConverter;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import java.util.Locale;
import java.util.TimeZone;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
index 0fead33..7304919 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.taglib.core;
import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
import org.apache.myfaces.shared.util.LocaleUtils;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
import jakarta.faces.convert.NumberConverter;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
import java.util.Locale;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java
index 827fc36..8c03c48 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterImplTag.java
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
import jakarta.faces.webapp.ConverterELTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
@@ -52,7 +52,7 @@ public class ConverterImplTag extends ConverterELTag
/**
* The converter's registered ID.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
public void setConverterId(ValueExpression converterId)
{
@@ -62,7 +62,7 @@ public class ConverterImplTag extends ConverterELTag
/**
* A ValueExpression that evaluates to a Converter.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="jakarta.faces.convert.Converter")
public void setBinding(ValueExpression binding)
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterTag.java
index a245861..ff431fc 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ConverterTag.java
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
import jakarta.faces.webapp.ConverterELTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* Implementation of ConverterELTag
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
index ba4cb11..6cc8d97 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateActionListener.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java
index 2a01956..b30ca0b 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHolder;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java
index 1dfb715..5c8ffc6 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.Application;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.component.StateHolder;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java
index f74ffb9..c305674 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateValueChangeListener.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.StateHolder;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
index d8d2164..88d9388 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/GenericListenerTag.java
@@ -18,15 +18,15 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
import jakarta.faces.webapp.UIComponentClassicTagBase;
import jakarta.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.myfaces.shared.util.ClassUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/GenericMinMaxValidatorTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/GenericMinMaxValidatorTag.java
index 4976634..2ecd690 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/GenericMinMaxValidatorTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/GenericMinMaxValidatorTag.java
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.validator.Validator;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* This is the base Tag for all ValidatorTags which got a minimum and a maimum attribute.
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
index 4bf3345..a486801 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
@@ -31,10 +31,10 @@ import java.util.Set;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.FacesContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.el.ValueExpression;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.el.ValueExpression;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
@@ -65,7 +65,7 @@ public class LoadBundleTag extends TagSupport
/**
* The base name of the resource bundle.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
public void setBasename(ValueExpression basename)
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
index 5cc62be..d2c4b36 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ParamTag.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.taglib.core;
import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import jakarta.faces.component.UIComponent;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* DOCUMENT ME!
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
index 6e10de9..54807d9 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.taglib.core;
import java.io.Serializable;
import java.util.logging.Logger;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.FacesContext;
@@ -30,9 +30,9 @@ import jakarta.faces.event.PhaseEvent;
import jakarta.faces.event.PhaseId;
import jakarta.faces.event.PhaseListener;
import jakarta.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
@@ -63,7 +63,7 @@ public class PhaseListenerTag extends TagSupport
/**
* Class name of the PhaseListener to be created and registered.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
public void setType(ValueExpression type)
{
@@ -73,7 +73,7 @@ public class PhaseListenerTag extends TagSupport
/**
* Value binding expression that evaluates to a PhaseListener.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="jakarta.faces.event.PhaseListener")
public void setBinding(ValueExpression binding)
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
index cbfc02f..626f8c7 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.taglib.core;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.ActionSource;
import jakarta.faces.component.UIComponent;
import jakarta.faces.event.ActionListener;
import jakarta.faces.webapp.UIComponentClassicTagBase;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
@@ -100,7 +100,7 @@ public class SetPropertyActionListenerTag extends TagSupport
* ValueExpression for the destination of the value attribute.
*/
@JSFJspAttribute(required = true,
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.Object")
public ValueExpression getTarget()
{
@@ -118,7 +118,7 @@ public class SetPropertyActionListenerTag extends TagSupport
* @return
*/
@JSFJspAttribute(required = true,
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.Object")
public ValueExpression getValue()
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java
index c2b5d7b..b2243d9 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateDoubleRangeTag.java
@@ -22,7 +22,7 @@ import org.apache.myfaces.convert.ConverterUtils;
import jakarta.faces.validator.DoubleRangeValidator;
import jakarta.faces.validator.Validator;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* @author Thomas Spiegl (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java
index 091795e..1937073 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLengthTag.java
@@ -22,7 +22,7 @@ import org.apache.myfaces.convert.ConverterUtils;
import jakarta.faces.validator.LengthValidator;
import jakarta.faces.validator.Validator;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* @author Thomas Spiegl (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java
index b8e8269..a3b0aae 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateLongRangeTag.java
@@ -22,7 +22,7 @@ import org.apache.myfaces.convert.ConverterUtils;
import jakarta.faces.validator.LongRangeValidator;
import jakarta.faces.validator.Validator;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* @author Thomas Spiegl (latest modification by $Author$)
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRegexTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRegexTag.java
index bd5075c..4b1daf7 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRegexTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRegexTag.java
@@ -18,14 +18,14 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.Application;
import jakarta.faces.context.FacesContext;
import jakarta.faces.validator.RegexValidator;
import jakarta.faces.validator.Validator;
import jakarta.faces.webapp.ValidatorELTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* JSP Tag class for {@link RegexValidator}.
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRequiredTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRequiredTag.java
index e923236..fa8d59b 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRequiredTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidateRequiredTag.java
@@ -18,14 +18,14 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.Application;
import jakarta.faces.context.FacesContext;
import jakarta.faces.validator.RequiredValidator;
import jakarta.faces.validator.Validator;
import jakarta.faces.webapp.ValidatorELTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* JSP Tag class for {@link RequiredValidator}.
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java
index f457422..cb74c3d 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorImplTag.java
@@ -18,13 +18,13 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.Application;
import jakarta.faces.context.FacesContext;
import jakarta.faces.validator.Validator;
import jakarta.faces.webapp.ValidatorELTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
@@ -61,7 +61,7 @@ public class ValidatorImplTag extends ValidatorELTag
/**
* The registered ID of the desired Validator.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
public void setValidatorId(ValueExpression validatorId)
{
@@ -71,7 +71,7 @@ public class ValidatorImplTag extends ValidatorELTag
/**
* A ValueExpression that evaluates to an implementation of the jakarta.faces.validator.Validator interface.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="jakarta.faces.validator.Validator")
public void setBinding(ValueExpression binding)
{
@@ -98,7 +98,7 @@ public class ValidatorImplTag extends ValidatorELTag
}
@Override
- protected Validator createValidator() throws javax.servlet.jsp.JspException
+ protected Validator createValidator() throws jakarta.servlet.jsp.JspException
{
if (_validatorIdString != null)
@@ -113,7 +113,7 @@ public class ValidatorImplTag extends ValidatorELTag
return new DelegateValidator(_validatorId, _binding, _validatorIdString);
}
- protected Validator createClassicValidator() throws javax.servlet.jsp.JspException
+ protected Validator createClassicValidator() throws jakarta.servlet.jsp.JspException
{
FacesContext facesContext = FacesContext.getCurrentInstance();
ELContext elContext = facesContext.getELContext();
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorTag.java
index a29eab7..07c7996 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValidatorTag.java
@@ -18,13 +18,13 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.application.Application;
import jakarta.faces.context.FacesContext;
import jakarta.faces.validator.Validator;
import jakarta.faces.webapp.ValidatorELTag;
-import javax.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspException;
/**
* Basic Validator implementation.
@@ -69,7 +69,7 @@ public class ValidatorTag extends ValidatorELTag
}
@Override
- protected Validator createValidator() throws javax.servlet.jsp.JspException
+ protected Validator createValidator() throws jakarta.servlet.jsp.JspException
{
FacesContext facesContext = FacesContext.getCurrentInstance();
ELContext elContext = facesContext.getELContext();
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java
index dba11b8..5764c47 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ValueChangeListenerTag.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.taglib.core;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.event.ValueChangeListener;
@@ -67,7 +67,7 @@ public class ValueChangeListenerTag extends GenericListenerTag<EditableValueHold
* The name of a Java class that implements ValueChangeListener.
*/
@Override
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
public void setType(ValueExpression type)
{
@@ -79,7 +79,7 @@ public class ValueChangeListenerTag extends GenericListenerTag<EditableValueHold
* interface.
*/
@Override
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="jakarta.faces.event.ValueChangeListener")
public void setBinding(ValueExpression binding)
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
index b892122..7f8c2cc 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
@@ -23,11 +23,11 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspTag;
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIOutput;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyContent;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyContent;
/**
* @author Manfred Geiler (latest modification by $Author$)
@@ -69,7 +69,7 @@ public class VerbatimTag extends UIComponentELTagBase
/**
* If true, generated markup is escaped. Default: false.
*/
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.Boolean")
public void setEscape(ValueExpression escape)
{
@@ -81,7 +81,7 @@ public class VerbatimTag extends UIComponentELTagBase
* any subsequent form submit. The default value for this property is true.
*/
@Override
- @JSFJspAttribute(className="javax.el.ValueExpression",
+ @JSFJspAttribute(className="jakarta.el.ValueExpression",
deferredValueType="java.lang.Boolean")
public void setRendered(ValueExpression rendered)
{
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
index 56c53f8..1cddfaf 100755
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
@@ -23,17 +23,17 @@ import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.FacesContext;
import jakarta.faces.render.RenderKitFactory;
import jakarta.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.jstl.core.Config;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.jstl.core.Config;
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
import org.apache.myfaces.shared.util.LocaleUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java b/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
index e6caa92..8ba1dcc 100644
--- a/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.util;
import jakarta.faces.context.ExternalContext;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.apache.myfaces.shared.util.ExternalContextUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java b/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
index 106e704..b046ea5 100755
--- a/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
@@ -30,8 +30,8 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UICommand;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java b/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
index a398081..54ffbfd 100644
--- a/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
+++ b/impl/src/main/java/org/apache/myfaces/util/ExternalSpecifications.java
@@ -22,7 +22,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import jakarta.faces.context.ExternalContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.apache.myfaces.webapp.AbstractFacesInitializer;
/**
@@ -40,114 +41,124 @@ public final class ExternalSpecifications
{
private static final Logger log = Logger.getLogger(ExternalSpecifications.class.getName());
- private static volatile Boolean beanValidationAvailable;
- private static volatile Boolean cdiAvailable;
- private static volatile Boolean el3Available;
- private static volatile Boolean sevlet4Available;
-
- /**
- * This method determines if Bean Validation is present.
- *
- * Eager initialization is used for performance. This means Bean Validation binaries
- * should not be added at runtime after this variable has been set.
- * @return true if Bean Validation is available, false otherwise.
- */
- public static boolean isBeanValidationAvailable()
+ private static Lazy<Boolean> beanValidationAvailable = new Lazy<>(() ->
{
- if (beanValidationAvailable == null)
+ boolean available;
+ try
{
try
{
+ available = ClassUtils.classForName("javax.validation.Validation") != null;
+ }
+ catch(ClassNotFoundException e)
+ {
+ available = false;
+ }
+
+ if (available)
+ {
try
{
- beanValidationAvailable = (Class.forName("javax.validation.Validation") != null);
+ // Trial-error approach to check for Bean Validation impl existence.
+ // If any Exception occurs here, we assume that Bean Validation is not available.
+ // The cause may be anything, i.e. NoClassDef, config error...
+ _ValidationUtils.tryBuildDefaultValidatorFactory();
}
- catch(ClassNotFoundException e)
+ catch (Throwable t)
{
- beanValidationAvailable = Boolean.FALSE;
+ //log.log(Level.FINE, "Error initializing Bean Validation (could be normal)", t);
+ available = false;
}
-
- if (beanValidationAvailable)
- {
- try
- {
- // Trial-error approach to check for Bean Validation impl existence.
- // If any Exception occurs here, we assume that Bean Validation is not available.
- // The cause may be anything, i.e. NoClassDef, config error...
- _ValidationUtils.tryBuildDefaultValidatorFactory();
- }
- catch (Throwable t)
- {
- //log.log(Level.FINE, "Error initializing Bean Validation (could be normal)", t);
- beanValidationAvailable = false;
- }
- }
- }
- catch (Throwable t)
- {
- log.log(Level.FINE, "Error loading class (could be normal)", t);
- beanValidationAvailable = false;
}
+ }
+ catch (Throwable t)
+ {
+ log.log(Level.FINE, "Error loading class (could be normal)", t);
+ available = false;
+ }
+
+ log.info("MyFaces Core Bean Validation support " + (available ? "enabled" : "disabled"));
- log.info("MyFaces Bean Validation support " + (beanValidationAvailable ? "enabled" : "disabled"));
+ return available;
+ });
+
+ private static Lazy<Boolean> cdiAvailable = new Lazy<>(() ->
+ {
+ boolean available;
+ try
+ {
+ available = ClassUtils.classForName("jakarta.enterprise.inject.spi.BeanManager") != null;
}
- return beanValidationAvailable;
- }
+ catch (Throwable t)
+ {
+ //log.log(Level.FINE, "Error loading class (could be normal)", t);
+ available = false;
+ }
+
+ log.info("MyFaces Core CDI support " + (available ? "enabled" : "disabled"));
+
+ return available;
+ });
- public static boolean isCDIAvailable(ExternalContext externalContext)
+ private static Lazy<Boolean> el3Available = new Lazy<>(() ->
{
- if (cdiAvailable == null)
+ boolean available;
+ try
{
- try
- {
- cdiAvailable = Class.forName("javax.enterprise.inject.spi.BeanManager") != null;
- }
- catch (Throwable t)
- {
- //log.log(Level.FINE, "Error loading class (could be normal)", t);
- cdiAvailable = false;
- }
+ available = ClassUtils.classForName("jakarta.el.StaticFieldELResolver") != null ;
+ }
+ catch (Throwable t)
+ {
+ available = false;
+ }
+ log.info("MyFaces Core EL 3.0 support " + (available ? "enabled" : "disabled"));
- log.info("MyFaces CDI support " + (cdiAvailable ? "enabled" : "disabled"));
+ return available;
+ });
+
+ private static Lazy<Boolean> sevlet4Available = new Lazy<>(() ->
+ {
+ boolean available;
+ try
+ {
+ available = ClassUtils.classForName("jakarta.servlet.http.PushBuilder") != null
+ && HttpServletRequest.class.getMethod("newPushBuilder", (Class[]) null) != null;
+ }
+ catch (Throwable t)
+ {
+ available = false;
}
+ log.info("MyFaces Core Servlet 4.0 support " + (available ? "enabled" : "disabled"));
+
+ return available;
+ });
- return cdiAvailable &&
+ /**
+ * This method determines if Bean Validation is present.
+ *
+ * Eager initialization is used for performance. This means Bean Validation binaries
+ * should not be added at runtime after this variable has been set.
+ * @return true if Bean Validation is available, false otherwise.
+ */
+ public static boolean isBeanValidationAvailable()
+ {
+ return beanValidationAvailable.get();
+ }
+
+ public static boolean isCDIAvailable(ExternalContext externalContext)
+ {
+ return cdiAvailable.get() &&
externalContext.getApplicationMap().containsKey(AbstractFacesInitializer.CDI_BEAN_MANAGER_INSTANCE);
}
public static boolean isEL3Available()
{
- if (el3Available == null)
- {
- try
- {
- el3Available = Class.forName("javax.el.StaticFieldELResolver") != null ;
- }
- catch (Throwable t)
- {
- el3Available = false;
- }
- log.info("MyFaces EL 3.0 support " + (el3Available ? "enabled" : "disabled"));
- }
- return el3Available;
+ return el3Available.get();
}
public static boolean isServlet4Available()
{
- if (sevlet4Available == null)
- {
- try
- {
- sevlet4Available = Class.forName("javax.servlet.http.PushBuilder") != null
- && HttpServletRequest.class.getMethod("newPushBuilder", (Class[]) null) != null;
- }
- catch (Throwable t)
- {
- sevlet4Available = false;
- }
- log.info("MyFaces Servlet 4.0 support " + (sevlet4Available ? "enabled" : "disabled"));
- }
- return sevlet4Available;
+ return sevlet4Available.get();
}
/**
diff --git a/impl/src/main/java/org/apache/myfaces/util/Lazy.java b/impl/src/main/java/org/apache/myfaces/util/Lazy.java
new file mode 100644
index 0000000..6502a24
--- /dev/null
+++ b/impl/src/main/java/org/apache/myfaces/util/Lazy.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.util;
+
+import java.util.function.Supplier;
+
+/**
+ * Inspired by commons-lang LazyInitializer.
+ *
+ * @param <T> The type to be lazy initialized.
+ */
+public class Lazy<T>
+{
+
+ private static final Object NOT_INITIALIZED = new Object();
+
+ @SuppressWarnings("unchecked")
+ private volatile T value = (T) NOT_INITIALIZED;
+ private volatile Supplier<T> init;
+
+ public Lazy(Supplier<T> init)
+ {
+ this.init = init;
+ }
+
+ public synchronized void reset(Supplier<T> init)
+ {
+ this.init = init;
+ this.value = (T) NOT_INITIALIZED;
+ }
+
+ public synchronized void reset(T value)
+ {
+ this.value = value;
+ }
+
+ public T get()
+ {
+ T result = value;
+
+ if (result == NOT_INITIALIZED)
+ {
+ synchronized (this)
+ {
+ result = value;
+ if (result == NOT_INITIALIZED)
+ {
+ value = init.get();
+ result = value;
+ }
+ }
+ }
+
+ return result;
+ }
+
+ public boolean isInitialized()
+ {
+ return value != NOT_INITIALIZED;
+ }
+}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java b/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java
index 75f17c3..ad8c6bb 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets;
import java.io.IOException;
import java.net.URL;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java b/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
index 8b7561c..0ea3dbd 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets;
import java.io.IOException;
import java.util.Iterator;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java b/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
index 66048c6..6ec7267 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
@@ -27,7 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.ProjectStage;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
index 4c0a595..da54190 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.view.facelets.FaceletException;
import java.io.IOException;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
index 7ef4dc9..f26e617 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
@@ -37,11 +37,11 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Stream;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import jakarta.faces.FacesException;
import jakarta.faces.FacesWrapper;
import jakarta.faces.application.Application;
@@ -90,7 +90,7 @@ import jakarta.faces.view.ViewMetadata;
import jakarta.faces.view.facelets.Facelet;
import jakarta.faces.view.facelets.FaceletContext;
import jakarta.faces.view.facelets.ResourceResolver;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.application.StateManagerImpl;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/PageContext.java b/impl/src/main/java/org/apache/myfaces/view/facelets/PageContext.java
index c919d93..c549fe9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/PageContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/PageContext.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* This class is used to encapsulate the information required at page scope.
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateClient.java b/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateClient.java
index ce8361a..a2ad649 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateClient.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateClient.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -55,5 +55,5 @@ public interface TemplateClient
* @throws ELException
*/
public boolean apply(FaceletContext ctx, UIComponent parent, String name) throws IOException, FacesException,
- FaceletException, ELException;;
+ FaceletException, ELException;
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java b/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java
index d93f283..09b640e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.Map;
import java.util.Set;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.Facelet;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AddFacesMessageInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AddFacesMessageInstruction.java
index cc4e4a7..acb37b3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AddFacesMessageInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AddFacesMessageInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AttributeInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AttributeInstruction.java
index e20463c..75b1a0b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AttributeInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AttributeInstruction.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.ResponseWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
index e12ddee..5ccd0be 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/BodyEndElementInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.application.ProjectStage;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CommentInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CommentInstruction.java
index a3487ca..d753032 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CommentInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CommentInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.view.facelets.el.ELText;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java
index 1709e22..d1e06ce 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
index 3d446ae..4da85bc 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.FacesException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.view.facelets.FaceletException;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompositeTextInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompositeTextInstruction.java
index a30d2a2..d3fbf74 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompositeTextInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompositeTextInstruction.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DoctypeInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DoctypeInstruction.java
index e477cf2..7d875ce 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DoctypeInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/DoctypeInstruction.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EncodingHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EncodingHandler.java
index 982a598..09d3326 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EncodingHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EncodingHandler.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
import java.util.List;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EndElementInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EndElementInstruction.java
index a45a046..edb14c4 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EndElementInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/EndElementInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
final class EndElementInstruction implements Instruction
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Instruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Instruction.java
index fa3b1d1..0fb3add 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Instruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Instruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
interface Instruction
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralAttributeInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralAttributeInstruction.java
index 3cd9bbe..fd0247a 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralAttributeInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralAttributeInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
final class LiteralAttributeInstruction implements Instruction
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralCommentInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralCommentInstruction.java
index 68ad0cc..7e5c981 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralCommentInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralCommentInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
final class LiteralCommentInstruction implements Instruction
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralNonExcapedTextInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralNonExcapedTextInstruction.java
index 4931e94..4aed309 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralNonExcapedTextInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralNonExcapedTextInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralTextInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralTextInstruction.java
index 0036aa1..13e6fad 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralTextInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralTextInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
final class LiteralTextInstruction implements Instruction
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralXMLInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralXMLInstruction.java
index 85d8ee2..7b9f451 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralXMLInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/LiteralXMLInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.ResponseWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java
index cb8eaa2..5f8ff50 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java
@@ -22,15 +22,15 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.FunctionMapper;
+import jakarta.el.ELException;
+import jakarta.el.FunctionMapper;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.ComponentHandler;
import jakarta.faces.view.facelets.FaceletContext;
import jakarta.faces.view.facelets.FaceletException;
import jakarta.faces.view.facelets.FaceletHandler;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import org.apache.myfaces.el.unified.FacesELContext;
import org.apache.myfaces.view.facelets.el.CompositeFunctionMapper;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
index 42aebc2..23fb519 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
@@ -31,9 +31,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.view.Location;
import jakarta.faces.view.facelets.FaceletException;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/StartElementInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/StartElementInstruction.java
index 8f11fad..b45b411 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/StartElementInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/StartElementInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
final class StartElementInstruction implements Instruction
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextInstruction.java
index 1cdd92a..90d91e3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.ResponseWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
index 9035a42..bce1fb0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Stack;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.view.facelets.CompositeFaceletHandler;
import jakarta.faces.view.facelets.FaceletHandler;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java
index 9d9f7ad..4cc15d6 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
import java.io.Writer;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UniqueIdVendor;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
index ec1ca9f..d72d216 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.ContextCallback;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/XMLInstruction.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/XMLInstruction.java
index 851114b..b5f9fbf 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/XMLInstruction.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/XMLInstruction.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.compiler;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContext;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.context.FacesContext;
import jakarta.faces.context.ResponseWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java b/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
index 9f3497b..e93bac7 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
import jakarta.faces.component.ContextCallback;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CacheableValueExpressionWrapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CacheableValueExpressionWrapper.java
index c0d775f..003c264 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CacheableValueExpressionWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CacheableValueExpressionWrapper.java
@@ -22,9 +22,9 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.FacesWrapper;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeFunctionMapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeFunctionMapper.java
index ff4cf20..8c418b0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeFunctionMapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeFunctionMapper.java
@@ -20,13 +20,13 @@ package org.apache.myfaces.view.facelets.el;
import java.lang.reflect.Method;
-import javax.el.FunctionMapper;
+import jakarta.el.FunctionMapper;
/**
* Composite FunctionMapper that attempts to load the Method from the first FunctionMapper, then the second if
* <code>null</code>.
*
- * @see javax.el.FunctionMapper
+ * @see jakarta.el.FunctionMapper
* @see java.lang.reflect.Method
*
* @author Jacob Hookom
@@ -46,7 +46,7 @@ public final class CompositeFunctionMapper extends FunctionMapper
}
/**
- * @see javax.el.FunctionMapper#resolveFunction(java.lang.String, java.lang.String)
+ * @see jakarta.el.FunctionMapper#resolveFunction(java.lang.String, java.lang.String)
*/
public Method resolveFunction(String prefix, String name)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeVariableMapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeVariableMapper.java
index 122cecf..b96e921 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeVariableMapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeVariableMapper.java
@@ -18,15 +18,15 @@
*/
package org.apache.myfaces.view.facelets.el;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
/**
* Composite VariableMapper that attempts to load the ValueExpression from the first VariableMapper, then the second if
* <code>null</code>.
*
- * @see javax.el.VariableMapper
- * @see javax.el.ValueExpression
+ * @see jakarta.el.VariableMapper
+ * @see jakarta.el.ValueExpression
*
* @author Jacob Hookom
* @version $Id$
@@ -45,7 +45,7 @@ public final class CompositeVariableMapper extends VariableMapper
}
/**
- * @see javax.el.VariableMapper#resolveVariable(java.lang.String)
+ * @see jakarta.el.VariableMapper#resolveVariable(java.lang.String)
*/
public ValueExpression resolveVariable(String name)
{
@@ -58,7 +58,7 @@ public final class CompositeVariableMapper extends VariableMapper
}
/**
- * @see javax.el.VariableMapper#setVariable(java.lang.String, javax.el.ValueExpression)
+ * @see jakarta.el.VariableMapper#setVariable(java.lang.String, jakarta.el.ValueExpression)
*/
public ValueExpression setVariable(String name, ValueExpression expression)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAware.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAware.java
index 943d58d..ae8ce73 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAware.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAware.java
@@ -25,7 +25,7 @@ package org.apache.myfaces.view.facelets.el;
*
* <ol>
* <li>Location - location instance - see {@link LocationAware}</li>
- * <li>expressionString - expression String {@link javax.el.Expression#getExpressionString()}</li>
+ * <li>expressionString - expression String {@link jakarta.el.Expression#getExpressionString()}</li>
* <li>qName - the qualified name for attribute
* {@link jakarta.faces.view.facelets.TagAttribute#getQName()}</li>
* </ol>
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java
index 8e07d04..d43ea77 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.el;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.view.Location;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareException.java
index 35b0688..6d51d4c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareException.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.el;
import jakarta.faces.view.Location;
/**
- * Implementation of types {@link javax.el.ELException}, {@link ContextAware}
+ * Implementation of types {@link jakarta.el.ELException}, {@link ContextAware}
* and {@link jakarta.faces.FacesWrapper}
*
* @author martinkoci
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java
index e64863e..8a41ddd 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.el;
-import javax.el.MethodNotFoundException;
+import jakarta.el.MethodNotFoundException;
import jakarta.faces.view.Location;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
index 4b820cd..e7f2ad9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.el;
import jakarta.faces.view.Location;
/**
- * Implementation of types {@link javax.el.PropertyNotFoundException},
+ * Implementation of types {@link jakarta.el.PropertyNotFoundException},
* {@link ContextAware} and {@link jakarta.faces.FacesWrapper}
*
* @author martinkoci
@@ -29,7 +29,7 @@ import jakarta.faces.view.Location;
* @see ContextAware
*/
public class ContextAwarePropertyNotFoundException
- extends javax.el.PropertyNotFoundException
+ extends jakarta.el.PropertyNotFoundException
implements ContextAwareExceptionWrapper
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java
index e9429e8..8011ee6 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.el;
import jakarta.faces.view.Location;
/**
- * Implementation of types {@link javax.el.PropertyNotWritableException},
+ * Implementation of types {@link jakarta.el.PropertyNotWritableException},
* {@link ContextAware} and {@link jakarta.faces.FacesWrapper}
*
* @author martinkoci
@@ -29,7 +29,7 @@ import jakarta.faces.view.Location;
* @see ContextAware
*/
public class ContextAwarePropertyNotWritableException
- extends javax.el.PropertyNotWritableException
+ extends jakarta.el.PropertyNotWritableException
implements ContextAwareExceptionWrapper
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java
index 6a8bdc2..732b33e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
-import javax.el.MethodNotFoundException;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
+import jakarta.el.MethodNotFoundException;
+import jakarta.el.PropertyNotFoundException;
import jakarta.faces.FacesWrapper;
import jakarta.faces.view.Location;
import jakarta.faces.view.facelets.TagAttribute;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java
index b3e6fb2..65985d7 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.FacesWrapper;
import jakarta.faces.view.Location;
import jakarta.faces.view.facelets.TagAttribute;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java
index 325f4c4..d2c4c76 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.el;
-import javax.el.ELContext;
+import jakarta.el.ELContext;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
@@ -31,7 +31,7 @@ public class ContextAwareUtils
* the location, expression string and tag name can be retrieved by
* the ExceptionHandler implementation and used to output meaningful information about itself.
*
- * <p>Note in some cases this will wrap the original javax.el.ELException, so the
+ * <p>Note in some cases this will wrap the original jakarta.el.ELException, so the
* information will not be on the stack trace unless ExceptionHandler
* retrieve checking if the exception implements ContextAware interface and calling getWrapped() method.
* </p>
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
index 1d2b0e5..83a7fa4 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
@@ -26,7 +26,7 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.el.FunctionMapper;
+import jakarta.el.FunctionMapper;
import org.apache.myfaces.view.facelets.util.ReflectionUtil;
@@ -34,7 +34,7 @@ import org.apache.myfaces.view.facelets.util.ReflectionUtil;
* Default implementation of the FunctionMapper
*
* @see java.lang.reflect.Method
- * @see javax.el.FunctionMapper
+ * @see jakarta.el.FunctionMapper
*
* @author Jacob Hookom
* @version $Id$
@@ -48,7 +48,7 @@ public final class DefaultFunctionMapper extends FunctionMapper implements Exter
/*
* (non-Javadoc)
*
- * @see javax.el.FunctionMapper#resolveFunction(java.lang.String, java.lang.String)
+ * @see jakarta.el.FunctionMapper#resolveFunction(java.lang.String, java.lang.String)
*/
public Method resolveFunction(String prefix, String localName)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java
index ea5ef52..cb5d3d3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultVariableMapper.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets.el;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import org.apache.myfaces.view.facelets.PageContext;
import org.apache.myfaces.view.facelets.TemplateContext;
@@ -30,8 +30,8 @@ import org.apache.myfaces.view.facelets.TemplateContext;
/**
* Default instance of a VariableMapper backed by a Map
*
- * @see javax.el.VariableMapper
- * @see javax.el.ValueExpression
+ * @see jakarta.el.VariableMapper
+ * @see jakarta.el.ValueExpression
* @see java.util.Map
*
* @author Jacob Hookom
@@ -65,7 +65,7 @@ public final class DefaultVariableMapper extends VariableMapperBase
}
/**
- * @see javax.el.VariableMapper#resolveVariable(java.lang.String)
+ * @see jakarta.el.VariableMapper#resolveVariable(java.lang.String)
*/
public ValueExpression resolveVariable(String name)
{
@@ -150,7 +150,7 @@ public final class DefaultVariableMapper extends VariableMapperBase
}
/**
- * @see javax.el.VariableMapper#setVariable(java.lang.String, javax.el.ValueExpression)
+ * @see jakarta.el.VariableMapper#setVariable(java.lang.String, jakarta.el.ValueExpression)
*/
public ValueExpression setVariable(String name, ValueExpression expression)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
index 9056d68..5d2f491 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
@@ -23,10 +23,10 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.ResponseWriter;
import jakarta.faces.view.Location;
@@ -449,7 +449,7 @@ public class ELText
* @param in
* String to parse
* @return ELText instance that knows if the String was literal or not
- * @throws javax.el.ELException
+ * @throws jakarta.el.ELException
*/
public static ELText parse(String in) throws ELException
{
@@ -480,7 +480,7 @@ public class ELText
* @param in
* String to parse
* @return ELText that can be re-applied later
- * @throws javax.el.ELException
+ * @throws jakarta.el.ELException
*/
public static ELText parse(ExpressionFactory fact, ELContext ctx, String in) throws ELException
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
index 23608df..816b1ee 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
@@ -22,12 +22,12 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.UIViewRoot;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/LegacyMethodBinding.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/LegacyMethodBinding.java
index 58dc584..a2e290e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/LegacyMethodBinding.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/LegacyMethodBinding.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.el;
import java.io.Serializable;
-import javax.el.ELException;
-import javax.el.MethodExpression;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
import jakarta.faces.context.FacesContext;
import jakarta.faces.el.EvaluationException;
import jakarta.faces.el.MethodBinding;
@@ -58,7 +58,7 @@ public final class LegacyMethodBinding extends MethodBinding implements
{
return m.getMethodInfo(context.getELContext()).getReturnType();
}
- catch (javax.el.MethodNotFoundException e)
+ catch (jakarta.el.MethodNotFoundException e)
{
throw new MethodNotFoundException(e.getMessage(), e.getCause());
}
@@ -81,7 +81,7 @@ public final class LegacyMethodBinding extends MethodBinding implements
{
return m.invoke(context.getELContext(), params);
}
- catch (javax.el.MethodNotFoundException e)
+ catch (jakarta.el.MethodNotFoundException e)
{
throw new MethodNotFoundException(e.getMessage(), e.getCause());
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
index e13f9b2..60e6e13 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
import jakarta.faces.FacesWrapper;
import jakarta.faces.context.FacesContext;
import jakarta.faces.view.Location;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
index 9e9dfd4..5f17878 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.FacesWrapper;
import jakarta.faces.context.FacesContext;
import jakarta.faces.view.Location;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java
index f340033..8a00c56 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java
@@ -22,12 +22,12 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
-import javax.el.MethodNotFoundException;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
+import jakarta.el.MethodNotFoundException;
+import jakarta.el.PropertyNotFoundException;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionActionListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionActionListener.java
index 9650c2c..a15147c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionActionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionActionListener.java
@@ -22,9 +22,9 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesWrapper;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.AbortProcessingException;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java
index 65d721b..d2ad5e8 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValueChangeListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValueChangeListener.java
index 0d68800..9f5d351 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValueChangeListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValueChangeListener.java
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesWrapper;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.AbortProcessingException;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ResourceLocationValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ResourceLocationValueExpression.java
index 18d899d..9c7653c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ResourceLocationValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ResourceLocationValueExpression.java
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.view.facelets.el;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.FacesWrapper;
import jakarta.faces.context.FacesContext;
import jakarta.faces.view.Location;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java
index e20bcac..1d8807f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
-import javax.el.MethodNotFoundException;
-import javax.el.PropertyNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
+import jakarta.el.MethodNotFoundException;
+import jakarta.el.PropertyNotFoundException;
import jakarta.faces.FacesWrapper;
import jakarta.faces.view.facelets.TagAttribute;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagValueExpression.java
index bebaaf7..5fc5147 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagValueExpression.java
@@ -23,12 +23,12 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.el.ValueExpression;
-import javax.el.ValueReference;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.PropertyNotFoundException;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.el.ValueExpression;
+import jakarta.el.ValueReference;
import jakarta.faces.FacesWrapper;
import jakarta.faces.view.facelets.TagAttribute;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
index f5c4297..9dc6565 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesWrapper;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperBase.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperBase.java
index c26a32c..093070b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperBase.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperBase.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.el;
-import javax.el.VariableMapper;
+import jakarta.el.VariableMapper;
/**
* Defines an interface to detect when an EL expression has been
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
index 84cf255..723669e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.view.facelets.el;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import jakarta.faces.FacesWrapper;
/**
@@ -65,7 +65,7 @@ public final class VariableMapperWrapper extends VariableMapperBase implements F
/**
* First tries to resolve agains the inner Map, then the wrapped ValueExpression.
*
- * @see javax.el.VariableMapper#resolveVariable(java.lang.String)
+ * @see jakarta.el.VariableMapper#resolveVariable(java.lang.String)
*/
public ValueExpression resolveVariable(String variable)
{
@@ -100,7 +100,7 @@ public final class VariableMapperWrapper extends VariableMapperBase implements F
/**
* Set the ValueExpression on the inner Map instance.
*
- * @see javax.el.VariableMapper#setVariable(java.lang.String, javax.el.ValueExpression)
+ * @see jakarta.el.VariableMapper#setVariable(java.lang.String, jakarta.el.ValueExpression)
*/
public ValueExpression setVariable(String variable, ValueExpression expression)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
index 349255e..0055cd1 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
@@ -35,8 +35,8 @@ import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.application.ViewResource;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
index 3f829dc..fb475ec 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
@@ -27,13 +27,13 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.FunctionMapper;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.FunctionMapper;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
index d34b7f3..88183fd 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
@@ -28,7 +28,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.ViewResource;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
index efc6375..e05b4ed 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
@@ -77,7 +77,7 @@ public class FaceletCompositionContextImpl extends FaceletCompositionContext
* the location, expression string and tag name can be retrieved by
* the ExceptionHandler implementation and used to output meaningful information about itself.
*
- * <p>Note in some cases this will wrap the original javax.el.ELException,
+ * <p>Note in some cases this will wrap the original jakarta.el.ELException,
* so the information will not be on the stack trace unless ExceptionHandler
* retrieve checking if the exception implements ContextAware interface and calling getWrapped() method.
* </p>
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java
index 18e0928..2f922a0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.impl;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import org.apache.myfaces.view.facelets.PageContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
index 515771f..b121efe 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
@@ -29,8 +29,8 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.Facelet;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java
index c9e8c15..6e19e43 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java
@@ -25,7 +25,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.application.Resource;
import jakarta.faces.application.ResourceHandler;
@@ -298,7 +298,7 @@ public abstract class AbstractTagLibrary implements TagLibrary
/**
* Add a Method to be used as a Function at Compilation.
*
- * See javax.el.FunctionMapper
+ * See jakarta.el.FunctionMapper
*
* @param name
* (suffix) of function name
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java
index 448517f..ecd733f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java
@@ -23,7 +23,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.view.facelets.ComponentConfig;
import jakarta.faces.view.facelets.FaceletException;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/CompositeFaceletHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/CompositeFaceletHandler.java
index d5d3425..a0f8170 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/CompositeFaceletHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/CompositeFaceletHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/LegacyUserTagHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/LegacyUserTagHandler.java
index 3ad2ce4..0e74d4b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/LegacyUserTagHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/LegacyUserTagHandler.java
@@ -25,9 +25,9 @@ import java.net.URL;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
index a339322..0419da9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.tag;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.view.facelets.FaceletContext;
import jakarta.faces.view.facelets.MetaRule;
import jakarta.faces.view.facelets.Metadata;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
index f708986..9e4f6f5 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
@@ -20,10 +20,10 @@ package org.apache.myfaces.view.facelets.tag;
import java.util.Arrays;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.Location;
import jakarta.faces.view.facelets.FaceletContext;
@@ -185,7 +185,7 @@ public final class TagAttributeImpl extends TagAttribute
/**
* Create a MethodExpression, using this attribute's value as the expression String.
*
- * See ExpressionFactory#createMethodExpression(javax.el.ELContext, java.lang.String, java.lang.Class,
+ * See ExpressionFactory#createMethodExpression(jakarta.el.ELContext, java.lang.String, java.lang.Class,
* java.lang.Class[])
* See MethodExpression
* @param ctx
@@ -415,7 +415,7 @@ public final class TagAttributeImpl extends TagAttribute
* and evaluate it.
*
* See ExpressionFactory#coerceToType(java.lang.Object, java.lang.Class)
- * See ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
+ * See ExpressionFactory#createValueExpression(jakarta.el.ELContext, java.lang.String, java.lang.Class)
* See ValueExpression
* @param ctx
* FaceletContext to use
@@ -460,7 +460,7 @@ public final class TagAttributeImpl extends TagAttribute
/**
* Create a ValueExpression, using this attribute's literal value and the passed expected type.
*
- * See ExpressionFactory#createValueExpression(javax.el.ELContext, java.lang.String, java.lang.Class)
+ * See ExpressionFactory#createValueExpression(jakarta.el.ELContext, java.lang.String, java.lang.Class)
* See ValueExpression
* @param ctx
* FaceletContext to use
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerFactory.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerFactory.java
index 169f9cd..6753e93 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.view.facelets.TagConfig;
import jakarta.faces.view.facelets.TagHandler;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
index 397fa6a..aa60f4c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
@@ -25,8 +25,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -92,7 +92,7 @@ final class UserTagHandler extends TagHandler implements TemplateClient, Compone
* Facelet. Finally, replace the old VariableMapper.
*
* @see TagAttribute#getValueExpression(FaceletContext, Class)
- * @see javax.el.VariableMapper
+ * @see jakarta.el.VariableMapper
* @see jakarta.faces.view.facelets.FaceletHandler#apply(FaceletContext,
* UIComponent)
*/
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
index f552f96..f01177c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
@@ -58,7 +58,7 @@ public abstract class AttachedObjectTargetHandler<T extends AttachedObjectTarget
*
*/
@JSFFaceletAttribute(name="name",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String",
required=true)
protected final TagAttribute _name;
@@ -67,7 +67,7 @@ public abstract class AttachedObjectTargetHandler<T extends AttachedObjectTarget
*
*/
@JSFFaceletAttribute(name="targets",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
protected final TagAttribute _targets;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
index dc9237f..e654725 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
import jakarta.faces.view.AttachedObjectTarget;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
index 5f4353d..a70a7e2 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
@@ -70,13 +70,13 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
};
@JSFFaceletAttribute(name="name",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String",
required=true)
private final TagAttribute _name;
@JSFFaceletAttribute(name="targets",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _targets;
@@ -86,7 +86,7 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
* instead null.
*/
@JSFFaceletAttribute(name="default",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _default;
@@ -94,7 +94,7 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="displayName",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _displayName;
@@ -105,7 +105,7 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
* not ProjectStage.Production when a composite component is created.</p>
*/
@JSFFaceletAttribute(name="required",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _required;
@@ -113,7 +113,7 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="preferred",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _preferred;
@@ -121,7 +121,7 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="expert",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _expert;
@@ -129,17 +129,17 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="shortDescription",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _shortDescription;
@JSFFaceletAttribute(name="method-signature",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _methodSignature;
@JSFFaceletAttribute(name="type",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _type;
@@ -149,12 +149,12 @@ public class AttributeHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="hidden",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
protected final TagAttribute _hidden;
@JSFFaceletAttribute(name="targetAttributeName",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _targetAttributeName;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
index 7ce3516..b0ff7d0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.behavior.ClientBehaviorHolder;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java
index 178ac67..2377154 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java
@@ -55,7 +55,7 @@ public class ClientBehaviorHandler extends TagHandler implements InterfaceDescri
* words, this is the "real" event name.
*/
@JSFFaceletAttribute(name="event",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String",
required=true)
protected final TagAttribute _event;
@@ -68,7 +68,7 @@ public class ClientBehaviorHandler extends TagHandler implements InterfaceDescri
*
*/
@JSFFaceletAttribute(name="name",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String",
required=true)
protected final TagAttribute _name;
@@ -80,7 +80,7 @@ public class ClientBehaviorHandler extends TagHandler implements InterfaceDescri
* a composite component interface description.
*/
@JSFFaceletAttribute(name="default",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
protected final TagAttribute _default;
@@ -91,7 +91,7 @@ public class ClientBehaviorHandler extends TagHandler implements InterfaceDescri
*
*/
@JSFFaceletAttribute(name="targets",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
protected final TagAttribute _targets;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java
index 5e945ce..b32698e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.ContextCallback;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
index dcba58c..202b3d3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
@@ -29,9 +29,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import jakarta.faces.FacesException;
import jakarta.faces.application.ProjectStage;
import jakarta.faces.application.Resource;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java
index 465f4ca..7d0e54e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetadataTargetImpl.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.view.facelets.MetadataTarget;
import jakarta.faces.context.FacesContext;
import org.apache.myfaces.shared.util.ClassUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java
index 557b350..d6e871c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java
@@ -75,7 +75,7 @@ public class FacetHandler extends TagHandler implements InterfaceDescriptorCreat
*
*/
@JSFFaceletAttribute(name="name",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _name;
@@ -83,7 +83,7 @@ public class FacetHandler extends TagHandler implements InterfaceDescriptorCreat
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="displayName",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _displayName;
@@ -95,7 +95,7 @@ public class FacetHandler extends TagHandler implements InterfaceDescriptorCreat
* </p>
*/
@JSFFaceletAttribute(name="required",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _required;
@@ -103,7 +103,7 @@ public class FacetHandler extends TagHandler implements InterfaceDescriptorCreat
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="preferred",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _preferred;
@@ -111,7 +111,7 @@ public class FacetHandler extends TagHandler implements InterfaceDescriptorCreat
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="expert",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _expert;
@@ -119,7 +119,7 @@ public class FacetHandler extends TagHandler implements InterfaceDescriptorCreat
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="shortDescription",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _shortDescription;
@@ -129,7 +129,7 @@ public class FacetHandler extends TagHandler implements InterfaceDescriptorCreat
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="hidden",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
protected final TagAttribute _hidden;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
index b440031..7d2af86 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
@@ -68,7 +68,7 @@ public class InsertFacetHandler extends TagHandler
* The name that identify the current facet.
*/
@JSFFaceletAttribute(name="name",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String",
required=true)
protected final TagAttribute _name;
@@ -78,7 +78,7 @@ public class InsertFacetHandler extends TagHandler
* this composite component.
*/
@JSFFaceletAttribute(name="required",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
protected final TagAttribute _required;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
index 8a66385..b574dc3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
@@ -69,7 +69,7 @@ public class InterfaceHandler extends TagHandler implements InterfaceDescriptorC
*
*/
@JSFFaceletAttribute(name="name",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _name;
@@ -77,7 +77,7 @@ public class InterfaceHandler extends TagHandler implements InterfaceDescriptorC
*
*/
@JSFFaceletAttribute(name="componentType",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _componentType;
@@ -85,7 +85,7 @@ public class InterfaceHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="displayName",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _displayName;
@@ -93,7 +93,7 @@ public class InterfaceHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="preferred",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _preferred;
@@ -101,7 +101,7 @@ public class InterfaceHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="expert",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
private final TagAttribute _expert;
@@ -109,7 +109,7 @@ public class InterfaceHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="shortDescription",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _shortDescription;
@@ -119,7 +119,7 @@ public class InterfaceHandler extends TagHandler implements InterfaceDescriptorC
* Only available if ProjectStage is Development.
*/
@JSFFaceletAttribute(name="hidden",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
protected final TagAttribute _hidden;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
index 0468651..6003841 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
@@ -54,7 +54,7 @@ public class RenderFacetHandler extends ComponentHandler
* The name that identify the current facet.
*/
@JSFFaceletAttribute(name="name",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String",
required=true)
protected final TagAttribute _name;
@@ -64,7 +64,7 @@ public class RenderFacetHandler extends ComponentHandler
* this composite component.
*/
@JSFFaceletAttribute(name="required",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="boolean")
protected final TagAttribute _required;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java
index 890d1de..b2a7ecb 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.composite;
import java.beans.PropertyDescriptor;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
import jakarta.faces.view.facelets.MetaRule;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java
index 6b8205e..e99a43b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jsf;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.component.ActionSource;
import jakarta.faces.component.ActionSource2;
import jakarta.faces.event.ActionEvent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
index 29519b1..7971d5d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jsf;
import java.io.IOException;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.behavior.Behavior;
import jakarta.faces.component.behavior.ClientBehavior;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ClearBindingValueExpressionListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ClearBindingValueExpressionListener.java
index 0166067..19ce9d6 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ClearBindingValueExpressionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ClearBindingValueExpressionListener.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.ComponentSystemEvent;
import jakarta.faces.event.ComponentSystemEventListener;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java
index bb0865b..38dc0f0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.Application;
import jakarta.faces.component.ActionSource;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
index 5a4feae..9598a64 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
@@ -28,7 +28,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesWrapper;
import jakarta.faces.application.Application;
import jakarta.faces.application.ProjectStage;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java
index cbd052a..9032d46 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.tag.jsf;
import java.io.IOException;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.ValueHolder;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
index d85d60a..c6d6186 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jsf;
import java.io.IOException;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.ValueHolder;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java
index 78e46e4..7711cbc 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jsf;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/FaceletState.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/FaceletState.java
index 89fef59..7cdd4c6 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/FaceletState.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/FaceletState.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.tag.jsf;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHolder;
import jakarta.faces.component.UIComponentBase;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionActionListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionActionListener.java
index 28c3755..ebda6dd 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionActionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionActionListener.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jsf;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.MethodExpressionActionListener;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValidator.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValidator.java
index 74124ae..c943df2 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValidator.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jsf;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.context.FacesContext;
import jakarta.faces.validator.MethodExpressionValidator;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValueChangeListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValueChangeListener.java
index 5918a15..b135864 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValueChangeListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/PartialMethodExpressionValueChangeListener.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jsf;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.MethodExpressionValueChangeListener;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java
index 7e7b944..58892a0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java
@@ -20,8 +20,8 @@ package org.apache.myfaces.view.facelets.tag.jsf;
import java.io.IOException;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
index 089769e..cfeeffe 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesWrapper;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
index 5b07a2f..5f2e6f1 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
import java.io.Serializable;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.ActionSource;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
index 5e5c4ff..111d655 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
import jakarta.faces.application.ResourceHandler;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.component.UIComponent;
@@ -100,35 +100,35 @@ public class AjaxHandler extends TagHandler implements
/**
*
*/
- @JSFFaceletAttribute(name = "disabled", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "disabled", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.Boolean")
private final TagAttribute _disabled;
/**
*
*/
- @JSFFaceletAttribute(name = "event", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "event", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.String")
private final TagAttribute _event;
/**
*
*/
- @JSFFaceletAttribute(name = "execute", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "execute", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.Object")
private final TagAttribute _execute;
/**
*
*/
- @JSFFaceletAttribute(name = "immediate", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "immediate", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.Boolean")
private final TagAttribute _immediate;
/**
*
*/
- @JSFFaceletAttribute(name = "listener", className = "javax.el.MethodExpression",
+ @JSFFaceletAttribute(name = "listener", className = "jakarta.el.MethodExpression",
deferredMethodSignature = "public void m(jakarta.faces.event.AjaxBehaviorEvent evt) "
+ "throws jakarta.faces.event.AbortProcessingException")
private final TagAttribute _listener;
@@ -136,31 +136,31 @@ public class AjaxHandler extends TagHandler implements
/**
*
*/
- @JSFFaceletAttribute(name = "onevent", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "onevent", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.String")
private final TagAttribute _onevent;
/**
*
*/
- @JSFFaceletAttribute(name = "onerror", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "onerror", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.String")
private final TagAttribute _onerror;
/**
*
*/
- @JSFFaceletAttribute(name = "render", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "render", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.Object")
private final TagAttribute _render;
/**
*
*/
- @JSFFaceletAttribute(name = "delay", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "delay", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.String")
private final TagAttribute _delay;
- @JSFFaceletAttribute(name = "resetValues", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "resetValues", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.Boolean")
private final TagAttribute _resetValues;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributeHandler.java
index d4d8124..619b1ac 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributeHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributeHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -37,7 +37,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFacelet
* instead set the ValueExpression on the UIComponent.
*
* See jakarta.faces.component.UIComponent#getAttributes()
- * See jakarta.faces.component.UIComponent#setValueExpression(java.lang.String, javax.el.ValueExpression)
+ * See jakarta.faces.component.UIComponent#setValueExpression(java.lang.String, jakarta.el.ValueExpression)
* @author Jacob Hookom
* @version $Id$
*/
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java
index 6e1990c..923a9ce 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AttributesHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
import java.util.Map;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
import jakarta.faces.view.facelets.TagAttribute;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java
index 42d0d27..3e5bf26 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.util.TimeZone;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.convert.Converter;
import jakarta.faces.convert.DateTimeConverter;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java
index 4dccaf7..43732ec 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDelegateHandler.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jsf.core;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.convert.Converter;
import jakarta.faces.view.facelets.ConverterConfig;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java
index 200a5f5..8857221 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertNumberHandler.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.view.facelets.tag.jsf.core;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.convert.Converter;
import jakarta.faces.convert.NumberConverter;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
index e10fa43..1d50c6e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
@@ -23,10 +23,10 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.el.MethodNotFoundException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodNotFoundException;
import jakarta.faces.FacesException;
import jakarta.faces.component.PartialStateHolder;
import jakarta.faces.component.UIComponent;
@@ -67,14 +67,14 @@ public final class EventHandler extends TagHandler
private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
@JSFFaceletAttribute(name="listener",
- className="javax.el.MethodExpression",
+ className="jakarta.el.MethodExpression",
deferredMethodSignature=
"public void listener(jakarta.faces.event.ComponentSystemEvent evt) "
+ "throws jakarta.faces.event.AbortProcessingException")
private TagAttribute listener;
@JSFFaceletAttribute(name="type",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private TagAttribute type;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java
index 20cbd16..9ce89c8 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/FacetHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
index 2bef8d5..6b4a155 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
@@ -28,7 +28,7 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Set;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIViewRoot;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PassThroughAttributeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PassThroughAttributeHandler.java
index 39d30f8..8f40add 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PassThroughAttributeHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PassThroughAttributeHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PhaseListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PhaseListenerHandler.java
index e4036d5..6d436b9c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PhaseListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/PhaseListenerHandler.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
import java.io.Serializable;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIViewRoot;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ResetValuesActionListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ResetValuesActionListenerHandler.java
index 9a16d00..45624c7 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ResetValuesActionListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ResetValuesActionListenerHandler.java
@@ -25,8 +25,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.ActionSource;
import jakarta.faces.component.UIComponent;
@@ -64,7 +64,7 @@ public class ResetValuesActionListenerHandler extends TagHandler
/**
*
*/
- @JSFFaceletAttribute(name = "render", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "render", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.Object")
private final TagAttribute _render;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java
index 9f87ee0..31800ce 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java
@@ -48,7 +48,7 @@ public class SelectItemsHandler extends ComponentHandler
* @return
*/
@JSFFaceletAttribute(name = "noSelectionValue",
- className = "javax.el.ValueExpression",
+ className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.Boolean")
private boolean getNoSelectionValue()
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
index 7285841..29b3b87 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
import java.io.Serializable;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.ActionSource;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java
index e334b3d..f49049e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
import java.io.Serializable;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewHandler.java
index a8f9e60..bf9ca6c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ViewHandler.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets.tag.jsf.core;
import java.io.IOException;
import java.util.Arrays;
-import javax.el.ELException;
-import javax.el.MethodExpression;
+import jakarta.el.ELException;
+import jakarta.el.MethodExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIViewRoot;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/WebsocketHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/WebsocketHandler.java
index c8a7ca5..4a1143b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/WebsocketHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/WebsocketHandler.java
@@ -41,7 +41,7 @@ public class WebsocketHandler extends ComponentHandler/* implements RelocatableR
/**
*
*/
- @JSFFaceletAttribute(name = "channel", className = "javax.el.ValueExpression",
+ @JSFFaceletAttribute(name = "channel", className = "jakarta.el.ValueExpression",
deferredValueType = "java.lang.String")
private final TagAttribute _channel;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java
index cb6a696..a3670f7 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jstl.core;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
index 5d9a77c..51dbda9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.application.StateManager;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java
index c706760..b7e3384 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jstl.core;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java
index 6d9b54e..f66d99d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jstl.core;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
index bab6986..51ab35d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
@@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.application.StateManager;
import jakarta.faces.component.UIComponent;
@@ -123,7 +123,7 @@ public final class ForEachHandler extends TagHandler implements ComponentContain
/**
* Collection of items to iterate over.
*/
- @JSFFaceletAttribute(className="javax.el.ValueExpression")
+ @JSFFaceletAttribute(className="jakarta.el.ValueExpression")
private final TagAttribute items;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java
index 6d087e0..8f6ed5c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.jstl.core;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.application.StateManager;
import jakarta.faces.component.UIComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
index 1946ac3..a40a228 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.view.facelets.tag.jstl.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
/**
* @author Jacob Hookom
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
index ebe7dea..6fd26e5 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.view.facelets.tag.jstl.core;
-import javax.el.ELContext;
-import javax.el.PropertyNotWritableException;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.PropertyNotWritableException;
+import jakarta.el.ValueExpression;
/**
* @version $Id$
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java
index 6cd1eb9..3a4fe98 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.view.facelets.tag.jstl.core;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
/**
* @author Jacob Hookom
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java
index 83828c8..f9ea702 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -121,7 +121,7 @@ public final class LegacyForEachHandler extends TagHandler implements ComponentC
/**
* Collection of items to iterate over.
*/
- //@JSFFaceletAttribute(className="javax.el.ValueExpression")
+ //@JSFFaceletAttribute(className="jakarta.el.ValueExpression")
private final TagAttribute items;
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java
index 01d9f9f..b9eb6c9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java
@@ -20,9 +20,9 @@
package org.apache.myfaces.view.facelets.tag.jstl.core;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -62,7 +62,7 @@ public class LegacySetHandler extends TagHandler
* Expression to be evaluated.
*/
//@JSFFaceletAttribute(
- // className="javax.el.ValueExpression",
+ // className="jakarta.el.ValueExpression",
// deferredValueType="java.lang.Object")
private final TagAttribute value;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java
index a47aef1..f29d995 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.view.facelets.tag.jstl.core;
import java.io.Serializable;
import java.util.Map;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
/**
* @author Jacob Hookom
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
index c1b6515..e49ff60 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
@@ -20,9 +20,9 @@ package org.apache.myfaces.view.facelets.tag.jstl.core;
import java.io.IOException;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -62,7 +62,7 @@ public class SetHandler extends TagHandler
* Expression to be evaluated.
*/
@JSFFaceletAttribute(
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.Object")
private final TagAttribute value;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
index 2daeed0..706c030 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -60,7 +60,7 @@ public final class CompositionHandler extends TagHandler implements TemplateClie
*/
@JSFFaceletAttribute(
name="template",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
protected final TagAttribute _template;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java
index 194b03b..3cecf4a 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java
@@ -25,8 +25,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
import jakarta.faces.component.EditableValueHolder;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.UIViewRoot;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
index 1f6b333..2eaeee7 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.application.StateManager;
import jakarta.faces.component.UIComponent;
@@ -70,7 +70,7 @@ public final class DecorateHandler extends TagHandler implements TemplateClient,
*/
@JSFFaceletAttribute(
name="template",
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String")
private final TagAttribute _template;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java
index 3abe04a..d99fc41 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.tag.ui;
import java.io.IOException;
-import javax.el.ELException;
+import jakarta.el.ELException;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.view.facelets.FaceletContext;
@@ -49,7 +49,7 @@ public final class DefineHandler extends TagHandler
* a <ui:insert/> tag in a target template.
*/
@JSFFaceletAttribute(
- className="javax.el.ValueExpression",
+ className="jakarta.el.ValueExpression",
deferredValueType="java.lang.String",
required=true)
private final String name;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
index b636345..07e5c2d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
... 3805 lines suppressed ...