You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/10/08 13:04:57 UTC
[myfaces-tobago] branch master updated (6680032 -> 9b8be5d)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from 6680032 cleanup
new 3991200 feat: Jakarta EE 9 support
new 93c007e feat: Jakarta EE 9 support
new 9b8be5d feat: Jakarta EE 9 support
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/dependabot.yml | 28 +++++-
pom.xml | 29 +++---
tobago-assembly/pom.xml | 2 +-
tobago-core/pom.xml | 10 +-
tobago-core/src/main/faces-config/faces-config.xml | 4 +-
.../LabelValueExpressionFacesMessage.java | 6 +-
.../myfaces/tobago/component/LabelLayout.java | 4 +-
.../myfaces/tobago/component/SupportFieldId.java | 2 +-
.../tobago/component/SupportsAutoSpacing.java | 2 +-
.../tobago/component/UINamingContainer.java | 2 +-
.../apache/myfaces/tobago/config/TobagoConfig.java | 6 +-
.../myfaces/tobago/context/TobagoContext.java | 12 +--
.../tobago/context/TobagoExceptionHandler.java | 34 +++----
.../context/TobagoExceptionHandlerFactory.java | 6 +-
.../tobago/context/TransientStateHolder.java | 4 +-
.../tobago/convert/BoundedRangeModelConverter.java | 10 +-
.../myfaces/tobago/convert/CurrencyConverter.java | 8 +-
.../myfaces/tobago/convert/DateTimeConverter.java | 10 +-
.../myfaces/tobago/convert/DurationConverter.java | 8 +-
.../myfaces/tobago/convert/LocaleConverter.java | 8 +-
.../myfaces/tobago/convert/MeasureConverter.java | 8 +-
.../myfaces/tobago/convert/ThemeConverter.java | 8 +-
.../event/AbstractResetInputActionListener.java | 6 +-
.../tobago/event/CollapsibleActionListener.java | 14 +--
.../myfaces/tobago/event/FacesEventWrapper.java | 8 +-
.../event/MethodExpressionStateChangeListener.java | 8 +-
.../event/MethodExpressionTabChangeListener.java | 8 +-
.../MethodExpressionTreeExpansionListener.java | 8 +-
.../MethodExpressionTreeSelectedListener.java | 8 +-
.../myfaces/tobago/event/PageActionEvent.java | 4 +-
.../tobago/event/ResetFormActionListener.java | 8 +-
.../tobago/event/ResetInputActionListener.java | 8 +-
.../tobago/event/SheetStateChangeEvent.java | 6 +-
.../tobago/event/SheetStateChangeListener.java | 2 +-
.../tobago/event/SheetStateChangeSource.java | 2 +-
.../myfaces/tobago/event/SortActionEvent.java | 8 +-
.../myfaces/tobago/event/SortActionSource.java | 2 +-
.../myfaces/tobago/event/TabChangeEvent.java | 6 +-
.../myfaces/tobago/event/TabChangeListener.java | 2 +-
.../myfaces/tobago/event/TabChangeSource.java | 2 +-
.../myfaces/tobago/event/TobagoActionSource.java | 4 +-
.../myfaces/tobago/event/TreeExpansionEvent.java | 6 +-
.../tobago/event/TreeExpansionListener.java | 2 +-
.../myfaces/tobago/event/TreeSelectedEvent.java | 6 +-
.../myfaces/tobago/event/TreeSelectedListener.java | 2 +-
.../ValueExpressionResetInputActionListener.java | 12 +--
.../ValueExpressionSheetStateChangeListener.java | 8 +-
.../event/ValueExpressionTabChangeListener.java | 8 +-
.../myfaces/tobago/facelets/AttributeHandler.java | 48 +++++-----
.../myfaces/tobago/facelets/ContentTypeRule.java | 10 +-
.../tobago/facelets/ConvertDateTimeHandler.java | 24 ++---
.../myfaces/tobago/facelets/ConverterHandler.java | 26 ++---
.../tobago/facelets/DataAttributeHandler.java | 16 ++--
.../tobago/facelets/DefaultResourceResolver.java | 6 +-
.../myfaces/tobago/facelets/EventHandler.java | 30 +++---
.../facelets/FixCharacterEncodingFilter.java | 14 +--
.../facelets/GridLayoutConstraintHandler.java | 10 +-
.../facelets/ResetInputActionListenerHandler.java | 18 ++--
.../apache/myfaces/tobago/facelets/Resource.java | 10 +-
.../facelets/SegmentLayoutConstraintHandler.java | 10 +-
.../facelets/SheetStateChangeSourceRule.java | 12 +--
.../tobago/facelets/SortActionSourceRule.java | 12 +--
.../tobago/facelets/SupportsMarkupRule.java | 14 +--
.../tobago/facelets/TabChangeListenerHandler.java | 16 ++--
.../tobago/facelets/TabChangeSourceRule.java | 10 +-
.../tobago/facelets/TagMethodExpression.java | 16 ++--
.../tobago/facelets/TobagoComponentHandler.java | 16 ++--
.../tobago/facelets/TobagoValidateHandler.java | 6 +-
.../tobago/internal/behavior/DeltaStateHelper.java | 10 +-
.../tobago/internal/behavior/EventBehavior.java | 14 +--
.../tobago/internal/component/AbstractUIBadge.java | 2 +-
.../component/AbstractUICollapsiblePanel.java | 6 +-
.../internal/component/AbstractUIColumnBase.java | 2 +-
.../internal/component/AbstractUICommand.java | 10 +-
.../internal/component/AbstractUICommandBase.java | 20 ++--
.../tobago/internal/component/AbstractUIData.java | 18 ++--
.../tobago/internal/component/AbstractUIEvent.java | 2 +-
.../tobago/internal/component/AbstractUIFile.java | 10 +-
.../internal/component/AbstractUIFlexLayout.java | 10 +-
.../internal/component/AbstractUIFormBase.java | 6 +-
.../internal/component/AbstractUIGridLayout.java | 16 ++--
.../internal/component/AbstractUIHidden.java | 2 +-
.../tobago/internal/component/AbstractUIImage.java | 2 +-
.../tobago/internal/component/AbstractUIInput.java | 6 +-
.../tobago/internal/component/AbstractUILabel.java | 2 +-
.../internal/component/AbstractUILabelBase.java | 6 +-
.../internal/component/AbstractUILayoutBase.java | 2 +-
.../internal/component/AbstractUIMessages.java | 6 +-
.../tobago/internal/component/AbstractUIMeta.java | 14 +--
.../internal/component/AbstractUIMetaLink.java | 14 +--
.../internal/component/AbstractUIObject.java | 2 +-
.../internal/component/AbstractUIOperation.java | 2 +-
.../tobago/internal/component/AbstractUIOut.java | 2 +-
.../tobago/internal/component/AbstractUIPage.java | 8 +-
.../tobago/internal/component/AbstractUIPanel.java | 2 +-
.../internal/component/AbstractUIPanelBase.java | 2 +-
.../tobago/internal/component/AbstractUIPopup.java | 2 +-
.../internal/component/AbstractUIProgress.java | 14 +--
.../internal/component/AbstractUIReload.java | 2 +-
.../tobago/internal/component/AbstractUIRow.java | 2 +-
.../internal/component/AbstractUIScript.java | 14 +--
.../internal/component/AbstractUISection.java | 2 +-
.../component/AbstractUISelectBoolean.java | 8 +-
.../internal/component/AbstractUISelectItem.java | 6 +-
.../internal/component/AbstractUISelectItems.java | 2 +-
.../component/AbstractUISelectManyBase.java | 6 +-
.../component/AbstractUISelectManyListbox.java | 2 +-
.../component/AbstractUISelectOneBase.java | 8 +-
.../component/AbstractUISelectOneChoice.java | 2 +-
.../component/AbstractUISelectOneListbox.java | 2 +-
.../component/AbstractUISelectReference.java | 2 +-
.../internal/component/AbstractUISeparator.java | 2 +-
.../tobago/internal/component/AbstractUISheet.java | 30 +++---
.../internal/component/AbstractUISplitLayout.java | 4 +-
.../tobago/internal/component/AbstractUIStars.java | 8 +-
.../tobago/internal/component/AbstractUIStyle.java | 18 ++--
.../internal/component/AbstractUISuggest.java | 8 +-
.../tobago/internal/component/AbstractUITab.java | 4 +-
.../internal/component/AbstractUITabGroup.java | 18 ++--
.../tobago/internal/component/AbstractUITree.java | 12 +--
.../internal/component/AbstractUITreeIndent.java | 2 +-
.../internal/component/AbstractUITreeNodeBase.java | 4 +-
.../internal/component/AbstractUITreeSelect.java | 8 +-
.../tobago/internal/config/SecurityAnnotation.java | 2 +-
.../tobago/internal/config/TobagoConfigLoader.java | 4 +-
.../tobago/internal/context/DateTimeI18n.java | 2 +-
.../myfaces/tobago/internal/context/Nonce.java | 4 +-
.../myfaces/tobago/internal/layout/Cell.java | 2 +-
.../myfaces/tobago/internal/layout/OriginCell.java | 2 +-
.../myfaces/tobago/internal/layout/SpanCell.java | 2 +-
.../tobago/internal/renderkit/CommandMap.java | 2 +-
.../internal/renderkit/renderer/BadgeRenderer.java | 2 +-
.../internal/renderkit/renderer/BarRenderer.java | 4 +-
.../internal/renderkit/renderer/BoxRenderer.java | 4 +-
.../renderkit/renderer/ButtonRenderer.java | 4 +-
.../renderkit/renderer/ButtonsRenderer.java | 2 +-
.../renderer/CollapsiblePanelRendererBase.java | 2 +-
.../renderkit/renderer/ColumnRenderer.java | 2 +-
.../renderkit/renderer/CommandRendererBase.java | 6 +-
.../internal/renderkit/renderer/DateRenderer.java | 8 +-
.../renderer/DecodingCommandRendererBase.java | 6 +-
.../renderer/DecodingInputRendererBase.java | 6 +-
.../renderkit/renderer/FigureRenderer.java | 4 +-
.../internal/renderkit/renderer/FileRenderer.java | 16 ++--
.../renderkit/renderer/FlexLayoutRenderer.java | 2 +-
.../renderkit/renderer/FlowLayoutRenderer.java | 2 +-
.../renderkit/renderer/FooterRenderer.java | 2 +-
.../internal/renderkit/renderer/FormRenderer.java | 2 +-
.../renderkit/renderer/GridLayoutRenderer.java | 2 +-
.../renderkit/renderer/HeaderRenderer.java | 2 +-
.../renderkit/renderer/HiddenRenderer.java | 2 +-
.../internal/renderkit/renderer/ImageRenderer.java | 2 +-
.../internal/renderkit/renderer/InRenderer.java | 10 +-
.../renderer/LabelLayoutRendererBase.java | 4 +-
.../internal/renderkit/renderer/LabelRenderer.java | 14 +--
.../internal/renderkit/renderer/LinkRenderer.java | 2 +-
.../internal/renderkit/renderer/LinksRenderer.java | 4 +-
.../renderer/MessageLayoutRendererBase.java | 6 +-
.../renderkit/renderer/MessagesRenderer.java | 4 +-
.../renderkit/renderer/MetaLinkRenderer.java | 2 +-
.../internal/renderkit/renderer/MetaRenderer.java | 2 +-
.../renderkit/renderer/ObjectRenderer.java | 2 +-
.../internal/renderkit/renderer/OutRenderer.java | 2 +-
.../internal/renderkit/renderer/PageRenderer.java | 20 ++--
.../internal/renderkit/renderer/PanelRenderer.java | 2 +-
.../internal/renderkit/renderer/PopupRenderer.java | 4 +-
.../renderkit/renderer/ProgressRenderer.java | 2 +-
.../internal/renderkit/renderer/RangeRenderer.java | 2 +-
.../renderkit/renderer/ReloadRenderer.java | 4 +-
.../internal/renderkit/renderer/RowRenderer.java | 4 +-
.../renderkit/renderer/ScriptRenderer.java | 2 +-
.../renderkit/renderer/SectionRenderer.java | 4 +-
.../renderkit/renderer/SegmentLayoutRenderer.java | 4 +-
.../renderer/SelectBooleanCheckboxRenderer.java | 2 +-
.../renderer/SelectBooleanRendererBase.java | 2 +-
.../renderer/SelectBooleanToggleRenderer.java | 2 +-
.../renderer/SelectManyCheckboxRenderer.java | 4 +-
.../renderer/SelectManyListboxRenderer.java | 4 +-
.../renderkit/renderer/SelectManyRendererBase.java | 28 +++---
.../renderer/SelectManyShuttleRenderer.java | 6 +-
.../renderer/SelectOneChoiceRenderer.java | 4 +-
.../renderer/SelectOneListboxRenderer.java | 4 +-
.../renderkit/renderer/SelectOneRadioRenderer.java | 4 +-
.../renderkit/renderer/SelectOneRendererBase.java | 2 +-
.../renderer/SelectReferenceRenderer.java | 4 +-
.../renderkit/renderer/SeparatorRenderer.java | 4 +-
.../internal/renderkit/renderer/SheetRenderer.java | 22 ++---
.../renderkit/renderer/SplitLayoutRenderer.java | 2 +-
.../internal/renderkit/renderer/StarsRenderer.java | 2 +-
.../internal/renderkit/renderer/StyleRenderer.java | 2 +-
.../renderkit/renderer/SubviewRenderer.java | 6 +-
.../renderkit/renderer/SuggestRenderer.java | 4 +-
.../renderkit/renderer/TabGroupRenderer.java | 20 ++--
.../renderkit/renderer/TextareaRenderer.java | 10 +-
.../renderer/TobagoClientBehaviorRenderer.java | 22 ++---
.../renderkit/renderer/TreeIconRenderer.java | 2 +-
.../renderkit/renderer/TreeIndentRenderer.java | 2 +-
.../renderkit/renderer/TreeLabelRenderer.java | 2 +-
.../renderkit/renderer/TreeListboxRenderer.java | 4 +-
.../renderkit/renderer/TreeNodeRenderer.java | 4 +-
.../internal/renderkit/renderer/TreeRenderer.java | 4 +-
.../renderkit/renderer/TreeSelectRenderer.java | 4 +-
.../renderkit/renderer/VerbatimRenderer.java | 4 +-
.../taglib/component/AttributeTagDeclaration.java | 2 +-
.../taglib/component/BadgeTagDeclaration.java | 6 +-
.../taglib/component/BarTagDeclaration.java | 4 +-
.../taglib/component/BoxTagDeclaration.java | 6 +-
.../taglib/component/ButtonTagDeclaration.java | 4 +-
.../taglib/component/ButtonsTagDeclaration.java | 6 +-
.../taglib/component/ColumnNodeTagDeclaration.java | 6 +-
.../component/ColumnSelectorTagDeclaration.java | 6 +-
.../taglib/component/ColumnTagDeclaration.java | 6 +-
.../component/ConvertDateTimeTagDeclaration.java | 2 +-
.../taglib/component/ConverterTagDeclaration.java | 4 +-
.../component/DataAttributeTagDeclaration.java | 2 +-
.../taglib/component/DateTagDeclaration.java | 6 +-
.../taglib/component/EventTagDeclaration.java | 8 +-
.../taglib/component/FigureTagDeclaration.java | 6 +-
.../taglib/component/FileTagDeclaration.java | 8 +-
.../taglib/component/FlexLayoutTagDeclaration.java | 2 +-
.../taglib/component/FlowLayoutTagDeclaration.java | 2 +-
.../taglib/component/FooterTagDeclaration.java | 4 +-
.../taglib/component/FormTagDeclaration.java | 6 +-
.../GridLayoutConstraintTagDeclaration.java | 2 +-
.../taglib/component/GridLayoutTagDeclaration.java | 2 +-
.../taglib/component/HeaderTagDeclaration.java | 4 +-
.../taglib/component/HiddenTagDeclaration.java | 4 +-
.../taglib/component/ImageTagDeclaration.java | 6 +-
.../taglib/component/InTagDeclaration.java | 4 +-
.../taglib/component/LabelTagDeclaration.java | 6 +-
.../taglib/component/LinkTagDeclaration.java | 4 +-
.../taglib/component/LinksTagDeclaration.java | 6 +-
.../taglib/component/MessagesTagDeclaration.java | 14 +--
.../taglib/component/MetaLinkTagDeclaration.java | 2 +-
.../taglib/component/MetaTagDeclaration.java | 2 +-
.../taglib/component/ObjectTagDeclaration.java | 6 +-
.../taglib/component/OutTagDeclaration.java | 6 +-
.../taglib/component/PageTagDeclaration.java | 4 +-
.../taglib/component/PanelTagDeclaration.java | 4 +-
.../taglib/component/PopupTagDeclaration.java | 4 +-
.../taglib/component/ProgressTagDeclaration.java | 4 +-
.../taglib/component/RangeTagDeclaration.java | 4 +-
.../ResetInputActionListenerTagDeclaration.java | 2 +-
.../taglib/component/RowTagDeclaration.java | 4 +-
.../taglib/component/SectionTagDeclaration.java | 4 +-
.../SegmentLayoutConstraintTagDeclaration.java | 2 +-
.../component/SegmentLayoutTagDeclaration.java | 2 +-
.../SelectBooleanCheckboxTagDeclaration.java | 4 +-
.../SelectBooleanToggleTagDeclaration.java | 4 +-
.../taglib/component/SelectItemTagDeclaration.java | 4 +-
.../component/SelectItemsTagDeclaration.java | 4 +-
.../SelectManyCheckboxTagDeclaration.java | 8 +-
.../component/SelectManyListboxTagDeclaration.java | 6 +-
.../component/SelectManyShuttleTagDeclaration.java | 8 +-
.../component/SelectOneChoiceTagDeclaration.java | 8 +-
.../component/SelectOneListboxTagDeclaration.java | 8 +-
.../component/SelectOneRadioTagDeclaration.java | 8 +-
.../component/SelectReferenceTagDeclaration.java | 4 +-
.../taglib/component/SeparatorTagDeclaration.java | 2 +-
.../component/SheetPageCommandTagDeclaration.java | 4 +-
.../taglib/component/SheetTagDeclaration.java | 14 +--
.../taglib/component/StarsTagDeclaration.java | 4 +-
.../taglib/component/SuggestTagDeclaration.java | 2 +-
.../component/TabChangeListenerTagDeclaration.java | 2 +-
.../taglib/component/TabGroupTagDeclaration.java | 4 +-
.../taglib/component/TabTagDeclaration.java | 4 +-
.../taglib/component/TextareaTagDeclaration.java | 4 +-
.../taglib/component/TreeIconTagDeclaration.java | 6 +-
.../taglib/component/TreeIndentTagDeclaration.java | 6 +-
.../taglib/component/TreeLabelTagDeclaration.java | 6 +-
.../component/TreeListboxTagDeclaration.java | 6 +-
.../taglib/component/TreeNodeTagDeclaration.java | 4 +-
.../taglib/component/TreeSelectTagDeclaration.java | 4 +-
.../taglib/component/TreeTagDeclaration.java | 6 +-
.../component/ValidateFileItemTagDeclaration.java | 2 +-
...ValidateSubmittedValueLengthTagDeclaration.java | 2 +-
.../internal/taglib/declaration/HasAction.java | 4 +-
.../internal/taglib/declaration/HasBinding.java | 2 +-
.../internal/taglib/declaration/HasValidator.java | 11 ++-
.../taglib/declaration/IsDisabledBySecurity.java | 4 +-
.../tobago/internal/util/AccessKeyLogger.java | 2 +-
.../tobago/internal/util/AuthorizationHelper.java | 20 ++--
.../myfaces/tobago/internal/util/CookieUtils.java | 6 +-
.../tobago/internal/util/HtmlRendererUtils.java | 12 +--
.../tobago/internal/util/HttpPartWrapper.java | 10 +-
.../myfaces/tobago/internal/util/PartUtils.java | 2 +-
.../myfaces/tobago/internal/util/RenderUtils.java | 24 ++---
.../tobago/internal/util/ResponseUtils.java | 4 +-
.../tobago/internal/util/SelectItemUtils.java | 18 ++--
.../myfaces/tobago/internal/util/SortingUtils.java | 26 ++---
.../internal/webapp/DebugContentTypeFilter.java | 14 +--
.../internal/webapp/DebugContentTypeResponse.java | 4 +-
.../webapp/DebugResponseWriterWrapper.java | 8 +-
.../tobago/internal/webapp/HtmlResponseWriter.java | 2 +-
.../tobago/internal/webapp/LoggingMdcFilter.java | 16 ++--
.../internal/webapp/TobagoResponseWriterBase.java | 2 +-
.../webapp/TobagoResponseWriterWrapper.java | 4 +-
.../tobago/internal/webapp/XmlResponseWriter.java | 2 +-
.../tobago/lifecycle/SecretPhaseListener.java | 8 +-
.../apache/myfaces/tobago/model/SelectItem.java | 2 +-
.../apache/myfaces/tobago/model/TreeDataModel.java | 2 +-
.../myfaces/tobago/renderkit/GenericRenderer.java | 2 +-
.../tobago/renderkit/LabelWithAccessKey.java | 2 +-
.../myfaces/tobago/renderkit/RendererBase.java | 36 +++----
.../myfaces/tobago/renderkit/TobagoRenderKit.java | 20 ++--
.../tobago/renderkit/css/BootstrapClass.java | 4 +-
.../myfaces/tobago/renderkit/css/CustomClass.java | 6 +-
.../tobago/servlet/NonFacesRequestServlet.java | 24 ++---
.../org/apache/myfaces/tobago/util/AjaxUtils.java | 10 +-
.../apache/myfaces/tobago/util/ComponentUtils.java | 40 ++++----
.../myfaces/tobago/util/ContextCallback.java | 4 +-
.../myfaces/tobago/util/DebugActionListener.java | 6 +-
.../tobago/util/DebugNavigationHandler.java | 4 +-
.../myfaces/tobago/util/DebugPhaseListener.java | 18 ++--
.../org/apache/myfaces/tobago/util/DebugUtils.java | 12 +--
.../apache/myfaces/tobago/util/FacesELUtils.java | 8 +-
.../apache/myfaces/tobago/util/FacesVersion.java | 4 +-
.../apache/myfaces/tobago/util/MessageFormat.java | 2 +-
.../apache/myfaces/tobago/util/MessageUtils.java | 10 +-
.../apache/myfaces/tobago/util/ResourceUtils.java | 4 +-
.../tobago/util/ValueExpressionComparator.java | 10 +-
.../myfaces/tobago/util/VariableResolverUtils.java | 4 +-
.../apache/myfaces/tobago/util/WebXmlUtils.java | 8 +-
.../validator/ClearValidatorsActionListener.java | 12 +--
.../tobago/validator/FileItemValidator.java | 14 +--
.../validator/SubmittedValueLengthValidator.java | 12 +--
.../tobago/webapp/LogoutActionListener.java | 14 +--
.../org/apache/myfaces/tobago/webapp/Secret.java | 6 +-
.../tobago/webapp/SecretSessionListener.java | 4 +-
.../tobago/webapp/TobagoResponseWriter.java | 4 +-
.../webapp/TobagoServletContextListener.java | 4 +-
.../AbstractGeneratedUIComponentsUnitTest.java | 2 +-
.../AttributesOfGeneratedUIComponentsUnitTest.java | 2 +-
...OverwritingOfGeneratedUIComponentsUnitTest.java | 2 +-
.../tobago/component/UIMessagesUnitTest.java | 4 +-
.../myfaces/tobago/component/UISheetUnitTest.java | 2 +-
.../tobago/convert/DurationConverterUnitTest.java | 2 +-
.../component/AbstractUIGridLayoutUnitTest.java | 2 +-
.../internal/config/AbstractTobagoTestBase.java | 8 +-
.../internal/mock/servlet/MockHttpSession.java | 6 +-
.../mock/servlet/MockServletInputStream.java | 4 +-
.../renderkit/renderer/DateRendererUnitTest.java | 4 +-
.../renderkit/renderer/InRendererUnitTest.java | 4 +-
.../renderer/SelectOneRadioRendererUnitTest.java | 2 +-
.../renderer/TreeSelectRendererUnitTest.java | 2 +-
.../tobago/internal/util/RenderUtilsUnitTest.java | 2 +-
.../internal/util/StyleRenderUtilsUnitTest.java | 2 +-
.../tobago/util/ComponentUtilsUnitTest.java | 6 +-
.../myfaces/tobago/util/MessageUtilsUnitTest.java | 2 +-
tobago-example/pom.xml | 105 ++++++++++++++++++++-
tobago-example/tobago-example-assembly/pom.xml | 2 +-
tobago-example/tobago-example-blank/pom.xml | 2 +-
.../apache/myfaces/tobago/example/blank/Hello.java | 4 +-
tobago-example/tobago-example-demo/pom.xml | 56 ++++++++++-
.../demo/AjaxSpecialCharacterController.java | 4 +-
.../myfaces/tobago/example/demo/ApiController.java | 6 +-
.../myfaces/tobago/example/demo/AstroData.java | 4 +-
.../tobago/example/demo/AttributeController.java | 4 +-
.../tobago/example/demo/BadgeController.java | 4 +-
.../tobago/example/demo/BehaviorController.java | 8 +-
.../example/demo/BehaviorTestController.java | 8 +-
.../myfaces/tobago/example/demo/BoxController.java | 4 +-
.../tobago/example/demo/BundleController.java | 10 +-
.../tobago/example/demo/ButtonLinkController.java | 4 +-
.../tobago/example/demo/CkeditorController.java | 4 +-
.../example/demo/CollapsibleBoxController.java | 4 +-
.../tobago/example/demo/CollapsibleController.java | 6 +-
.../example/demo/CollapsiblePanelController.java | 4 +-
.../example/demo/CollapsiblePopupController.java | 4 +-
.../example/demo/CollapsibleSectionController.java | 4 +-
.../example/demo/ConversationController.java | 6 +-
.../tobago/example/demo/ConversionController.java | 4 +-
.../example/demo/ConvertDateTimeController.java | 4 +-
.../tobago/example/demo/CurrencyController.java | 4 +-
.../example/demo/CurrentValueController.java | 4 +-
.../tobago/example/demo/DateController.java | 14 +--
.../example/demo/DefaultCommandController.java | 6 +-
.../tobago/example/demo/DockerController.java | 4 +-
.../tobago/example/demo/EventController.java | 14 +--
.../tobago/example/demo/ExceptionController.java | 6 +-
.../example/demo/ExceptionHandlerController.java | 12 +--
.../tobago/example/demo/ExecuteController.java | 4 +-
.../tobago/example/demo/ForEachController.java | 4 +-
.../tobago/example/demo/FormAjaxController.java | 4 +-
.../tobago/example/demo/FormController.java | 4 +-
.../example/demo/FormRequiredController.java | 4 +-
.../tobago/example/demo/GroupController.java | 6 +-
.../example/demo/HeaderFooterController.java | 4 +-
.../myfaces/tobago/example/demo/InController.java | 6 +-
.../example/demo/InputSuggestController.java | 8 +-
.../myfaces/tobago/example/demo/Jsr303Bean.java | 10 +-
.../myfaces/tobago/example/demo/KillSession.java | 12 +--
.../tobago/example/demo/LocaleController.java | 20 ++--
.../tobago/example/demo/LoggingController.java | 4 +-
.../tobago/example/demo/LoginController.java | 14 +--
.../tobago/example/demo/ManifestReader.java | 4 +-
.../example/demo/MessageLayoutController.java | 10 +-
.../tobago/example/demo/MessagesController.java | 8 +-
.../tobago/example/demo/MetaController.java | 6 +-
.../tobago/example/demo/Migration4Controller.java | 4 +-
.../tobago/example/demo/Migration5Controller.java | 4 +-
.../myfaces/tobago/example/demo/NamedNode.java | 2 +-
.../tobago/example/demo/NavigationState.java | 12 +--
.../tobago/example/demo/NavigationTree.java | 16 ++--
.../tobago/example/demo/ObjectController.java | 4 +-
.../tobago/example/demo/OnOffConverter.java | 8 +-
.../myfaces/tobago/example/demo/OutController.java | 4 +-
.../tobago/example/demo/PanelController.java | 4 +-
.../example/demo/PartialReloadController.java | 14 +--
.../tobago/example/demo/PopupController.java | 6 +-
.../tobago/example/demo/ProgressController.java | 6 +-
.../tobago/example/demo/RangeController.java | 4 +-
.../tobago/example/demo/ResizeController.java | 2 +-
.../tobago/example/demo/RoleController.java | 6 +-
.../demo/SelectBooleanCheckboxController.java | 4 +-
.../demo/SelectBooleanToggleController.java | 4 +-
.../tobago/example/demo/SelectController.java | 4 +-
.../tobago/example/demo/SelectItemModel.java | 4 +-
.../example/demo/SelectManyCheckboxController.java | 4 +-
.../example/demo/SelectManyListboxController.java | 4 +-
.../example/demo/SelectManyShuttleController.java | 8 +-
.../example/demo/SelectOneChoiceController.java | 4 +-
.../example/demo/SelectOneListboxController.java | 4 +-
.../example/demo/SelectOneRadioController.java | 4 +-
.../myfaces/tobago/example/demo/ServerInfo.java | 10 +-
.../tobago/example/demo/SeverityController.java | 10 +-
.../myfaces/tobago/example/demo/SheetConfig.java | 2 +-
.../tobago/example/demo/SheetController.java | 21 +++--
.../example/demo/SheetEditableController.java | 8 +-
.../tobago/example/demo/SheetFilterController.java | 18 ++--
.../example/demo/SheetSortingController.java | 12 +--
.../tobago/example/demo/SheetTreeController.java | 8 +-
.../tobago/example/demo/SolarConverter.java | 14 +--
.../myfaces/tobago/example/demo/SolarObject.java | 2 +-
.../tobago/example/demo/SourceFileReader.java | 4 +-
.../tobago/example/demo/SplitLayoutController.java | 4 +-
.../tobago/example/demo/StarsController.java | 4 +-
.../tobago/example/demo/SuggestController.java | 10 +-
.../example/demo/SuggestQuotMarkController.java | 4 +-
.../demo/SynchronizeNavigationPhaseListener.java | 10 +-
.../myfaces/tobago/example/demo/TabController.java | 4 +-
.../tobago/example/demo/TestController.java | 8 +-
.../tobago/example/demo/TextareaController.java | 4 +-
.../tobago/example/demo/ThemeController.java | 8 +-
.../tobago/example/demo/TinyMceController.java | 4 +-
.../example/demo/TreeCommandTypesController.java | 4 +-
.../tobago/example/demo/TreeController.java | 4 +-
.../tobago/example/demo/TreeEditorController.java | 8 +-
.../tobago/example/demo/TreeListboxController.java | 6 +-
.../tobago/example/demo/TreeSelectController.java | 4 +-
.../tobago/example/demo/UploadController.java | 12 +--
.../tobago/example/demo/ValidationController.java | 14 +--
.../example/demo/ValidationJsr303Controller.java | 8 +-
.../myfaces/tobago/example/demo/Version.java | 4 +-
.../tobago/example/demo/WebSocketController.java | 10 +-
.../demo/bestpractice/BestPracticeController.java | 8 +-
.../demo/bestpractice/ToolBarCustomizer.java | 8 +-
.../demo/bestpractice/TransitionController.java | 4 +-
.../myfaces/tobago/example/demo/info/Activity.java | 2 +-
.../tobago/example/demo/info/ActivityList.java | 4 +-
.../example/demo/info/ActivityPhaseListener.java | 14 +--
.../example/demo/info/ActivitySessionListener.java | 9 +-
.../example/demo/nonfacesrequest/FishPond.java | 4 +-
tobago-example/tobago-example-spring-boot/pom.xml | 2 +-
.../myfaces/tobago/example/spring/HelloSpring.java | 4 +-
tobago-theme/pom.xml | 2 +-
tobago-theme/tobago-theme-charlotteville/pom.xml | 2 +-
tobago-theme/tobago-theme-roxborough/pom.xml | 2 +-
tobago-theme/tobago-theme-scarborough/pom.xml | 2 +-
tobago-theme/tobago-theme-speyside/pom.xml | 2 +-
tobago-theme/tobago-theme-standard/pom.xml | 6 +-
tobago-tool/pom.xml | 2 +-
tobago-tool/tobago-config-dev/pom.xml | 2 +-
tobago-tool/tobago-config-mojarra/pom.xml | 2 +-
tobago-tool/tobago-config-myfaces/pom.xml | 2 +-
tobago-tool/tobago-config-owb/pom.xml | 68 ++++++++++++-
tobago-tool/tobago-tool-annotation/pom.xml | 2 +-
.../tobago/apt/annotation/UIComponentTag.java | 2 +-
tobago-tool/tobago-tool-apt/pom.xml | 2 +-
.../myfaces/tobago/apt/generate/PropertyInfo.java | 2 +-
.../tobago/apt/processor/ClassesGenerator.java | 6 +-
.../tobago/apt/processor/FacesConfigGenerator.java | 4 +-
.../org/apache/myfaces/tobago/apt/component.stg | 10 +-
tobago-tool/tobago-tool-test/pom.xml | 2 +-
484 files changed, 1830 insertions(+), 1587 deletions(-)
[myfaces-tobago] 02/03: feat: Jakarta EE 9 support
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 93c007e8ef87e5b8572d5555747fabc0e88d07ab
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Oct 8 13:19:48 2021 +0200
feat: Jakarta EE 9 support
* basic migration
* tested with Glassfish 6.2.2
* Jetty/TomEE/Tomcat profiles are NOT running, yet!
issue: TOBAGO-2094
---
.../tobago/internal/taglib/declaration/HasValidator.java | 11 ++++++-----
.../apache/myfaces/tobago/internal/util/SelectItemUtils.java | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
index cb9e61e..56109dc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
@@ -25,14 +25,15 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasValidator {
/**
- * A method binding EL expression,
- * accepting FacesContext, UIComponent,
- * and Object parameters, and returning void, that validates
- * the component's local value.
+ * A method binding EL expression, accepting FacesContext, UIComponent, and Object parameters, and returning void,
+ * that validates the component's local value.
*/
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "jakarta.faces.context.FacesContext", "jakarta.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {
+ "jakarta.faces.context.FacesContext",
+ "jakarta.faces.component.UIComponent",
+ "java.lang.Object"})
void setValidator(String validator);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
index d601b2c..47d6957 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
@@ -72,9 +72,9 @@ public class SelectItemUtils {
}
/**
- * Creates a list of SelectItems to use for rendering.
- * You should only use this method (which returns a list), when you need a list.
- * Otherwise please use {@link #getItemIterator(jakarta.faces.context.FacesContext, jakarta.faces.component.UIComponent)}
+ * Creates a list of SelectItems to use for rendering. You should only use this method (which returns a list), when
+ * you need a list. Otherwise, please use {@link #getItemIterator(jakarta.faces.context.FacesContext,
+ * jakarta.faces.component.UIComponent)}
*/
public static List<SelectItem> getItemList(final FacesContext facesContext, final UIComponent selector) {
if (selector.getChildCount() == 0) {
[myfaces-tobago] 01/03: feat: Jakarta EE 9 support
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 3991200a679e42ce305b6d6ed5b918edb8cd9639
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Oct 8 12:52:58 2021 +0200
feat: Jakarta EE 9 support
* basic migration
* tested with Glassfish 6.2.2
* Jetty/TomEE/Tomcat profiles are NOT running, yet!
issue: TOBAGO-2094
---
.github/dependabot.yml | 28 +++++-
pom.xml | 29 +++---
tobago-assembly/pom.xml | 2 +-
tobago-core/pom.xml | 10 +-
tobago-core/src/main/faces-config/faces-config.xml | 4 +-
.../LabelValueExpressionFacesMessage.java | 6 +-
.../myfaces/tobago/component/LabelLayout.java | 4 +-
.../myfaces/tobago/component/SupportFieldId.java | 2 +-
.../tobago/component/SupportsAutoSpacing.java | 2 +-
.../tobago/component/UINamingContainer.java | 2 +-
.../apache/myfaces/tobago/config/TobagoConfig.java | 6 +-
.../myfaces/tobago/context/TobagoContext.java | 12 +--
.../tobago/context/TobagoExceptionHandler.java | 34 +++----
.../context/TobagoExceptionHandlerFactory.java | 6 +-
.../tobago/context/TransientStateHolder.java | 4 +-
.../tobago/convert/BoundedRangeModelConverter.java | 10 +-
.../myfaces/tobago/convert/CurrencyConverter.java | 8 +-
.../myfaces/tobago/convert/DateTimeConverter.java | 10 +-
.../myfaces/tobago/convert/DurationConverter.java | 8 +-
.../myfaces/tobago/convert/LocaleConverter.java | 8 +-
.../myfaces/tobago/convert/MeasureConverter.java | 8 +-
.../myfaces/tobago/convert/ThemeConverter.java | 8 +-
.../event/AbstractResetInputActionListener.java | 6 +-
.../tobago/event/CollapsibleActionListener.java | 14 +--
.../myfaces/tobago/event/FacesEventWrapper.java | 8 +-
.../event/MethodExpressionStateChangeListener.java | 8 +-
.../event/MethodExpressionTabChangeListener.java | 8 +-
.../MethodExpressionTreeExpansionListener.java | 8 +-
.../MethodExpressionTreeSelectedListener.java | 8 +-
.../myfaces/tobago/event/PageActionEvent.java | 4 +-
.../tobago/event/ResetFormActionListener.java | 8 +-
.../tobago/event/ResetInputActionListener.java | 8 +-
.../tobago/event/SheetStateChangeEvent.java | 6 +-
.../tobago/event/SheetStateChangeListener.java | 2 +-
.../tobago/event/SheetStateChangeSource.java | 2 +-
.../myfaces/tobago/event/SortActionEvent.java | 8 +-
.../myfaces/tobago/event/SortActionSource.java | 2 +-
.../myfaces/tobago/event/TabChangeEvent.java | 6 +-
.../myfaces/tobago/event/TabChangeListener.java | 2 +-
.../myfaces/tobago/event/TabChangeSource.java | 2 +-
.../myfaces/tobago/event/TobagoActionSource.java | 4 +-
.../myfaces/tobago/event/TreeExpansionEvent.java | 6 +-
.../tobago/event/TreeExpansionListener.java | 2 +-
.../myfaces/tobago/event/TreeSelectedEvent.java | 6 +-
.../myfaces/tobago/event/TreeSelectedListener.java | 2 +-
.../ValueExpressionResetInputActionListener.java | 12 +--
.../ValueExpressionSheetStateChangeListener.java | 8 +-
.../event/ValueExpressionTabChangeListener.java | 8 +-
.../myfaces/tobago/facelets/AttributeHandler.java | 48 +++++-----
.../myfaces/tobago/facelets/ContentTypeRule.java | 10 +-
.../tobago/facelets/ConvertDateTimeHandler.java | 24 ++---
.../myfaces/tobago/facelets/ConverterHandler.java | 26 ++---
.../tobago/facelets/DataAttributeHandler.java | 16 ++--
.../tobago/facelets/DefaultResourceResolver.java | 6 +-
.../myfaces/tobago/facelets/EventHandler.java | 30 +++---
.../facelets/FixCharacterEncodingFilter.java | 14 +--
.../facelets/GridLayoutConstraintHandler.java | 10 +-
.../facelets/ResetInputActionListenerHandler.java | 18 ++--
.../apache/myfaces/tobago/facelets/Resource.java | 10 +-
.../facelets/SegmentLayoutConstraintHandler.java | 10 +-
.../facelets/SheetStateChangeSourceRule.java | 12 +--
.../tobago/facelets/SortActionSourceRule.java | 12 +--
.../tobago/facelets/SupportsMarkupRule.java | 14 +--
.../tobago/facelets/TabChangeListenerHandler.java | 16 ++--
.../tobago/facelets/TabChangeSourceRule.java | 10 +-
.../tobago/facelets/TagMethodExpression.java | 16 ++--
.../tobago/facelets/TobagoComponentHandler.java | 16 ++--
.../tobago/facelets/TobagoValidateHandler.java | 6 +-
.../tobago/internal/behavior/DeltaStateHelper.java | 10 +-
.../tobago/internal/behavior/EventBehavior.java | 14 +--
.../tobago/internal/component/AbstractUIBadge.java | 2 +-
.../component/AbstractUICollapsiblePanel.java | 6 +-
.../internal/component/AbstractUIColumnBase.java | 2 +-
.../internal/component/AbstractUICommand.java | 10 +-
.../internal/component/AbstractUICommandBase.java | 20 ++--
.../tobago/internal/component/AbstractUIData.java | 18 ++--
.../tobago/internal/component/AbstractUIEvent.java | 2 +-
.../tobago/internal/component/AbstractUIFile.java | 10 +-
.../internal/component/AbstractUIFlexLayout.java | 10 +-
.../internal/component/AbstractUIFormBase.java | 6 +-
.../internal/component/AbstractUIGridLayout.java | 16 ++--
.../internal/component/AbstractUIHidden.java | 2 +-
.../tobago/internal/component/AbstractUIImage.java | 2 +-
.../tobago/internal/component/AbstractUIInput.java | 6 +-
.../tobago/internal/component/AbstractUILabel.java | 2 +-
.../internal/component/AbstractUILabelBase.java | 6 +-
.../internal/component/AbstractUILayoutBase.java | 2 +-
.../internal/component/AbstractUIMessages.java | 6 +-
.../tobago/internal/component/AbstractUIMeta.java | 14 +--
.../internal/component/AbstractUIMetaLink.java | 14 +--
.../internal/component/AbstractUIObject.java | 2 +-
.../internal/component/AbstractUIOperation.java | 2 +-
.../tobago/internal/component/AbstractUIOut.java | 2 +-
.../tobago/internal/component/AbstractUIPage.java | 8 +-
.../tobago/internal/component/AbstractUIPanel.java | 2 +-
.../internal/component/AbstractUIPanelBase.java | 2 +-
.../tobago/internal/component/AbstractUIPopup.java | 2 +-
.../internal/component/AbstractUIProgress.java | 14 +--
.../internal/component/AbstractUIReload.java | 2 +-
.../tobago/internal/component/AbstractUIRow.java | 2 +-
.../internal/component/AbstractUIScript.java | 14 +--
.../internal/component/AbstractUISection.java | 2 +-
.../component/AbstractUISelectBoolean.java | 8 +-
.../internal/component/AbstractUISelectItem.java | 6 +-
.../internal/component/AbstractUISelectItems.java | 2 +-
.../component/AbstractUISelectManyBase.java | 6 +-
.../component/AbstractUISelectManyListbox.java | 2 +-
.../component/AbstractUISelectOneBase.java | 8 +-
.../component/AbstractUISelectOneChoice.java | 2 +-
.../component/AbstractUISelectOneListbox.java | 2 +-
.../component/AbstractUISelectReference.java | 2 +-
.../internal/component/AbstractUISeparator.java | 2 +-
.../tobago/internal/component/AbstractUISheet.java | 30 +++---
.../internal/component/AbstractUISplitLayout.java | 4 +-
.../tobago/internal/component/AbstractUIStars.java | 8 +-
.../tobago/internal/component/AbstractUIStyle.java | 18 ++--
.../internal/component/AbstractUISuggest.java | 8 +-
.../tobago/internal/component/AbstractUITab.java | 4 +-
.../internal/component/AbstractUITabGroup.java | 18 ++--
.../tobago/internal/component/AbstractUITree.java | 12 +--
.../internal/component/AbstractUITreeIndent.java | 2 +-
.../internal/component/AbstractUITreeNodeBase.java | 4 +-
.../internal/component/AbstractUITreeSelect.java | 8 +-
.../tobago/internal/config/TobagoConfigLoader.java | 4 +-
.../tobago/internal/context/DateTimeI18n.java | 2 +-
.../myfaces/tobago/internal/context/Nonce.java | 4 +-
.../myfaces/tobago/internal/layout/Cell.java | 2 +-
.../myfaces/tobago/internal/layout/OriginCell.java | 2 +-
.../myfaces/tobago/internal/layout/SpanCell.java | 2 +-
.../tobago/internal/renderkit/CommandMap.java | 2 +-
.../internal/renderkit/renderer/BadgeRenderer.java | 2 +-
.../internal/renderkit/renderer/BarRenderer.java | 4 +-
.../internal/renderkit/renderer/BoxRenderer.java | 4 +-
.../renderkit/renderer/ButtonRenderer.java | 4 +-
.../renderkit/renderer/ButtonsRenderer.java | 2 +-
.../renderer/CollapsiblePanelRendererBase.java | 2 +-
.../renderkit/renderer/ColumnRenderer.java | 2 +-
.../renderkit/renderer/CommandRendererBase.java | 6 +-
.../internal/renderkit/renderer/DateRenderer.java | 8 +-
.../renderer/DecodingCommandRendererBase.java | 6 +-
.../renderer/DecodingInputRendererBase.java | 6 +-
.../renderkit/renderer/FigureRenderer.java | 4 +-
.../internal/renderkit/renderer/FileRenderer.java | 16 ++--
.../renderkit/renderer/FlexLayoutRenderer.java | 2 +-
.../renderkit/renderer/FlowLayoutRenderer.java | 2 +-
.../renderkit/renderer/FooterRenderer.java | 2 +-
.../internal/renderkit/renderer/FormRenderer.java | 2 +-
.../renderkit/renderer/GridLayoutRenderer.java | 2 +-
.../renderkit/renderer/HeaderRenderer.java | 2 +-
.../renderkit/renderer/HiddenRenderer.java | 2 +-
.../internal/renderkit/renderer/ImageRenderer.java | 2 +-
.../internal/renderkit/renderer/InRenderer.java | 10 +-
.../renderer/LabelLayoutRendererBase.java | 4 +-
.../internal/renderkit/renderer/LabelRenderer.java | 14 +--
.../internal/renderkit/renderer/LinkRenderer.java | 2 +-
.../internal/renderkit/renderer/LinksRenderer.java | 4 +-
.../renderer/MessageLayoutRendererBase.java | 6 +-
.../renderkit/renderer/MessagesRenderer.java | 4 +-
.../renderkit/renderer/MetaLinkRenderer.java | 2 +-
.../internal/renderkit/renderer/MetaRenderer.java | 2 +-
.../renderkit/renderer/ObjectRenderer.java | 2 +-
.../internal/renderkit/renderer/OutRenderer.java | 2 +-
.../internal/renderkit/renderer/PageRenderer.java | 20 ++--
.../internal/renderkit/renderer/PanelRenderer.java | 2 +-
.../internal/renderkit/renderer/PopupRenderer.java | 4 +-
.../renderkit/renderer/ProgressRenderer.java | 2 +-
.../internal/renderkit/renderer/RangeRenderer.java | 2 +-
.../renderkit/renderer/ReloadRenderer.java | 4 +-
.../internal/renderkit/renderer/RowRenderer.java | 4 +-
.../renderkit/renderer/ScriptRenderer.java | 2 +-
.../renderkit/renderer/SectionRenderer.java | 4 +-
.../renderkit/renderer/SegmentLayoutRenderer.java | 4 +-
.../renderer/SelectBooleanCheckboxRenderer.java | 2 +-
.../renderer/SelectBooleanRendererBase.java | 2 +-
.../renderer/SelectBooleanToggleRenderer.java | 2 +-
.../renderer/SelectManyCheckboxRenderer.java | 4 +-
.../renderer/SelectManyListboxRenderer.java | 4 +-
.../renderkit/renderer/SelectManyRendererBase.java | 28 +++---
.../renderer/SelectManyShuttleRenderer.java | 6 +-
.../renderer/SelectOneChoiceRenderer.java | 4 +-
.../renderer/SelectOneListboxRenderer.java | 4 +-
.../renderkit/renderer/SelectOneRadioRenderer.java | 4 +-
.../renderkit/renderer/SelectOneRendererBase.java | 2 +-
.../renderer/SelectReferenceRenderer.java | 4 +-
.../renderkit/renderer/SeparatorRenderer.java | 4 +-
.../internal/renderkit/renderer/SheetRenderer.java | 22 ++---
.../renderkit/renderer/SplitLayoutRenderer.java | 2 +-
.../internal/renderkit/renderer/StarsRenderer.java | 2 +-
.../internal/renderkit/renderer/StyleRenderer.java | 2 +-
.../renderkit/renderer/SubviewRenderer.java | 6 +-
.../renderkit/renderer/SuggestRenderer.java | 4 +-
.../renderkit/renderer/TabGroupRenderer.java | 20 ++--
.../renderkit/renderer/TextareaRenderer.java | 10 +-
.../renderer/TobagoClientBehaviorRenderer.java | 22 ++---
.../renderkit/renderer/TreeIconRenderer.java | 2 +-
.../renderkit/renderer/TreeIndentRenderer.java | 2 +-
.../renderkit/renderer/TreeLabelRenderer.java | 2 +-
.../renderkit/renderer/TreeListboxRenderer.java | 4 +-
.../renderkit/renderer/TreeNodeRenderer.java | 4 +-
.../internal/renderkit/renderer/TreeRenderer.java | 4 +-
.../renderkit/renderer/TreeSelectRenderer.java | 4 +-
.../renderkit/renderer/VerbatimRenderer.java | 4 +-
.../taglib/component/AttributeTagDeclaration.java | 2 +-
.../taglib/component/BadgeTagDeclaration.java | 6 +-
.../taglib/component/BarTagDeclaration.java | 4 +-
.../taglib/component/BoxTagDeclaration.java | 6 +-
.../taglib/component/ButtonTagDeclaration.java | 4 +-
.../taglib/component/ButtonsTagDeclaration.java | 6 +-
.../taglib/component/ColumnNodeTagDeclaration.java | 6 +-
.../component/ColumnSelectorTagDeclaration.java | 6 +-
.../taglib/component/ColumnTagDeclaration.java | 6 +-
.../component/ConvertDateTimeTagDeclaration.java | 2 +-
.../taglib/component/ConverterTagDeclaration.java | 4 +-
.../component/DataAttributeTagDeclaration.java | 2 +-
.../taglib/component/DateTagDeclaration.java | 6 +-
.../taglib/component/EventTagDeclaration.java | 8 +-
.../taglib/component/FigureTagDeclaration.java | 6 +-
.../taglib/component/FileTagDeclaration.java | 8 +-
.../taglib/component/FlexLayoutTagDeclaration.java | 2 +-
.../taglib/component/FlowLayoutTagDeclaration.java | 2 +-
.../taglib/component/FooterTagDeclaration.java | 4 +-
.../taglib/component/FormTagDeclaration.java | 6 +-
.../GridLayoutConstraintTagDeclaration.java | 2 +-
.../taglib/component/GridLayoutTagDeclaration.java | 2 +-
.../taglib/component/HeaderTagDeclaration.java | 4 +-
.../taglib/component/HiddenTagDeclaration.java | 4 +-
.../taglib/component/ImageTagDeclaration.java | 6 +-
.../taglib/component/InTagDeclaration.java | 4 +-
.../taglib/component/LabelTagDeclaration.java | 6 +-
.../taglib/component/LinkTagDeclaration.java | 4 +-
.../taglib/component/LinksTagDeclaration.java | 6 +-
.../taglib/component/MessagesTagDeclaration.java | 14 +--
.../taglib/component/MetaLinkTagDeclaration.java | 2 +-
.../taglib/component/MetaTagDeclaration.java | 2 +-
.../taglib/component/ObjectTagDeclaration.java | 6 +-
.../taglib/component/OutTagDeclaration.java | 6 +-
.../taglib/component/PageTagDeclaration.java | 4 +-
.../taglib/component/PanelTagDeclaration.java | 4 +-
.../taglib/component/PopupTagDeclaration.java | 4 +-
.../taglib/component/ProgressTagDeclaration.java | 4 +-
.../taglib/component/RangeTagDeclaration.java | 4 +-
.../ResetInputActionListenerTagDeclaration.java | 2 +-
.../taglib/component/RowTagDeclaration.java | 4 +-
.../taglib/component/SectionTagDeclaration.java | 4 +-
.../SegmentLayoutConstraintTagDeclaration.java | 2 +-
.../component/SegmentLayoutTagDeclaration.java | 2 +-
.../SelectBooleanCheckboxTagDeclaration.java | 4 +-
.../SelectBooleanToggleTagDeclaration.java | 4 +-
.../taglib/component/SelectItemTagDeclaration.java | 4 +-
.../component/SelectItemsTagDeclaration.java | 4 +-
.../SelectManyCheckboxTagDeclaration.java | 8 +-
.../component/SelectManyListboxTagDeclaration.java | 6 +-
.../component/SelectManyShuttleTagDeclaration.java | 8 +-
.../component/SelectOneChoiceTagDeclaration.java | 8 +-
.../component/SelectOneListboxTagDeclaration.java | 8 +-
.../component/SelectOneRadioTagDeclaration.java | 8 +-
.../component/SelectReferenceTagDeclaration.java | 4 +-
.../taglib/component/SeparatorTagDeclaration.java | 2 +-
.../component/SheetPageCommandTagDeclaration.java | 4 +-
.../taglib/component/SheetTagDeclaration.java | 14 +--
.../taglib/component/StarsTagDeclaration.java | 4 +-
.../taglib/component/SuggestTagDeclaration.java | 2 +-
.../component/TabChangeListenerTagDeclaration.java | 2 +-
.../taglib/component/TabGroupTagDeclaration.java | 4 +-
.../taglib/component/TabTagDeclaration.java | 4 +-
.../taglib/component/TextareaTagDeclaration.java | 4 +-
.../taglib/component/TreeIconTagDeclaration.java | 6 +-
.../taglib/component/TreeIndentTagDeclaration.java | 6 +-
.../taglib/component/TreeLabelTagDeclaration.java | 6 +-
.../component/TreeListboxTagDeclaration.java | 6 +-
.../taglib/component/TreeNodeTagDeclaration.java | 4 +-
.../taglib/component/TreeSelectTagDeclaration.java | 4 +-
.../taglib/component/TreeTagDeclaration.java | 6 +-
.../component/ValidateFileItemTagDeclaration.java | 2 +-
...ValidateSubmittedValueLengthTagDeclaration.java | 2 +-
.../internal/taglib/declaration/HasAction.java | 2 +-
.../internal/taglib/declaration/HasBinding.java | 2 +-
.../internal/taglib/declaration/HasValidator.java | 2 +-
.../tobago/internal/util/AccessKeyLogger.java | 2 +-
.../tobago/internal/util/AuthorizationHelper.java | 20 ++--
.../myfaces/tobago/internal/util/CookieUtils.java | 6 +-
.../tobago/internal/util/HtmlRendererUtils.java | 12 +--
.../tobago/internal/util/HttpPartWrapper.java | 10 +-
.../myfaces/tobago/internal/util/PartUtils.java | 2 +-
.../myfaces/tobago/internal/util/RenderUtils.java | 24 ++---
.../tobago/internal/util/ResponseUtils.java | 4 +-
.../tobago/internal/util/SelectItemUtils.java | 14 +--
.../myfaces/tobago/internal/util/SortingUtils.java | 26 ++---
.../internal/webapp/DebugContentTypeFilter.java | 14 +--
.../internal/webapp/DebugContentTypeResponse.java | 4 +-
.../webapp/DebugResponseWriterWrapper.java | 8 +-
.../tobago/internal/webapp/HtmlResponseWriter.java | 2 +-
.../tobago/internal/webapp/LoggingMdcFilter.java | 16 ++--
.../internal/webapp/TobagoResponseWriterBase.java | 2 +-
.../webapp/TobagoResponseWriterWrapper.java | 4 +-
.../tobago/internal/webapp/XmlResponseWriter.java | 2 +-
.../tobago/lifecycle/SecretPhaseListener.java | 8 +-
.../apache/myfaces/tobago/model/SelectItem.java | 2 +-
.../apache/myfaces/tobago/model/TreeDataModel.java | 2 +-
.../myfaces/tobago/renderkit/GenericRenderer.java | 2 +-
.../tobago/renderkit/LabelWithAccessKey.java | 2 +-
.../myfaces/tobago/renderkit/RendererBase.java | 36 +++----
.../myfaces/tobago/renderkit/TobagoRenderKit.java | 20 ++--
.../tobago/renderkit/css/BootstrapClass.java | 4 +-
.../myfaces/tobago/renderkit/css/CustomClass.java | 6 +-
.../tobago/servlet/NonFacesRequestServlet.java | 24 ++---
.../org/apache/myfaces/tobago/util/AjaxUtils.java | 10 +-
.../apache/myfaces/tobago/util/ComponentUtils.java | 40 ++++----
.../myfaces/tobago/util/ContextCallback.java | 4 +-
.../myfaces/tobago/util/DebugActionListener.java | 6 +-
.../tobago/util/DebugNavigationHandler.java | 4 +-
.../myfaces/tobago/util/DebugPhaseListener.java | 18 ++--
.../org/apache/myfaces/tobago/util/DebugUtils.java | 12 +--
.../apache/myfaces/tobago/util/FacesELUtils.java | 8 +-
.../apache/myfaces/tobago/util/FacesVersion.java | 4 +-
.../apache/myfaces/tobago/util/MessageFormat.java | 2 +-
.../apache/myfaces/tobago/util/MessageUtils.java | 10 +-
.../apache/myfaces/tobago/util/ResourceUtils.java | 4 +-
.../tobago/util/ValueExpressionComparator.java | 10 +-
.../myfaces/tobago/util/VariableResolverUtils.java | 4 +-
.../apache/myfaces/tobago/util/WebXmlUtils.java | 8 +-
.../validator/ClearValidatorsActionListener.java | 12 +--
.../tobago/validator/FileItemValidator.java | 14 +--
.../validator/SubmittedValueLengthValidator.java | 12 +--
.../tobago/webapp/LogoutActionListener.java | 14 +--
.../org/apache/myfaces/tobago/webapp/Secret.java | 6 +-
.../tobago/webapp/SecretSessionListener.java | 4 +-
.../tobago/webapp/TobagoResponseWriter.java | 4 +-
.../webapp/TobagoServletContextListener.java | 4 +-
.../AbstractGeneratedUIComponentsUnitTest.java | 2 +-
.../AttributesOfGeneratedUIComponentsUnitTest.java | 2 +-
...OverwritingOfGeneratedUIComponentsUnitTest.java | 2 +-
.../tobago/component/UIMessagesUnitTest.java | 4 +-
.../myfaces/tobago/component/UISheetUnitTest.java | 2 +-
.../tobago/convert/DurationConverterUnitTest.java | 2 +-
.../component/AbstractUIGridLayoutUnitTest.java | 2 +-
.../internal/config/AbstractTobagoTestBase.java | 8 +-
.../internal/mock/servlet/MockHttpSession.java | 6 +-
.../mock/servlet/MockServletInputStream.java | 4 +-
.../renderkit/renderer/DateRendererUnitTest.java | 4 +-
.../renderkit/renderer/InRendererUnitTest.java | 4 +-
.../renderer/SelectOneRadioRendererUnitTest.java | 2 +-
.../renderer/TreeSelectRendererUnitTest.java | 2 +-
.../tobago/internal/util/RenderUtilsUnitTest.java | 2 +-
.../internal/util/StyleRenderUtilsUnitTest.java | 2 +-
.../tobago/util/ComponentUtilsUnitTest.java | 6 +-
.../myfaces/tobago/util/MessageUtilsUnitTest.java | 2 +-
tobago-example/pom.xml | 105 ++++++++++++++++++++-
tobago-example/tobago-example-assembly/pom.xml | 2 +-
tobago-example/tobago-example-blank/pom.xml | 2 +-
.../apache/myfaces/tobago/example/blank/Hello.java | 4 +-
tobago-example/tobago-example-demo/pom.xml | 56 ++++++++++-
.../demo/AjaxSpecialCharacterController.java | 4 +-
.../myfaces/tobago/example/demo/ApiController.java | 6 +-
.../myfaces/tobago/example/demo/AstroData.java | 4 +-
.../tobago/example/demo/AttributeController.java | 4 +-
.../tobago/example/demo/BadgeController.java | 4 +-
.../tobago/example/demo/BehaviorController.java | 8 +-
.../example/demo/BehaviorTestController.java | 8 +-
.../myfaces/tobago/example/demo/BoxController.java | 4 +-
.../tobago/example/demo/BundleController.java | 10 +-
.../tobago/example/demo/ButtonLinkController.java | 4 +-
.../tobago/example/demo/CkeditorController.java | 4 +-
.../example/demo/CollapsibleBoxController.java | 4 +-
.../tobago/example/demo/CollapsibleController.java | 6 +-
.../example/demo/CollapsiblePanelController.java | 4 +-
.../example/demo/CollapsiblePopupController.java | 4 +-
.../example/demo/CollapsibleSectionController.java | 4 +-
.../example/demo/ConversationController.java | 6 +-
.../tobago/example/demo/ConversionController.java | 4 +-
.../example/demo/ConvertDateTimeController.java | 4 +-
.../tobago/example/demo/CurrencyController.java | 4 +-
.../example/demo/CurrentValueController.java | 4 +-
.../tobago/example/demo/DateController.java | 14 +--
.../example/demo/DefaultCommandController.java | 6 +-
.../tobago/example/demo/DockerController.java | 4 +-
.../tobago/example/demo/EventController.java | 14 +--
.../tobago/example/demo/ExceptionController.java | 6 +-
.../example/demo/ExceptionHandlerController.java | 12 +--
.../tobago/example/demo/ExecuteController.java | 4 +-
.../tobago/example/demo/ForEachController.java | 4 +-
.../tobago/example/demo/FormAjaxController.java | 4 +-
.../tobago/example/demo/FormController.java | 4 +-
.../example/demo/FormRequiredController.java | 4 +-
.../tobago/example/demo/GroupController.java | 6 +-
.../example/demo/HeaderFooterController.java | 4 +-
.../myfaces/tobago/example/demo/InController.java | 6 +-
.../example/demo/InputSuggestController.java | 8 +-
.../myfaces/tobago/example/demo/Jsr303Bean.java | 10 +-
.../myfaces/tobago/example/demo/KillSession.java | 12 +--
.../tobago/example/demo/LocaleController.java | 20 ++--
.../tobago/example/demo/LoggingController.java | 4 +-
.../tobago/example/demo/LoginController.java | 14 +--
.../tobago/example/demo/ManifestReader.java | 4 +-
.../example/demo/MessageLayoutController.java | 10 +-
.../tobago/example/demo/MessagesController.java | 8 +-
.../tobago/example/demo/MetaController.java | 6 +-
.../tobago/example/demo/Migration4Controller.java | 4 +-
.../tobago/example/demo/Migration5Controller.java | 4 +-
.../myfaces/tobago/example/demo/NamedNode.java | 2 +-
.../tobago/example/demo/NavigationState.java | 12 +--
.../tobago/example/demo/NavigationTree.java | 16 ++--
.../tobago/example/demo/ObjectController.java | 4 +-
.../tobago/example/demo/OnOffConverter.java | 8 +-
.../myfaces/tobago/example/demo/OutController.java | 4 +-
.../tobago/example/demo/PanelController.java | 4 +-
.../example/demo/PartialReloadController.java | 14 +--
.../tobago/example/demo/PopupController.java | 6 +-
.../tobago/example/demo/ProgressController.java | 6 +-
.../tobago/example/demo/RangeController.java | 4 +-
.../tobago/example/demo/ResizeController.java | 2 +-
.../tobago/example/demo/RoleController.java | 6 +-
.../demo/SelectBooleanCheckboxController.java | 4 +-
.../demo/SelectBooleanToggleController.java | 4 +-
.../tobago/example/demo/SelectController.java | 4 +-
.../tobago/example/demo/SelectItemModel.java | 4 +-
.../example/demo/SelectManyCheckboxController.java | 4 +-
.../example/demo/SelectManyListboxController.java | 4 +-
.../example/demo/SelectManyShuttleController.java | 8 +-
.../example/demo/SelectOneChoiceController.java | 4 +-
.../example/demo/SelectOneListboxController.java | 4 +-
.../example/demo/SelectOneRadioController.java | 4 +-
.../myfaces/tobago/example/demo/ServerInfo.java | 10 +-
.../tobago/example/demo/SeverityController.java | 10 +-
.../myfaces/tobago/example/demo/SheetConfig.java | 2 +-
.../tobago/example/demo/SheetController.java | 21 +++--
.../example/demo/SheetEditableController.java | 8 +-
.../tobago/example/demo/SheetFilterController.java | 18 ++--
.../example/demo/SheetSortingController.java | 12 +--
.../tobago/example/demo/SheetTreeController.java | 8 +-
.../tobago/example/demo/SolarConverter.java | 14 +--
.../myfaces/tobago/example/demo/SolarObject.java | 2 +-
.../tobago/example/demo/SourceFileReader.java | 4 +-
.../tobago/example/demo/SplitLayoutController.java | 4 +-
.../tobago/example/demo/StarsController.java | 4 +-
.../tobago/example/demo/SuggestController.java | 10 +-
.../example/demo/SuggestQuotMarkController.java | 4 +-
.../demo/SynchronizeNavigationPhaseListener.java | 10 +-
.../myfaces/tobago/example/demo/TabController.java | 4 +-
.../tobago/example/demo/TestController.java | 8 +-
.../tobago/example/demo/TextareaController.java | 4 +-
.../tobago/example/demo/ThemeController.java | 8 +-
.../tobago/example/demo/TinyMceController.java | 4 +-
.../example/demo/TreeCommandTypesController.java | 4 +-
.../tobago/example/demo/TreeController.java | 4 +-
.../tobago/example/demo/TreeEditorController.java | 8 +-
.../tobago/example/demo/TreeListboxController.java | 6 +-
.../tobago/example/demo/TreeSelectController.java | 4 +-
.../tobago/example/demo/UploadController.java | 12 +--
.../tobago/example/demo/ValidationController.java | 14 +--
.../example/demo/ValidationJsr303Controller.java | 8 +-
.../myfaces/tobago/example/demo/Version.java | 4 +-
.../tobago/example/demo/WebSocketController.java | 10 +-
.../demo/bestpractice/BestPracticeController.java | 8 +-
.../demo/bestpractice/ToolBarCustomizer.java | 8 +-
.../demo/bestpractice/TransitionController.java | 4 +-
.../myfaces/tobago/example/demo/info/Activity.java | 2 +-
.../tobago/example/demo/info/ActivityList.java | 4 +-
.../example/demo/info/ActivityPhaseListener.java | 14 +--
.../example/demo/info/ActivitySessionListener.java | 9 +-
.../example/demo/nonfacesrequest/FishPond.java | 4 +-
tobago-example/tobago-example-spring-boot/pom.xml | 2 +-
.../myfaces/tobago/example/spring/HelloSpring.java | 4 +-
tobago-theme/pom.xml | 2 +-
tobago-theme/tobago-theme-charlotteville/pom.xml | 2 +-
tobago-theme/tobago-theme-roxborough/pom.xml | 2 +-
tobago-theme/tobago-theme-scarborough/pom.xml | 2 +-
tobago-theme/tobago-theme-speyside/pom.xml | 2 +-
tobago-theme/tobago-theme-standard/pom.xml | 6 +-
tobago-tool/pom.xml | 2 +-
tobago-tool/tobago-config-dev/pom.xml | 2 +-
tobago-tool/tobago-config-mojarra/pom.xml | 2 +-
tobago-tool/tobago-config-myfaces/pom.xml | 2 +-
tobago-tool/tobago-config-owb/pom.xml | 68 ++++++++++++-
tobago-tool/tobago-tool-annotation/pom.xml | 2 +-
.../tobago/apt/annotation/UIComponentTag.java | 2 +-
tobago-tool/tobago-tool-apt/pom.xml | 2 +-
.../myfaces/tobago/apt/generate/PropertyInfo.java | 2 +-
.../tobago/apt/processor/ClassesGenerator.java | 6 +-
.../tobago/apt/processor/FacesConfigGenerator.java | 4 +-
.../org/apache/myfaces/tobago/apt/component.stg | 10 +-
tobago-tool/tobago-tool-test/pom.xml | 2 +-
482 files changed, 1819 insertions(+), 1577 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cd49ebe..08b8165 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -26,6 +26,26 @@ updates:
include: "scope"
schedule:
interval: "daily"
+ ignore:
+ - dependency-name: "org.antlr:stringtemplate"
+ versions:
+ - ">= 4.0.0"
+ - dependency-name: "org.apache.maven.plugins:maven-checkstyle-plugin"
+ versions:
+ - ">=3.1.0"
+ - dependency-name: "org.apache.maven.plugins:maven-enforcer-plugin"
+ versions:
+ - ">= 3.0.0"
+
+ - package-ecosystem: "maven"
+ directory: "/"
+ target-branch: "tobago-5.x"
+ commit-message:
+ prefix: "build"
+ prefix-development: "build"
+ include: "scope"
+ schedule:
+ interval: "daily"
ignore:
# Jetty >= 10 requires jdk 11
- dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
@@ -77,7 +97,6 @@ updates:
versions:
- ">= 3.0.0"
-
- package-ecosystem: "maven"
directory: "/"
target-branch: "tobago-4.x"
@@ -154,6 +173,13 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
+ target-branch: "tobago-5.x"
+ schedule:
+ # Check for updates to GitHub Actions every day
+ interval: "daily"
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
target-branch: "tobago-4.x"
schedule:
# Check for updates to GitHub Actions every day
diff --git a/pom.xml b/pom.xml
index cbb4088..ba31f86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<artifactId>tobago</artifactId>
<packaging>pom</packaging>
<name>Apache Tobago</name>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<description>The goal of Tobago is to provide the community with a well designed set of user interface components based on JSF and run on MyFaces.</description>
<url>http://myfaces.apache.org/tobago</url>
<inceptionYear>2002</inceptionYear>
@@ -34,13 +34,12 @@
<properties>
<frontend.skip>true</frontend.skip>
<!-- old main branch of MyFaces -->
- <myfaces23.version>2.3.9</myfaces23.version>
- <myfaces-test23.version>1.0.8</myfaces-test23.version>
+ <myfaces23.version>3.0.1</myfaces23.version>
<!-- new main branch of MyFaces "next" -->
<!-- <myfaces23.version>2.3-next-M6</myfaces23.version>-->
<myfaces23x.version>2.3-next-M6</myfaces23x.version>
- <mojarra23.version>2.3.16</mojarra23.version>
+ <mojarra23.version>3.0.1</mojarra23.version>
<openwebbeans.version>2.0.23</openwebbeans.version>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.6</logback.version>
@@ -56,7 +55,7 @@
<checkstyle-rules.version>15-SNAPSHOT</checkstyle-rules.version>
<!-- Note: defined here in master pom, because of problems with enforcer plugin -->
- <jetty.version>9.4.43.v20210629</jetty.version>
+ <jetty.version>11.0.6</jetty.version>
<joinfaces.version>4.5.5</joinfaces.version>
<spring-boot.version>2.5.5</spring-boot.version>
@@ -400,13 +399,13 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>4.0.4</version>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
- <version>3.0.3</version>
+ <version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -474,23 +473,23 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
- <version>2.0.2</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>2.0.2</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -500,9 +499,9 @@
<version>1.14.2</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test23</artifactId>
- <version>${myfaces-test23.version}</version>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-test</artifactId>
+ <version>${myfaces23.version}</version>
<scope>test</scope>
</dependency>
<!-- myfaces "next"-->
@@ -1017,7 +1016,7 @@
<version>6.3.2</version>
<configuration>
<failBuildOnCVSS>0</failBuildOnCVSS>
- <suppressionFile>tobago/dependency-check-suppression-for-tobago-5.x.xml</suppressionFile>
+ <suppressionFile>tobago/dependency-check-suppression-for-tobago-6.x.xml</suppressionFile>
</configuration>
<dependencies>
<dependency>
diff --git a/tobago-assembly/pom.xml b/tobago-assembly/pom.xml
index 563c1dd..37cce1e 100644
--- a/tobago-assembly/pom.xml
+++ b/tobago-assembly/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index 78490cf..14cc360 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-core</artifactId>
<packaging>jar</packaging>
@@ -189,8 +189,8 @@
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.0</version>
+ <artifactId>jakarta.el</artifactId>
+ <version>4.0.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -273,8 +273,8 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test23</artifactId>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-test</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/tobago-core/src/main/faces-config/faces-config.xml b/tobago-core/src/main/faces-config/faces-config.xml
index 9e224fd..8df4662 100644
--- a/tobago-core/src/main/faces-config/faces-config.xml
+++ b/tobago-core/src/main/faces-config/faces-config.xml
@@ -44,13 +44,13 @@
</behavior>
<component>
- <component-type>javax.faces.NamingContainer</component-type>
+ <component-type>jakarta.faces.NamingContainer</component-type>
<component-class>org.apache.myfaces.tobago.component.UINamingContainer</component-class>
</component>
<converter>
<converter-for-class>java.util.Date</converter-for-class>
- <converter-class>javax.faces.convert.DateTimeConverter</converter-class>
+ <converter-class>jakarta.faces.convert.DateTimeConverter</converter-class>
</converter>
<render-kit>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
index 9c06472..8e2ed63 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.application;
-import javax.el.ValueExpression;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
public class LabelValueExpressionFacesMessage extends FacesMessage {
public LabelValueExpressionFacesMessage() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java
index e8a3699..7414046 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/LabelLayout.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.component;
import org.apache.myfaces.tobago.internal.util.Deprecation;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
public enum LabelLayout {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
index 8edddd0..2274642 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.component;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
public interface SupportFieldId {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsAutoSpacing.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsAutoSpacing.java
index 130c57c..1947dc0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsAutoSpacing.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsAutoSpacing.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.component;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.util.Map;
public interface SupportsAutoSpacing {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UINamingContainer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UINamingContainer.java
index cf91f88..63dcf15 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UINamingContainer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UINamingContainer.java
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.component;
public class UINamingContainer
- extends javax.faces.component.UINamingContainer {
+ extends jakarta.faces.component.UINamingContainer {
public static final String COMPONENT_TYPE = "javax.faces.NamingContainer";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
index 0e48a95..8a5ff59 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
@@ -32,9 +32,9 @@ import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
+import jakarta.faces.application.Application;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletContext;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
index 6fa2858..97e4817 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
@@ -24,12 +24,12 @@ import org.apache.myfaces.tobago.internal.util.CookieUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.Locale;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java
index 8706459..2863104 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandler.java
@@ -23,23 +23,23 @@ import org.apache.myfaces.tobago.util.WebXmlUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.FacesException;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.NavigationHandler;
-import javax.faces.application.ViewExpiredException;
-import javax.faces.application.ViewHandler;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExceptionHandlerWrapper;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PreRenderViewEvent;
-import javax.faces.view.ViewDeclarationLanguage;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.faces.FacesException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.application.ViewExpiredException;
+import jakarta.faces.application.ViewHandler;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.ExceptionHandler;
+import jakarta.faces.context.ExceptionHandlerWrapper;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ExceptionQueuedEvent;
+import jakarta.faces.event.ExceptionQueuedEventContext;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PreRenderViewEvent;
+import jakarta.faces.view.ViewDeclarationLanguage;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandlerFactory.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandlerFactory.java
index 73bd013..4f96d0b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandlerFactory.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoExceptionHandlerFactory.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.tobago.context;
import org.apache.myfaces.tobago.config.TobagoConfig;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExceptionHandlerFactory;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.ExceptionHandler;
+import jakarta.faces.context.ExceptionHandlerFactory;
+import jakarta.faces.context.FacesContext;
/**
* The TobagoExceptionHandler is activated by default via the basic faces-config.xml of tobago-core.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
index 3e96092..e592942 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TransientStateHolder.java
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.context;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.context.FacesContext;
import java.io.Serializable;
public class TransientStateHolder implements StateHolder, Serializable {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/BoundedRangeModelConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/BoundedRangeModelConverter.java
index 0fe5fb5..d9337d3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/BoundedRangeModelConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/BoundedRangeModelConverter.java
@@ -21,11 +21,11 @@ package org.apache.myfaces.tobago.convert;
import org.apache.myfaces.tobago.internal.util.StringUtils;
-import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.ValueHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
import javax.swing.BoundedRangeModel;
import javax.swing.DefaultBoundedRangeModel;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java
index aaa9a1a..8c4efa9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/CurrencyConverter.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.tobago.convert;
import org.apache.myfaces.tobago.internal.util.StringUtils;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
import java.util.Currency;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java
index b19ffe3..1815dae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DateTimeConverter.java
@@ -23,10 +23,10 @@ import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.ConverterException;
import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -49,7 +49,7 @@ import static org.apache.myfaces.tobago.convert.DateTimeConverter.CONVERTER_ID;
*/
@Deprecated
@org.apache.myfaces.tobago.apt.annotation.Converter(id = CONVERTER_ID)
-public class DateTimeConverter extends javax.faces.convert.DateTimeConverter {
+public class DateTimeConverter extends jakarta.faces.convert.DateTimeConverter {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
index d56e93d..93c7c99 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
@@ -24,10 +24,10 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
import java.lang.invoke.MethodHandles;
import java.text.DecimalFormat;
import java.text.NumberFormat;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
index e08fbbb..6177502 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/LocaleConverter.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.tobago.convert;
import org.apache.myfaces.tobago.util.LocaleUtils;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
import java.util.Locale;
@org.apache.myfaces.tobago.apt.annotation.Converter(forClass = "java.util.Locale")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/MeasureConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/MeasureConverter.java
index 8aac37c..28250f8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/MeasureConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/MeasureConverter.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.convert;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.Measure;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
/**
* JSF converter for the org.apache.myfaces.tobago.layout.Measure class.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
index 4ae9507..9b5667d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java
@@ -24,10 +24,10 @@ import org.apache.myfaces.tobago.context.Theme;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
import java.lang.invoke.MethodHandles;
@org.apache.myfaces.tobago.apt.annotation.Converter(forClass = "org.apache.myfaces.tobago.context.Theme")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
index ccf6e93..1a08f43 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/AbstractResetInputActionListener.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionListener;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.ActionListener;
import java.util.Iterator;
public abstract class AbstractResetInputActionListener implements ActionListener {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
index 5cd52b2..fd3a019 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/CollapsibleActionListener.java
@@ -24,13 +24,13 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.ActionListener;
import java.lang.invoke.MethodHandles;
public class CollapsibleActionListener implements ActionListener, StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/FacesEventWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/FacesEventWrapper.java
index fba4580..4dc4db3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/FacesEventWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/FacesEventWrapper.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
-import javax.faces.event.PhaseId;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.FacesListener;
+import jakarta.faces.event.PhaseId;
public class FacesEventWrapper extends FacesEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
index 8825cad..c3b7f08 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionStateChangeListener.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.tobago.event;
import org.apache.myfaces.tobago.util.FacesELUtils;
-import javax.el.MethodExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
+import jakarta.el.MethodExpression;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
public class MethodExpressionStateChangeListener implements SheetStateChangeListener, StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
index e999c12..7955cb9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTabChangeListener.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.tobago.event;
import org.apache.myfaces.tobago.util.FacesELUtils;
-import javax.el.MethodExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
+import jakarta.el.MethodExpression;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
public class MethodExpressionTabChangeListener implements TabChangeListener, StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
index e9aa9ce..e9dbae5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.tobago.event;
import org.apache.myfaces.tobago.util.FacesELUtils;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.context.FacesContext;
public class MethodExpressionTreeExpansionListener implements TreeExpansionListener, StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeSelectedListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeSelectedListener.java
index be6c380..84e1b09 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeSelectedListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeSelectedListener.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.tobago.event;
import org.apache.myfaces.tobago.util.FacesELUtils;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.context.FacesContext;
public class MethodExpressionTreeSelectedListener implements TreeSelectedListener, StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
index 27bac8b..97fb522 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/PageActionEvent.java
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.event.ActionEvent;
-import javax.faces.component.UIComponent;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.component.UIComponent;
public class PageActionEvent extends ActionEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
index fe1936c..5d7841d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetFormActionListener.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIForm;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIForm;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionEvent;
import java.io.Serializable;
public class ResetFormActionListener extends AbstractResetInputActionListener implements Serializable{
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
index 3d8b37b..7384db7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ResetInputActionListener.java
@@ -21,10 +21,10 @@ package org.apache.myfaces.tobago.event;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
import java.util.Collection;
public class ResetInputActionListener extends AbstractResetInputActionListener implements StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
index 252fd77..0e99cf0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesListener;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.FacesListener;
+import jakarta.faces.event.ActionEvent;
public class SheetStateChangeEvent extends ActionEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java
index ab4dbda..b2c7a86 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.event.FacesListener;
+import jakarta.faces.event.FacesListener;
public interface SheetStateChangeListener extends FacesListener {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
index a6ee420..70961f8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.event;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
public interface SheetStateChangeSource {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
index 856c219..f2f623b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionEvent.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.UIColumn;
-import javax.faces.component.UIData;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.PhaseId;
+import jakarta.faces.component.UIColumn;
+import jakarta.faces.component.UIData;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.PhaseId;
public class SortActionEvent extends ActionEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
index 458553f..a90baa6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SortActionSource.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.event;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
public interface SortActionSource {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
index 50b0fed..11f71ba 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.FacesListener;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.FacesListener;
public class TabChangeEvent extends ActionEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java
index 041404f..d512fea 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.event.FacesListener;
+import jakarta.faces.event.FacesListener;
public interface TabChangeListener extends FacesListener {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
index 0e083a7..4a9d062 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.event;
-import javax.el.MethodExpression;
+import jakarta.el.MethodExpression;
public interface TabChangeSource {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
index dbceea2..6769dd5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.ActionSource2;
-import javax.faces.el.MethodBinding;
+import jakarta.faces.component.ActionSource2;
+import jakarta.faces.el.MethodBinding;
import java.lang.invoke.MethodHandles;
public interface TobagoActionSource extends ActionSource2 {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
index 5c7089a..c7533ed 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.FacesListener;
public class TreeExpansionEvent extends FacesEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
index 5eedf7a..e9ee015 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.event.FacesListener;
+import jakarta.faces.event.FacesListener;
public interface TreeExpansionListener extends FacesListener {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java
index 9321888..6576b52 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.FacesListener;
public class TreeSelectedEvent extends FacesEvent {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedListener.java
index 5ef63e0..16702eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedListener.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.event;
-import javax.faces.event.FacesListener;
+import jakarta.faces.event.FacesListener;
public interface TreeSelectedListener extends FacesListener {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
index d12eb7f..36c9442 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
@@ -25,12 +25,12 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
import java.lang.invoke.MethodHandles;
public class ValueExpressionResetInputActionListener extends AbstractResetInputActionListener implements StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
index 937457a..8d68824 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
public class ValueExpressionSheetStateChangeListener implements SheetStateChangeListener, StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
index 33e96c6..44eb01e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
public class ValueExpressionTabChangeListener implements TabChangeListener, StateHolder {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
index 93b810e..4866a01 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
@@ -27,30 +27,30 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.MethodExpression;
-import javax.el.MethodInfo;
-import javax.el.ValueExpression;
-import javax.faces.FacesException;
-import javax.faces.component.ActionSource;
-import javax.faces.component.ActionSource2;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.event.MethodExpressionActionListener;
-import javax.faces.event.MethodExpressionValueChangeListener;
-import javax.faces.validator.MethodExpressionValidator;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagConfig;
-import javax.faces.view.facelets.TagException;
-import javax.faces.view.facelets.TagHandler;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
+import jakarta.el.ValueExpression;
+import jakarta.faces.FacesException;
+import jakarta.faces.component.ActionSource;
+import jakarta.faces.component.ActionSource2;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.ValueHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.event.MethodExpressionActionListener;
+import jakarta.faces.event.MethodExpressionValueChangeListener;
+import jakarta.faces.validator.MethodExpressionValidator;
+import jakarta.faces.view.facelets.ComponentHandler;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagConfig;
+import jakarta.faces.view.facelets.TagException;
+import jakarta.faces.view.facelets.TagHandler;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
index f445fb7..cfc7813 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
@@ -22,11 +22,11 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.validator.FileItemValidator;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.MetaRule;
+import jakarta.faces.view.facelets.Metadata;
+import jakarta.faces.view.facelets.MetadataTarget;
+import jakarta.faces.view.facelets.TagAttribute;
public class ContentTypeRule extends MetaRule {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java
index 98cbd7a..2b6a143 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConvertDateTimeHandler.java
@@ -23,18 +23,18 @@ import org.apache.myfaces.tobago.convert.DateTimeConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ELException;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.ConverterConfig;
-import javax.faces.view.facelets.ConverterHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagException;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.ValueHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.view.facelets.ComponentHandler;
+import jakarta.faces.view.facelets.ConverterConfig;
+import jakarta.faces.view.facelets.ConverterHandler;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagException;
import java.lang.invoke.MethodHandles;
import java.util.Locale;
import java.util.TimeZone;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java
index 65d80ab..5fad083 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java
@@ -19,19 +19,19 @@
package org.apache.myfaces.tobago.facelets;
-import javax.el.ELException;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagAttributeException;
-import javax.faces.view.facelets.TagConfig;
-import javax.faces.view.facelets.TagException;
-import javax.faces.view.facelets.TagHandler;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.ValueHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.view.facelets.ComponentHandler;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagAttributeException;
+import jakarta.faces.view.facelets.TagConfig;
+import jakarta.faces.view.facelets.TagException;
+import jakarta.faces.view.facelets.TagHandler;
import java.io.IOException;
public class ConverterHandler extends TagHandler {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java
index a2ee62d..92d9d45 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java
@@ -22,14 +22,14 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.el.ELException;
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagConfig;
-import javax.faces.view.facelets.TagException;
-import javax.faces.view.facelets.TagHandler;
+import jakarta.el.ELException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.view.facelets.ComponentHandler;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagConfig;
+import jakarta.faces.view.facelets.TagException;
+import jakarta.faces.view.facelets.TagHandler;
public final class DataAttributeHandler extends TagHandler {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java
index d5fe7d3..7f21e47 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.facelets;
-import javax.faces.FacesException;
-import javax.faces.context.FacesContext;
-import javax.faces.view.facelets.ResourceResolver;
+import jakarta.faces.FacesException;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.facelets.ResourceResolver;
import java.io.IOException;
import java.net.URL;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java
index 4655b34..d2bc82c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/EventHandler.java
@@ -24,21 +24,21 @@ import org.apache.myfaces.tobago.component.ClientBehaviors;
import org.apache.myfaces.tobago.internal.behavior.EventBehavior;
import org.apache.myfaces.tobago.internal.component.AbstractUIEvent;
-import javax.el.MethodExpression;
-import javax.faces.component.PartialStateHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.faces.event.AjaxBehaviorListener;
-import javax.faces.view.BehaviorHolderAttachedObjectHandler;
-import javax.faces.view.facelets.ComponentConfig;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagAttributeException;
-import javax.faces.view.facelets.TagException;
+import jakarta.el.MethodExpression;
+import jakarta.faces.component.PartialStateHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.event.AjaxBehaviorListener;
+import jakarta.faces.view.BehaviorHolderAttachedObjectHandler;
+import jakarta.faces.view.facelets.ComponentConfig;
+import jakarta.faces.view.facelets.ComponentHandler;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagAttributeException;
+import jakarta.faces.view.facelets.TagException;
import java.io.IOException;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
index 3319f5e..5a0861c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
@@ -22,13 +22,13 @@ package org.apache.myfaces.tobago.facelets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
index 8c3a807..e27057a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
@@ -21,11 +21,11 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.component.Attributes;
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagConfig;
-import javax.faces.view.facelets.TagHandler;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagConfig;
+import jakarta.faces.view.facelets.TagHandler;
import java.io.IOException;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
index 1de5b58..09f3ca4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
@@ -25,15 +25,15 @@ import org.apache.myfaces.tobago.event.ResetInputActionListener;
import org.apache.myfaces.tobago.event.ValueExpressionResetInputActionListener;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.el.ValueExpression;
-import javax.faces.component.ActionSource;
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagConfig;
-import javax.faces.view.facelets.TagException;
-import javax.faces.view.facelets.TagHandler;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.ActionSource;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.view.facelets.ComponentHandler;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagConfig;
+import jakarta.faces.view.facelets.TagException;
+import jakarta.faces.view.facelets.TagHandler;
import java.io.IOException;
public class ResetInputActionListenerHandler extends TagHandler {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
index 34f19be..1e76f45 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
@@ -22,9 +22,9 @@ package org.apache.myfaces.tobago.facelets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletContext;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -45,11 +45,11 @@ public final class Resource {
}
/**
- * Get an URL of an internal resource. First, {@link javax.faces.context.ExternalContext#getResource(String)} is
+ * Get an URL of an internal resource. First, {@link jakarta.faces.context.ExternalContext#getResource(String)} is
* checked for an non-null URL return value. In the case of a null return value (as it is the case for Weblogic 8.1
* for a packed war), a URL with a special URL handler is constructed, which can be used for <em>opening</em> a
* serlvet resource later. Internally, this special URL handler will call
- * {@link javax.servlet.ServletContext#getResourceAsStream(String)} when an inputstream is requested.
+ * {@link jakarta.servlet.ServletContext#getResourceAsStream(String)} when an inputstream is requested.
* This works even on Weblogic 8.1
*
* @param ctx the faces context from which to retrieve the resource
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
index bd8b45f..066def2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
@@ -21,11 +21,11 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.component.Attributes;
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagConfig;
-import javax.faces.view.facelets.TagHandler;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagConfig;
+import jakarta.faces.view.facelets.TagHandler;
import java.io.IOException;
public class SegmentLayoutConstraintHandler extends TagHandler {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
index 2c0c6fa..da23cd9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
@@ -21,12 +21,12 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.event.SheetStateChangeSource;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.MetaRule;
+import jakarta.faces.view.facelets.Metadata;
+import jakarta.faces.view.facelets.MetadataTarget;
+import jakarta.faces.view.facelets.TagAttribute;
public class SheetStateChangeSourceRule extends MetaRule {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
index 45f89b3..7122d70 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
@@ -21,12 +21,12 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.event.SortActionSource;
-import javax.faces.event.ActionEvent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.MetaRule;
+import jakarta.faces.view.facelets.Metadata;
+import jakarta.faces.view.facelets.MetadataTarget;
+import jakarta.faces.view.facelets.TagAttribute;
public class SortActionSourceRule extends MetaRule {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
index aa1781e..d470f12 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
@@ -23,13 +23,13 @@ import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.context.Markup;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.MetaRule;
+import jakarta.faces.view.facelets.Metadata;
+import jakarta.faces.view.facelets.MetadataTarget;
+import jakarta.faces.view.facelets.TagAttribute;
public class SupportsMarkupRule extends MetaRule {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
index 2f5d566..9f76a6a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
@@ -23,14 +23,14 @@ import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.event.TabChangeSource;
import org.apache.myfaces.tobago.event.ValueExpressionTabChangeListener;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagAttributeException;
-import javax.faces.view.facelets.TagConfig;
-import javax.faces.view.facelets.TagException;
-import javax.faces.view.facelets.TagHandler;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.TagAttributeException;
+import jakarta.faces.view.facelets.TagConfig;
+import jakarta.faces.view.facelets.TagException;
+import jakarta.faces.view.facelets.TagHandler;
import java.io.IOException;
public class TabChangeListenerHandler extends TagHandler {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
index fa1c86c..512c095 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
@@ -22,11 +22,11 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.event.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeSource;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.MetaRule;
+import jakarta.faces.view.facelets.Metadata;
+import jakarta.faces.view.facelets.MetadataTarget;
+import jakarta.faces.view.facelets.TagAttribute;
public class TabChangeSourceRule extends MetaRule {
static final Class[] ACTION_LISTENER = new Class[]{TabChangeEvent.class};
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java
index ea47861..125b7ea 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java
@@ -19,14 +19,14 @@
package org.apache.myfaces.tobago.facelets;
-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 javax.faces.FacesWrapper;
-import javax.faces.view.facelets.TagAttribute;
+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;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
index a180188..608e23e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
@@ -25,14 +25,14 @@ import org.apache.myfaces.tobago.event.SheetStateChangeSource;
import org.apache.myfaces.tobago.event.SortActionSource;
import org.apache.myfaces.tobago.event.TabChangeSource;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.view.facelets.ComponentConfig;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRuleset;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.Validator;
+import jakarta.faces.view.facelets.ComponentConfig;
+import jakarta.faces.view.facelets.ComponentHandler;
+import jakarta.faces.view.facelets.FaceletContext;
+import jakarta.faces.view.facelets.MetaRuleset;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java
index e429465..aa4448d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoValidateHandler.java
@@ -21,9 +21,9 @@ package org.apache.myfaces.tobago.facelets;
import org.apache.myfaces.tobago.validator.FileItemValidator;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.ValidatorConfig;
-import javax.faces.view.facelets.ValidatorHandler;
+import jakarta.faces.view.facelets.MetaRuleset;
+import jakarta.faces.view.facelets.ValidatorConfig;
+import jakarta.faces.view.facelets.ValidatorHandler;
public class TobagoValidateHandler extends ValidatorHandler {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
index a019f89..ce21587 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
@@ -21,11 +21,11 @@ package org.apache.myfaces.tobago.internal.behavior;
import org.apache.myfaces.tobago.exception.TobagoException;
-import javax.el.ValueExpression;
-import javax.faces.component.StateHelper;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponentBase;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.StateHelper;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.context.FacesContext;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java
index 98079b6..bd0dd8b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/EventBehavior.java
@@ -19,13 +19,13 @@
package org.apache.myfaces.tobago.internal.behavior;
-import javax.el.ValueExpression;
-import javax.faces.component.StateHelper;
-import javax.faces.component.behavior.ClientBehaviorBase;
-import javax.faces.component.behavior.ClientBehaviorHint;
-import javax.faces.component.behavior.FacesBehavior;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AjaxBehaviorListener;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.StateHelper;
+import jakarta.faces.component.behavior.ClientBehaviorBase;
+import jakarta.faces.component.behavior.ClientBehaviorHint;
+import jakarta.faces.component.behavior.FacesBehavior;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AjaxBehaviorListener;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBadge.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBadge.java
index ad447a7..127fdcb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBadge.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIBadge.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
public abstract class AbstractUIBadge extends UIOutput implements Visual {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
index 5a2d7ff..4951bf6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
@@ -23,9 +23,9 @@ import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.model.CollapseMode;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
/**
* Base class for collapsible panels.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java
index 9f619a3..396bbe9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIColumnBase.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIColumn;
+import jakarta.faces.component.UIColumn;
public abstract class AbstractUIColumnBase extends UIColumn implements Visual {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
index a3b4dd6..f5e02f3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
@@ -25,11 +25,11 @@ import org.apache.myfaces.tobago.component.SupportsAutoSpacing;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.component.UICommand;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UICommand;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
/**
* Base class for commands.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
index 9acc787..3234f8f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommandBase.java
@@ -26,16 +26,16 @@ import org.apache.myfaces.tobago.internal.config.SecurityAnnotation;
import org.apache.myfaces.tobago.internal.util.AuthorizationHelper;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.el.MethodExpression;
-import javax.faces.component.UICommand;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ComponentSystemEventListener;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PostAddToViewEvent;
+import jakarta.el.MethodExpression;
+import jakarta.faces.component.UICommand;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ComponentSystemEventListener;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PostAddToViewEvent;
import java.util.Iterator;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
index abd16f5..cd5cc5d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIData.java
@@ -29,13 +29,13 @@ import org.apache.myfaces.tobago.model.TreePath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.FacesException;
-import javax.faces.component.ContextCallback;
-import javax.faces.component.UIComponent;
-import javax.faces.component.visit.VisitCallback;
-import javax.faces.component.visit.VisitContext;
-import javax.faces.context.FacesContext;
-import javax.faces.model.DataModel;
+import jakarta.faces.FacesException;
+import jakarta.faces.component.ContextCallback;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.visit.VisitCallback;
+import jakarta.faces.component.visit.VisitContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.DataModel;
import javax.swing.tree.TreeNode;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
@@ -44,7 +44,7 @@ import java.util.List;
/**
* Base class for sheet and tree.
*/
-public abstract class AbstractUIData extends javax.faces.component.UIData implements Visual {
+public abstract class AbstractUIData extends jakarta.faces.component.UIData implements Visual {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -117,7 +117,7 @@ public abstract class AbstractUIData extends javax.faces.component.UIData implem
* (Currently Tobago supports {@link TreeNode} out of the box.
*
* @param value The reference to the data model
- * (comes from the value attribute of the {@link javax.faces.component.UIData})
+ * (comes from the value attribute of the {@link jakarta.faces.component.UIData})
* @param showRoot comes from the showRoot attribute.
*/
protected void createTreeDataModel(final Object value, final boolean showRoot) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java
index e8ad2bb..6582d85 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIEvent.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.ClientBehaviors;
-import javax.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.EventTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java
index 33d1f99..b8cccc9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java
@@ -27,11 +27,11 @@ import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.MessageUtils;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIInput;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.Part;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.Part;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.FileTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
index d8469c9..ae0c781 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFlexLayout.java
@@ -28,11 +28,11 @@ import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.layout.MeasureList;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.FlexLayoutTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
index d6b12cd..1b577e9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFormBase.java
@@ -25,9 +25,9 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIForm;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIForm;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.util.Iterator;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
index 17f7145..46d08f6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
@@ -31,14 +31,14 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIPanel;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ComponentSystemEventListener;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PreRenderComponentEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIPanel;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ComponentSystemEventListener;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PreRenderComponentEvent;
import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIHidden.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIHidden.java
index 5dcff08..bf9c5af 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIHidden.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIHidden.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.HiddenTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
index 1c63959..16cd35b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIImage.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIGraphic;
+import jakarta.faces.component.UIGraphic;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.ImageTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java
index 38ef4b1..8c88cd6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java
@@ -27,13 +27,13 @@ import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
/**
* Base class for some inputs.
*/
-public abstract class AbstractUIInput extends javax.faces.component.UIInput
+public abstract class AbstractUIInput extends jakarta.faces.component.UIInput
implements SupportsAccessKey, SupportsAutoSpacing, SupportsLabelLayout, Visual, ClientBehaviorHolder,
SupportFieldId, SupportsHelp {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java
index 1c743d3..79de804 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabel.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportsAccessKey;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.LabelTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabelBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabelBase.java
index 5d98d32..eb5853f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabelBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILabelBase.java
@@ -21,14 +21,14 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.LabelTagDeclaration}
*/
public abstract class AbstractUILabelBase
- extends javax.faces.component.UIOutput implements Visual {
+ extends jakarta.faces.component.UIOutput implements Visual {
public String getLabel() {
final Converter converter = getConverter();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
index 8b2b10d..ef9f72a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUILayoutBase.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIComponentBase;
+import jakarta.faces.component.UIComponentBase;
/**
* Base class for the layout manager components.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
index 3ce7a35..ec8e946 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMessages.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.layout.OrderBy;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -32,7 +32,7 @@ import java.util.List;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.MessagesTagDeclaration}
*/
-public abstract class AbstractUIMessages extends javax.faces.component.UIMessages
+public abstract class AbstractUIMessages extends jakarta.faces.component.UIMessages
implements Visual {
public List<Item> createMessageList(final FacesContext facesContext) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMeta.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMeta.java
index aa8a9ab..4698e3e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMeta.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMeta.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.util.FacesVersion;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
-import javax.faces.event.PreRenderViewEvent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
+import jakarta.faces.event.PreRenderViewEvent;
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public abstract class AbstractUIMeta extends UIComponentBase {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMetaLink.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMetaLink.java
index 8826feb..0dc16c1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMetaLink.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIMetaLink.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.util.FacesVersion;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
-import javax.faces.event.PreRenderViewEvent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
+import jakarta.faces.event.PreRenderViewEvent;
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
public abstract class AbstractUIMetaLink extends UIComponentBase {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIObject.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIObject.java
index ddb2203..038aae7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIObject.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIObject.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.ObjectTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOperation.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOperation.java
index 49704cc..acf5d7e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOperation.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOperation.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.apt.annotation.Preliminary;
-import javax.faces.component.UIComponentBase;
+import jakarta.faces.component.UIComponentBase;
/**
* <p>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOut.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOut.java
index 49bcdec..619c508 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOut.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIOut.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.sanitizer.SanitizeMode;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.OutTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
index e2a0c29..1e16c8f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPage.java
@@ -24,10 +24,10 @@ import org.apache.myfaces.tobago.util.DebugUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
index 0d5c1f7..bd111cf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanel.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.PanelTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java
index bef392f..f4614a3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPanelBase.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.component.Visual;
/**
* Base class for panels.
*/
-public abstract class AbstractUIPanelBase extends javax.faces.component.UIPanel implements Visual {
+public abstract class AbstractUIPanelBase extends jakarta.faces.component.UIPanel implements Visual {
public abstract java.lang.String getTip();
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
index 5045062..de9c140 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIPopup.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.NamingContainer;
+import jakarta.faces.component.NamingContainer;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.PopupTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
index 5db376d..def6aad 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIProgress.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIOutput;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ComponentSystemEventListener;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PreRenderComponentEvent;
+import jakarta.faces.component.UIOutput;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ComponentSystemEventListener;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PreRenderComponentEvent;
import javax.swing.BoundedRangeModel;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIReload.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIReload.java
index 00fd2e0..e9536c2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIReload.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIReload.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.UIComponentBase;
+import jakarta.faces.component.UIComponentBase;
public abstract class AbstractUIReload extends UIComponentBase {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java
index 80b946c..5156f36 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIRow.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.RowTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
index 3c83e18..4b988e1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIScript.java
@@ -21,13 +21,13 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.util.FacesVersion;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
-import javax.faces.event.PreRenderViewEvent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
+import jakarta.faces.event.PreRenderViewEvent;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.ScriptTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
index 1b5fca2..30dc3b8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISection.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportsAutoSpacing;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBoolean.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBoolean.java
index 6376fdf..32e66da 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBoolean.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBoolean.java
@@ -29,10 +29,10 @@ import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.MessageUtils;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UISelectBoolean;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UISelectBoolean;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
public abstract class AbstractUISelectBoolean extends UISelectBoolean
implements SupportsAutoSpacing, Visual, ClientBehaviorHolder, SupportFieldId, SupportsAccessKey,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
index 6795c48..8f64250 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.java
@@ -24,9 +24,9 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UISelectItem;
-import javax.faces.component.UISelectMany;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UISelectItem;
+import jakarta.faces.component.UISelectMany;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItems.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItems.java
index b423614..45f58bc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItems.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectItems.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.UISelectItems;
+import jakarta.faces.component.UISelectItems;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SelectItemsTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyBase.java
index 20888a6..fce64d5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyBase.java
@@ -24,9 +24,9 @@ import org.apache.myfaces.tobago.component.SupportsHelp;
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UISelectMany;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UISelectMany;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
import java.util.Collection;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java
index 9422add..9e75a44 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyListbox.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SelectManyListboxTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
index 2339efe..13f75d9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
@@ -25,14 +25,14 @@ import org.apache.myfaces.tobago.component.SupportsLabelLayout;
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.MessageUtils;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
/**
* Base class for select one.
*/
-public abstract class AbstractUISelectOneBase extends javax.faces.component.UISelectOne
+public abstract class AbstractUISelectOneBase extends jakarta.faces.component.UISelectOne
implements SupportsAutoSpacing, Visual, SupportsLabelLayout, ClientBehaviorHolder, SupportsHelp {
public static final String MESSAGE_VALUE_REQUIRED = "org.apache.myfaces.tobago.UISelectOne.REQUIRED";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java
index 9bf3255..e5c5e28 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneChoice.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SelectOneChoiceTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java
index 4a247d9..d1f4293 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneListbox.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SelectOneListboxTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java
index 43f97f4..a1e5fb9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectReference.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
public abstract class AbstractUISelectReference extends UIOutput {
public abstract String getFor();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISeparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISeparator.java
index 0daf3f4..0b52362 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISeparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISeparator.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIComponentBase;
+import jakarta.faces.component.UIComponentBase;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.SeparatorTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
index 537e704..d4693ef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
@@ -41,21 +41,21 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
-import javax.faces.component.UIColumn;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ComponentSystemEventListener;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PreRenderComponentEvent;
+import jakarta.el.ELContext;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIColumn;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ComponentSystemEventListener;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PreRenderComponentEvent;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
index e50172d..351a14c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISplitLayout.java
@@ -23,8 +23,8 @@ import org.apache.myfaces.tobago.apt.annotation.Preliminary;
import org.apache.myfaces.tobago.layout.AlignItems;
import org.apache.myfaces.tobago.layout.JustifyContent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
/**
* <p>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java
index ac34eab..e3edc64 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStars.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.internal.component;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PreRenderComponentEvent;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PreRenderComponentEvent;
import javax.swing.BoundedRangeModel;
@ListenerFor(systemEventClass = PreRenderComponentEvent.class)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
index 36b2e99..f2643fb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIStyle.java
@@ -33,15 +33,15 @@ import org.apache.myfaces.tobago.util.FacesVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
-import javax.faces.event.PreRenderViewEvent;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
+import jakarta.faces.event.PreRenderViewEvent;
import java.lang.invoke.MethodHandles;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
index 969e7c4..f3cf4ee 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISuggest.java
@@ -23,10 +23,10 @@ import org.apache.myfaces.tobago.model.SuggestFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITab.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITab.java
index 96e2f27..a88f2f3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITab.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITab.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.SupportsAccessKey;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.component.NamingContainer;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.TabTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
index c322ba6..455a4cc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
@@ -30,15 +30,15 @@ import org.apache.myfaces.tobago.util.FacesELUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionListener;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.PhaseId;
+import jakarta.el.MethodExpression;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionListener;
+import jakarta.faces.event.FacesEvent;
+import jakarta.faces.event.PhaseId;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
index 26e544b..a2c739e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
@@ -26,12 +26,12 @@ import org.apache.myfaces.tobago.model.ScrollPosition;
import org.apache.myfaces.tobago.model.SelectedState;
import org.apache.myfaces.tobago.model.TreeState;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
-import javax.faces.context.FacesContext;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.NamingContainer;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.context.FacesContext;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.TreeTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIndent.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIndent.java
index 0836fba..c235933 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIndent.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeIndent.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Visual;
-import javax.faces.component.UIGraphic;
+import jakarta.faces.component.UIGraphic;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.TreeIndentTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNodeBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNodeBase.java
index 6a17927..949cedf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNodeBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNodeBase.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.model.TreeDataModel;
import org.apache.myfaces.tobago.model.TreePath;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.component.UIData;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIData;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
index 607e9db..99e419e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.Visual;
-import javax.el.ValueExpression;
-import javax.faces.component.UISelectBoolean;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UISelectBoolean;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
/**
* {@link org.apache.myfaces.tobago.internal.taglib.component.TreeSelectTagDeclaration}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigLoader.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigLoader.java
index 7291fa2..2392003 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigLoader.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigLoader.java
@@ -24,8 +24,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
index fda2aeb..321a547 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/DateTimeI18n.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.util.ResourceUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.Calendar;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
index 60e4d0a..2211ee3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/Nonce.java
@@ -23,8 +23,8 @@ import org.apache.myfaces.tobago.internal.util.RandomUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
index c027a74..6fb8fb5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/Cell.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.layout;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
/**
* To support horizontal and vertical spans, at each position will be a cell as a representative.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/OriginCell.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/OriginCell.java
index f49f4ed..c863d75 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/OriginCell.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/OriginCell.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.layout;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
/**
* @deprecated since 4.0.0
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/SpanCell.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/SpanCell.java
index 1a44257..f3646d4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/SpanCell.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/layout/SpanCell.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.layout;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
/**
* @deprecated since 4.0.0
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/CommandMap.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/CommandMap.java
index b2816f0..de4bcd0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/CommandMap.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/CommandMap.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.internal.renderkit;
import org.apache.myfaces.tobago.component.ClientBehaviors;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
index 3520235..182bcc5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BadgeRenderer.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class BadgeRenderer<T extends AbstractUIBadge> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
index efb36a8..dede3d8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BarRenderer.java
@@ -34,8 +34,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class BarRenderer<T extends AbstractUIBar> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
index af540d3..78bb6f1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
@@ -31,8 +31,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class BoxRenderer<T extends AbstractUIBox> extends CollapsiblePanelRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonRenderer.java
index de2eee2..4d8f40a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonRenderer.java
@@ -29,8 +29,8 @@ import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class ButtonRenderer<T extends AbstractUIButton> extends CommandRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
index 82ddca0..8939a8d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class ButtonsRenderer<T extends AbstractUIButtons> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CollapsiblePanelRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CollapsiblePanelRendererBase.java
index ae3aae8..12689c1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CollapsiblePanelRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CollapsiblePanelRendererBase.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ColumnRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ColumnRenderer.java
index cfd7a18..8de8240 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ColumnRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ColumnRenderer.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.internal.component.AbstractUILink;
import org.apache.myfaces.tobago.internal.component.AbstractUIOut;
import org.apache.myfaces.tobago.renderkit.RendererBase;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
public class ColumnRenderer extends RendererBase {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
index e079ff3..e536395 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
@@ -48,9 +48,9 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIParameter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIParameter;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
index c174d2a..6f11469 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRenderer.java
@@ -39,10 +39,10 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.DateTimeConverter;
+import jakarta.el.ValueExpression;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.DateTimeConverter;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.time.LocalDate;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java
index 0d6ea63..7013ec4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingCommandRendererBase.java
@@ -24,9 +24,9 @@ import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
import java.lang.invoke.MethodHandles;
// XXX we need T extends AbstractUICommandBase OR AbstractUIRow
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
index f361c5d..83ee6b3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DecodingInputRendererBase.java
@@ -26,9 +26,9 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
index 27df077..5395a9b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
@@ -29,8 +29,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class FigureRenderer<T extends AbstractUIFigure> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
index e476873..ccc3dfb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
@@ -35,14 +35,14 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ComponentSystemEventListener;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
-import javax.faces.validator.Validator;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ComponentSystemEventListener;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
+import jakarta.faces.validator.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlexLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlexLayoutRenderer.java
index 3fefd34..744885e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlexLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlexLayoutRenderer.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class FlexLayoutRenderer<T extends AbstractUIFlexLayout> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java
index 3f7208e..8fb90ec 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class FlowLayoutRenderer<T extends AbstractUIFlowLayout> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
index 450c310..f77f2dd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class FooterRenderer<T extends AbstractUIFooter> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java
index e583a8d..dd66a66 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FormRenderer.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class FormRenderer<T extends AbstractUIForm> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java
index d97e32b..f411db1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class GridLayoutRenderer<T extends AbstractUIGridLayout> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
index 62a34f6..fccfcbb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class HeaderRenderer<T extends AbstractUIHeader> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
index 5c38117..53ecbb9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HiddenRenderer.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class HiddenRenderer<T extends AbstractUIHidden> extends DecodingInputRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
index c9b16aa..ab775ab 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class ImageRenderer<T extends AbstractUIImage> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
index c7636bc..f544c74 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
@@ -40,11 +40,11 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.LengthValidator;
-import javax.faces.validator.RegexValidator;
-import javax.faces.validator.Validator;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.LengthValidator;
+import jakarta.faces.validator.RegexValidator;
+import jakarta.faces.validator.Validator;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
index 9e8e20a..55f3372 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
@@ -38,8 +38,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java
index 54f4731..8a4081d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelRenderer.java
@@ -33,13 +33,13 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ComponentSystemEventListener;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ComponentSystemEventListener;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
import java.io.IOException;
@ListenerFor(systemEventClass = PostAddToViewEvent.class)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRenderer.java
index 3bc9903..61f02b8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkRenderer.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.renderkit.css.CssItem;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
public class LinkRenderer<T extends AbstractUILink> extends CommandRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
index 1e0344a..f7c24a3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinksRenderer.java
@@ -27,8 +27,8 @@ import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class LinksRenderer<T extends AbstractUILinks> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
index 5808451..936297c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
@@ -36,9 +36,9 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.ResourceUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
index dd376c4..0eb88e4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
@@ -37,8 +37,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaLinkRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaLinkRenderer.java
index 92e8800..e39aec0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaLinkRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaLinkRenderer.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class MetaLinkRenderer<T extends AbstractUIMetaLink> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaRenderer.java
index e8cd6c0..1b90672 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MetaRenderer.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class MetaRenderer<T extends AbstractUIMeta> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
index 6ac53b9..83bc6c3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ResourceUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class ObjectRenderer<T extends AbstractUIObject> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
index 371058e..4b5dc65 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.sanitizer.SanitizeMode;
import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.util.StringTokenizer;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
index 052b7ef..2e730a5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
@@ -53,16 +53,16 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.application.Application;
-import javax.faces.application.ProjectStage;
-import javax.faces.application.ViewHandler;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIOutput;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.ProjectStage;
+import jakarta.faces.application.ViewHandler;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIOutput;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java
index 662b932..82fc48a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class PanelRenderer<T extends AbstractUIPanel> extends CollapsiblePanelRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
index 96c93d8..d0eac06 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
@@ -32,8 +32,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class PopupRenderer<T extends AbstractUIPopup> extends CollapsiblePanelRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
index 3899d4a..324197e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
@@ -35,7 +35,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class ProgressRenderer<T extends AbstractUIProgress> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java
index c09ae74..e678872 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RangeRenderer.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class RangeRenderer<T extends AbstractUIRange> extends MessageLayoutRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ReloadRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ReloadRenderer.java
index 9678f3a..66f5a7e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ReloadRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ReloadRenderer.java
@@ -28,8 +28,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
-import javax.faces.context.PartialViewContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.PartialViewContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java
index 36ecc3a..678d54b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/RowRenderer.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.internal.renderkit.renderer;
import org.apache.myfaces.tobago.internal.component.AbstractUIEvent;
import org.apache.myfaces.tobago.internal.component.AbstractUIRow;
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.event.ActionEvent;
public class RowRenderer<T extends AbstractUIRow> extends DecodingCommandRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java
index 6860b34..027643f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ScriptRenderer.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class ScriptRenderer<T extends AbstractUIScript> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
index de8a90b..7da6ad9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
@@ -30,8 +30,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class SectionRenderer<T extends AbstractUISection> extends CollapsiblePanelRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
index 8d19e5c..825fdb8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
@@ -32,8 +32,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
index af13ccf..34abdea 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.CssItem;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
public class SelectBooleanCheckboxRenderer<T extends AbstractUISelectBooleanCheckbox>
extends SelectBooleanRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
index 6b0a20a..ae08fd9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanRendererBase.java
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRenderer.java
index c3b5372..6a94ec7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanToggleRenderer.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.css.CssItem;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
public class SelectBooleanToggleRenderer<T extends AbstractUISelectBooleanCheckbox>
extends SelectBooleanRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
index 6f031a8..a106a65 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
@@ -33,8 +33,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
public class SelectManyCheckboxRenderer<T extends AbstractUISelectManyCheckbox> extends SelectManyRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
index 8968a90..41a3dc2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
@@ -30,8 +30,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
index cfe68f9..e85e0e7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
@@ -24,20 +24,20 @@ import org.apache.myfaces.tobago.internal.util.ArrayUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.FacesException;
-import javax.faces.application.ProjectStage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UISelectItem;
-import javax.faces.component.UISelectItems;
-import javax.faces.component.UISelectMany;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.model.SelectItem;
-import javax.faces.model.SelectItemGroup;
+import jakarta.el.ValueExpression;
+import jakarta.faces.FacesException;
+import jakarta.faces.application.ProjectStage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.UISelectItem;
+import jakarta.faces.component.UISelectItems;
+import jakarta.faces.component.UISelectMany;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.model.SelectItem;
+import jakarta.faces.model.SelectItemGroup;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
index 73f2820..8a92fb18 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
@@ -32,9 +32,9 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
index 81c4faa..df09aaf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
@@ -30,8 +30,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
public class SelectOneChoiceRenderer<T extends AbstractUISelectOneChoice> extends SelectOneRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
index 244f841..a62bad5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
@@ -30,8 +30,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
index 9bacbdc..d676e57 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
@@ -38,8 +38,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java
index 229075a..194ef89 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRendererBase.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.internal.component.AbstractUISelectOneBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
public abstract class SelectOneRendererBase<T extends AbstractUISelectOneBase> extends MessageLayoutRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java
index fbd146a..1ad4dfd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectReferenceRenderer.java
@@ -23,8 +23,8 @@ import org.apache.myfaces.tobago.component.RenderRange;
import org.apache.myfaces.tobago.internal.component.AbstractUISelectReference;
import org.apache.myfaces.tobago.renderkit.RendererBase;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class SelectReferenceRenderer<T extends AbstractUISelectReference> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java
index 12a383a..bade4b3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java
@@ -29,8 +29,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class SeparatorRenderer<T extends AbstractUISeparator> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
index 1ff3dc5..6caef48 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
@@ -70,17 +70,17 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.application.Application;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIColumn;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
-import javax.faces.component.UINamingContainer;
-import javax.faces.component.behavior.AjaxBehavior;
-import javax.faces.component.behavior.ClientBehavior;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.application.Application;
+import jakarta.faces.component.NamingContainer;
+import jakarta.faces.component.UIColumn;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIData;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.component.behavior.ClientBehavior;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.text.MessageFormat;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
index b26d8f4..0c58990 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SplitLayoutRenderer.java
@@ -35,7 +35,7 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java
index 115e690..0d0962e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StarsRenderer.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class StarsRenderer<T extends AbstractUIStars> extends MessageLayoutRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
index 144f888..25d2fc1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/StyleRenderer.java
@@ -35,7 +35,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class StyleRenderer<T extends AbstractUIStyle> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java
index 261c541..aad1b8c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SubviewRenderer.java
@@ -23,9 +23,9 @@ import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.NamingContainer;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
index 649fe95..9cb1bec 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SuggestRenderer.java
@@ -35,8 +35,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
index 150f89f..5c8f98d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
@@ -49,16 +49,16 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
-import javax.faces.component.behavior.AjaxBehavior;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ComponentSystemEvent;
-import javax.faces.event.ComponentSystemEventListener;
-import javax.faces.event.ListenerFor;
-import javax.faces.event.PostAddToViewEvent;
+import jakarta.el.ValueExpression;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.event.ComponentSystemEventListener;
+import jakarta.faces.event.ListenerFor;
+import jakarta.faces.event.PostAddToViewEvent;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
index 5bc458e..8a4fb49 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
@@ -34,11 +34,11 @@ import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.LengthValidator;
-import javax.faces.validator.RegexValidator;
-import javax.faces.validator.Validator;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.LengthValidator;
+import jakarta.faces.validator.RegexValidator;
+import jakarta.faces.validator.Validator;
import java.io.IOException;
public class TextareaRenderer<T extends AbstractUITextarea> extends MessageLayoutRendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
index f6bb460..3576ffb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
@@ -34,22 +34,22 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.ActionSource;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.behavior.AjaxBehavior;
-import javax.faces.component.behavior.ClientBehavior;
-import javax.faces.component.behavior.ClientBehaviorContext;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.faces.event.PhaseId;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.ActionSource;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.component.behavior.ClientBehavior;
+import jakarta.faces.component.behavior.ClientBehaviorContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.event.PhaseId;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-public class TobagoClientBehaviorRenderer extends javax.faces.render.ClientBehaviorRenderer {
+public class TobagoClientBehaviorRenderer extends jakarta.faces.render.ClientBehaviorRenderer {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
index d463aff..7819a4a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class TreeIconRenderer<T extends AbstractUITreeIcon> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
index 9c7880e..4128523 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class TreeIndentRenderer<T extends AbstractUITreeIndent> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
index 6f18c46..a0bae97 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class TreeLabelRenderer<T extends AbstractUITreeLabel> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
index 93140e5..91afc7d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
@@ -41,8 +41,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
index e86e043..b2a26eb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
@@ -40,8 +40,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UINamingContainer;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
index 52a166b..d10c713 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
@@ -43,8 +43,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
index 73e5921..3fb3023 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
@@ -42,8 +42,8 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UINamingContainer;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java
index cd00327..4814b32 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/VerbatimRenderer.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class VerbatimRenderer<T extends UIComponent> extends RendererBase<T> {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
index 21a39de..83911ad 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* <p>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BadgeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BadgeTagDeclaration.java
index 9b91c16..09a2179 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BadgeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BadgeTagDeclaration.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* Renders a badge element.
@@ -36,10 +36,10 @@ import javax.faces.component.UIOutput;
@Tag(name = "badge")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIBadge",
- uiComponentFacesClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "jakarta.faces.component.UIOutput",
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.BADGE,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
index 2bfa4dd..5fad2a7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BarTagDeclaration.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Defines a container for navigation elements, branding, ...
@@ -41,7 +41,7 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.BAR,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
facets = {
@Facet(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
index e81e657..a2c8852 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasAutoSpacing;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsCollapsed;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Renders a panel with border and title.
@@ -41,12 +41,12 @@ import javax.faces.component.UIPanel;
@Tag(name = "box")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIBox",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.BOX,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
facets = {
@Facet(name = Facets.BAR,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
index 98034dd..804dca4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
@@ -49,7 +49,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsOmit;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsTransition;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UICommand;
+import jakarta.faces.component.UICommand;
/**
* Renders a button element.
@@ -58,7 +58,7 @@ import javax.faces.component.UICommand;
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIButton",
- uiComponentFacesClass = "javax.faces.component.UICommand",
+ uiComponentFacesClass = "jakarta.faces.component.UICommand",
interfaces = {
"org.apache.myfaces.tobago.component.SupportsAccessKey"
},
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonsTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonsTagDeclaration.java
index 6d14aeb..4c8a1b0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonsTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonsTagDeclaration.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasAutoSpacing;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Renders a group of buttons.
@@ -38,12 +38,12 @@ import javax.faces.component.UIPanel;
@Tag(name = "buttons")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIButtons",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.BUTTONS,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
})
public interface ButtonsTagDeclaration
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
index c59acc0..a934680 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIColumn;
+import jakarta.faces.component.UIColumn;
/**
* Creates a tree node inside of a sheet (also known as tree table).
@@ -42,12 +42,12 @@ import javax.faces.component.UIColumn;
@BodyContentDescription(anyTagOf = "<tc:treeIndent>|<tc:treeIcon>|<tc:treeSelect>|<tc:treeLabel>|<tc:link>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumnNode",
- uiComponentFacesClass = "javax.faces.component.UIColumn",
+ uiComponentFacesClass = "jakarta.faces.component.UIColumn",
componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_NODE,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeIndent",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
index 239149f..b0ef9b9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIColumn;
+import jakarta.faces.component.UIColumn;
/**
* Renders a column with checkboxes to mark selected rows.
@@ -34,12 +34,12 @@ import javax.faces.component.UIColumn;
@Tag(name = "columnSelector")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumnSelector",
- uiComponentFacesClass = "javax.faces.component.UIColumn",
+ uiComponentFacesClass = "jakarta.faces.component.UIColumn",
componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.COLUMN_SELECTOR,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE")
public interface ColumnSelectorTagDeclaration
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
index 021dd89..1741b6d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnTagDeclaration.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
import org.apache.myfaces.tobago.layout.TextAlign;
import org.apache.myfaces.tobago.layout.VerticalAlign;
-import javax.faces.component.UIColumn;
+import jakarta.faces.component.UIColumn;
/**
* Renders a UIComponent that represents a single column of data within a
@@ -40,12 +40,12 @@ import javax.faces.component.UIColumn;
@Tag(name = "column")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumn",
- uiComponentFacesClass = "javax.faces.component.UIColumn",
+ uiComponentFacesClass = "jakarta.faces.component.UIColumn",
componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.COLUMN,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
})
public interface ColumnTagDeclaration
extends HasIdBindingAndRendered, HasLabel, HasTip, IsVisual {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConvertDateTimeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConvertDateTimeTagDeclaration.java
index ac3c52f..4330d25 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConvertDateTimeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConvertDateTimeTagDeclaration.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.convert.DateTimeConverter;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasFor;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Register a DateTimeConverter instance on the UIComponent associated with the closest parent UIComponent custom
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
index e434e7b..f6e9838 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Register an Converter instance on the UIComponent
@@ -43,6 +43,6 @@ public interface ConverterTagDeclaration {
/**
* The value binding expression to a converter.
*/
- @TagAttribute(name = "binding", type = "javax.faces.convert.Converter")
+ @TagAttribute(name = "binding", type = "jakarta.faces.convert.Converter")
void setBinding(final ValueExpression binding);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
index 70b8a8e..63fbb1e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Add an data attribute on the UIComponent
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
index 80e3686..8486691 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DateTagDeclaration.java
@@ -50,19 +50,19 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* Renders a date input field.
* <p>
* For a time input field set you'll need to set the <f:convertDateTime type="time"> inside the <tc:date>.
* <p>
- * If there is no converter given, a default instance of {@link javax.faces.convert.DateTimeConverter} will be used.
+ * If there is no converter given, a default instance of {@link jakarta.faces.convert.DateTimeConverter} will be used.
*/
@Tag(name = "date")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIDate",
- uiComponentFacesClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "jakarta.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.DATE,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
index 86ab1c3..93a8e6c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
@@ -39,8 +39,8 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsImmediateCommand;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsOmit;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsTransition;
-import javax.el.ValueExpression;
-import javax.faces.component.UICommand;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UICommand;
/**
* Add an event behavior to the component.
@@ -48,12 +48,12 @@ import javax.faces.component.UICommand;
*/
@Tag(name = "event")
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UIEvent",
- uiComponentFacesClass = "javax.faces.component.UICommand",
+ uiComponentFacesClass = "jakarta.faces.component.UICommand",
componentFamily = UICommand.COMPONENT_FAMILY,
rendererType = RendererTypes.EVENT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
behaviors = {
@Behavior(name = ClientBehaviors.CHANGE),
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java
index a235e54..14f695d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FigureTagDeclaration.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Use figure to show e. g. images or videos inside.
@@ -37,12 +37,12 @@ import javax.faces.component.UIPanel;
@Tag(name = "figure")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIFigure",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.FIGURE,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
facets = {
@Facet(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
index fc95705..4cb1c95 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FileTagDeclaration.java
@@ -47,7 +47,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* <p>
@@ -60,7 +60,7 @@ import javax.faces.component.UIInput;
@Tag(name = "file")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIFile",
- uiComponentFacesClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "jakarta.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.FILE,
allowedChildComponenents = "NONE",
@@ -87,12 +87,12 @@ public interface FileTagDeclaration
/**
* Value binding expression pointing to a
- * {@link javax.servlet.http.Part} property to store the
+ * {@link jakarta.servlet.http.Part} property to store the
* uploaded file.
*/
@TagAttribute()
@UIComponentTagAttribute(
- type = { "javax.servlet.http.Part", "javax.servlet.http.Part[]" },
+ type = { "jakarta.servlet.http.Part", "jakarta.servlet.http.Part[]" },
expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
void setValue(String value);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
index 3cbb669..7cb0da2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
@@ -43,7 +43,7 @@ import org.apache.myfaces.tobago.layout.JustifyContent;
rendererType = RendererTypes.FLEX_LAYOUT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "ALL",
markups = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
index 9e02a6b..a4f2fe6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.layout.TextAlign;
rendererType = RendererTypes.FLOW_LAYOUT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE")
public interface FlowLayoutTagDeclaration
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
index a259653..a1bd819 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FooterTagDeclaration.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsFixed;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Defines a footer of its parent (like page, box, ...)
@@ -40,7 +40,7 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.FOOTER,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "ALL")
public interface FooterTagDeclaration
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
index 3d35566..a349e7b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FormTagDeclaration.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsPlain;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIForm;
+import jakarta.faces.component.UIForm;
/**
* If an action is preformed, everything within the next parent form belongs to the submit-area.
@@ -40,12 +40,12 @@ import javax.faces.component.UIForm;
@Tag(name = "form")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIForm",
- uiComponentFacesClass = "javax.faces.component.UIForm",
+ uiComponentFacesClass = "jakarta.faces.component.UIForm",
componentFamily = UIForm.COMPONENT_FAMILY,
rendererType = RendererTypes.FORM,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "ALL")
public interface FormTagDeclaration extends HasBinding, HasId, IsVisual, IsPlain {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
index 942123a..980f877 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Set grid layout specific contraints to the parent component.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
index 2a36813..71dddfb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
@@ -52,7 +52,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
rendererType = RendererTypes.GRID_LAYOUT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE",
markups = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
index 8604546..6ee7141 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HeaderTagDeclaration.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsFixed;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Defines a header of its parent (like page, box, ...)
@@ -40,7 +40,7 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.HEADER,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "ALL")
public interface HeaderTagDeclaration
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java
index cd080e8..835f560 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/HiddenTagDeclaration.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* Renders a hidden input element.
@@ -39,7 +39,7 @@ import javax.faces.component.UIInput;
@Tag(name = "hidden")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIHidden",
- uiComponentFacesClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "jakarta.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.HIDDEN,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
index 248ac0e..d3b47de 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIGraphic;
+import jakarta.faces.component.UIGraphic;
/**
* Renders an image.
@@ -38,12 +38,12 @@ import javax.faces.component.UIGraphic;
@Tag(name = "image")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIImage",
- uiComponentFacesClass = "javax.faces.component.UIGraphic",
+ uiComponentFacesClass = "jakarta.faces.component.UIGraphic",
componentFamily = UIGraphic.COMPONENT_FAMILY,
rendererType = RendererTypes.IMAGE,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE")
public interface ImageTagDeclaration
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
index 4ea8872..d662dfe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/InTagDeclaration.java
@@ -51,7 +51,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* Renders a text input field.
@@ -60,7 +60,7 @@ import javax.faces.component.UIInput;
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIIn",
- uiComponentFacesClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "jakarta.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.IN,
allowedChildComponenents = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java
index 14d3a5d..40d980d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LabelTagDeclaration.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* Renders a label component.
@@ -38,10 +38,10 @@ import javax.faces.component.UIOutput;
@Tag(name = "label")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILabel",
- uiComponentFacesClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "jakarta.faces.component.UIOutput",
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder",
+ "jakarta.faces.component.behavior.ClientBehaviorHolder",
"org.apache.myfaces.tobago.component.SupportsAccessKey"
},
componentFamily = UIOutput.COMPONENT_FAMILY,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
index 59c7b38..a569217 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
@@ -47,7 +47,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsOmit;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsTransition;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UICommand;
+import jakarta.faces.component.UICommand;
/**
* Renders a link element, i. e. an anchor <a> tag.
@@ -57,7 +57,7 @@ import javax.faces.component.UICommand;
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILink",
- uiComponentFacesClass = "javax.faces.component.UICommand",
+ uiComponentFacesClass = "jakarta.faces.component.UICommand",
interfaces = "org.apache.myfaces.tobago.component.SupportsAccessKey",
componentFamily = UICommand.COMPONENT_FAMILY,
rendererType = RendererTypes.LINK,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java
index 038d7cd..0f44c91 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinksTagDeclaration.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasAutoSpacing;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Defines a navigation element, which contains a menu-like structure
@@ -38,11 +38,11 @@ import javax.faces.component.UIPanel;
@Tag(name = "links")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILinks",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
rendererType = RendererTypes.LINKS)
public interface LinksTagDeclaration extends HasIdBindingAndRendered, IsVisual, HasTip, HasOrientation, HasAutoSpacing {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
index a50795e..e4101ef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
import org.apache.myfaces.tobago.layout.OrderBy;
-import javax.faces.component.UIMessages;
+import jakarta.faces.component.UIMessages;
/**
* Renders error/validation messages.
@@ -37,12 +37,12 @@ import javax.faces.component.UIMessages;
@Tag(name = "messages")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMessages",
- uiComponentFacesClass = "javax.faces.component.UIMessages",
+ uiComponentFacesClass = "jakarta.faces.component.UIMessages",
componentFamily = UIMessages.COMPONENT_FAMILY,
rendererType = RendererTypes.MESSAGES,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE")
@@ -75,8 +75,8 @@ public interface MessagesTagDeclaration
* Sets the mininum severity to be shown. E. g. "warn" shows only "warn", "error" and "fatal".
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.application.FacesMessage$Severity", defaultValue = "info",
- defaultCode = "javax.faces.application.FacesMessage.SEVERITY_INFO")
+ @UIComponentTagAttribute(type = "jakarta.faces.application.FacesMessage$Severity", defaultValue = "info",
+ defaultCode = "jakarta.faces.application.FacesMessage.SEVERITY_INFO")
void setMinSeverity(String minSeverity);
/**
@@ -85,8 +85,8 @@ public interface MessagesTagDeclaration
* higher severity levels.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.application.FacesMessage$Severity", defaultValue = "fatal",
- defaultCode = "javax.faces.application.FacesMessage.SEVERITY_FATAL")
+ @UIComponentTagAttribute(type = "jakarta.faces.application.FacesMessage$Severity", defaultValue = "fatal",
+ defaultCode = "jakarta.faces.application.FacesMessage.SEVERITY_FATAL")
void setMaxSeverity(String maxSeverity);
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaLinkTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaLinkTagDeclaration.java
index 307fed2..a3c6417 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaLinkTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaLinkTagDeclaration.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* This tag renders a link tag in the header of the HTML output.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaTagDeclaration.java
index ffaab98..1c39f00 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MetaTagDeclaration.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* This tag a meta tag in the header of the HTML output.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
index 053734c..0d80430 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* Show external content inside of an application.
@@ -37,12 +37,12 @@ import javax.faces.component.UIOutput;
@Tag(name = "object")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIObject",
- uiComponentFacesClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "jakarta.faces.component.UIOutput",
componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.OBJECT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE",
markups = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
index 99a4583..365df2f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/OutTagDeclaration.java
@@ -36,7 +36,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasAutoSpacing;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsPlain;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* Renders a text
@@ -45,12 +45,12 @@ import javax.faces.component.UIOutput;
@BodyContentDescription(anyTagOf = "f:converter|f:convertNumber|f:convertDateTime|...")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIOut",
- uiComponentFacesClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "jakarta.faces.component.UIOutput",
componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.OUT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
index 931b6d9..aec4a8d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PageTagDeclaration.java
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasId;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIForm;
+import jakarta.faces.component.UIForm;
/**
* <p>
@@ -48,7 +48,7 @@ import javax.faces.component.UIForm;
@Tag(name = "page")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPage",
- uiComponentFacesClass = "javax.faces.component.UIForm",
+ uiComponentFacesClass = "jakarta.faces.component.UIForm",
componentFamily = UIForm.COMPONENT_FAMILY,
rendererType = RendererTypes.PAGE,
behaviors = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
index 1cec531..87e1a01 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsCollapsed;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Intended for use in situations when only one UIComponent child can be
@@ -42,7 +42,7 @@ import javax.faces.component.UIPanel;
@Tag(name = "panel")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPanel",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.PANEL,
facets = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
index d928c5d..e18d8b5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupTagDeclaration.java
@@ -37,11 +37,11 @@ import org.apache.myfaces.tobago.model.CollapseMode;
@Tag(name = "popup")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPopup",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = AbstractUIPopup.COMPONENT_FAMILY,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
rendererType = RendererTypes.POPUP,
markups = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
index 5fe426a..64424dc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ProgressTagDeclaration.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* Renders a progress bar.
@@ -39,7 +39,7 @@ import javax.faces.component.UIOutput;
@Tag(name = "progress")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIProgress",
- uiComponentFacesClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "jakarta.faces.component.UIOutput",
componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.PROGRESS,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java
index 9dddd28..bd9eb90 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RangeTagDeclaration.java
@@ -46,7 +46,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* Renders a input field with type range.
@@ -55,7 +55,7 @@ import javax.faces.component.UIInput;
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIRange",
- uiComponentFacesClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "jakarta.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.RANGE,
behaviors = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
index afb56e1..e1b05a8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
@@ -38,6 +38,6 @@ public interface ResetInputActionListenerTagDeclaration {
* them, all containing EditableValueHolder will be reset.
*/
@TagAttribute(required = false, name = Attributes.EXECUTE, type = "java.lang.String")
- void setExecute(final javax.el.ValueExpression execute);
+ void setExecute(final jakarta.el.ValueExpression execute);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java
index 9d6c72c..d1e7230 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/RowTagDeclaration.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIColumn;
+import jakarta.faces.component.UIColumn;
/**
* This component creates a representative in a UISheet for each row.
@@ -36,7 +36,7 @@ import javax.faces.component.UIColumn;
@Tag(name = "row")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIRow",
- uiComponentFacesClass = "javax.faces.component.UIColumn",
+ uiComponentFacesClass = "jakarta.faces.component.UIColumn",
componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.ROW,
behaviors = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java
index dc7afb0..e01b2f6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java
@@ -41,12 +41,12 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
@Tag(name = "section")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISection",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = "org.apache.myfaces.tobago.Section",
rendererType = RendererTypes.SECTION,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
facets = {
@Facet(name = Facets.LABEL,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
index 473b7ec..cc4b3ff 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.layout.Margin;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Set a offset for the parent UIComponent withing a segment layout.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java
index 7a80710..fadadbb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutTagDeclaration.java
@@ -44,7 +44,7 @@ import org.apache.myfaces.tobago.layout.SegmentJustify;
rendererType = RendererTypes.SEGMENT_LAYOUT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE",
markups = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
index e7df947..a79166f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
@@ -48,7 +48,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectBoolean;
+import jakarta.faces.component.UISelectBoolean;
/**
* Renders a checkbox.
@@ -57,7 +57,7 @@ import javax.faces.component.UISelectBoolean;
@BodyContentDescription(anyTagOf = "<f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCheckbox",
- uiComponentFacesClass = "javax.faces.component.UISelectBoolean",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectBoolean",
componentFamily = UISelectBoolean.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_BOOLEAN_CHECKBOX,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanToggleTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanToggleTagDeclaration.java
index b14cc2c..aef3f28 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanToggleTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanToggleTagDeclaration.java
@@ -48,7 +48,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectBoolean;
+import jakarta.faces.component.UISelectBoolean;
/**
* Renders a checkbox as toggle.
@@ -57,7 +57,7 @@ import javax.faces.component.UISelectBoolean;
@BodyContentDescription(anyTagOf = "<f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanToggle",
- uiComponentFacesClass = "javax.faces.component.UISelectBoolean",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectBoolean",
componentFamily = UISelectBoolean.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_BOOLEAN_TOGGLE,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
index b160aa5..b5ca84c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
@Tag(name = "selectItem")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectItem",
- uiComponentFacesClass = "javax.faces.component.UISelectItem",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectItem",
allowedChildComponenents = "NONE")
public interface SelectItemTagDeclaration extends HasBinding, HasId, IsVisual, HasItemLabel, HasItemImage, HasTip {
@@ -73,7 +73,7 @@ public interface SelectItemTagDeclaration extends HasBinding, HasId, IsVisual, H
*/
@TagAttribute
@UIComponentTagAttribute(
- type = "javax.faces.model.SelectItem",
+ type = "jakarta.faces.model.SelectItem",
expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
void setValue(String value);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
index bfc6922..a0f3a25 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
@@ -38,7 +38,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
@Tag(name = "selectItems")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectItems",
- uiComponentFacesClass = "javax.faces.component.UISelectItems",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectItems",
isComponentAlreadyDefined = false,
allowedChildComponenents = "NONE")
public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLabel, HasItemImage, HasTip {
@@ -49,7 +49,7 @@ public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLab
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {"javax.faces.model.SelectItem[]", "java.lang.Object[]", "java.util.Collection"},
+ type = {"jakarta.faces.model.SelectItem[]", "java.lang.Object[]", "java.util.Collection"},
expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
void setValue(String value);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
index 2c151b8..aa380d1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyCheckboxTagDeclaration.java
@@ -51,7 +51,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectMany;
+import jakarta.faces.component.UISelectMany;
/**
* Render a group of checkboxes.
@@ -60,12 +60,12 @@ import javax.faces.component.UISelectMany;
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectManyCheckbox",
- uiComponentFacesClass = "javax.faces.component.UISelectMany",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectMany",
componentFamily = UISelectMany.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_MANY_CHECKBOX,
allowedChildComponenents = {
- "javax.faces.SelectItem",
- "javax.faces.SelectItems"},
+ "jakarta.faces.SelectItem",
+ "jakarta.faces.SelectItems"},
behaviors = {
@Behavior(
name = ClientBehaviors.CHANGE,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
index 0834d3e..d025e8f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyListboxTagDeclaration.java
@@ -49,7 +49,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectMany;
+import jakarta.faces.component.UISelectMany;
/**
* Render a multi selection option listbox.
@@ -57,10 +57,10 @@ import javax.faces.component.UISelectMany;
@Tag(name = "selectManyListbox")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectManyListbox",
- uiComponentFacesClass = "javax.faces.component.UISelectMany",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectMany",
componentFamily = UISelectMany.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_MANY_LISTBOX,
- allowedChildComponenents = {"javax.faces.SelectItem", "javax.faces.SelectItems"},
+ allowedChildComponenents = {"jakarta.faces.SelectItem", "jakarta.faces.SelectItems"},
behaviors = {
@Behavior(
name = ClientBehaviors.CHANGE,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
index 5687956..a615922 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectManyShuttleTagDeclaration.java
@@ -50,18 +50,18 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectMany;
+import jakarta.faces.component.UISelectMany;
@Tag(name = "selectManyShuttle")
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectManyShuttle",
- uiComponentFacesClass = "javax.faces.component.UISelectMany",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectMany",
componentFamily = UISelectMany.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_MANY_SHUTTLE,
allowedChildComponenents = {
- "javax.faces.SelectItem",
- "javax.faces.SelectItems"},
+ "jakarta.faces.SelectItem",
+ "jakarta.faces.SelectItems"},
behaviors = {
@Behavior(
name = ClientBehaviors.CHANGE,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
index 68235ac..f718e97 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
@@ -48,7 +48,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectOne;
+import jakarta.faces.component.UISelectOne;
/**
* Render a single selection dropdown list.
@@ -57,12 +57,12 @@ import javax.faces.component.UISelectOne;
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOneChoice",
- uiComponentFacesClass = "javax.faces.component.UISelectOne",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectOne",
componentFamily = UISelectOne.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_ONE_CHOICE,
allowedChildComponenents = {
- "javax.faces.SelectItem",
- "javax.faces.SelectItems"
+ "jakarta.faces.SelectItem",
+ "jakarta.faces.SelectItems"
},
behaviors = {
@Behavior(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
index a8cc13f..e8f0d52 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneListboxTagDeclaration.java
@@ -50,7 +50,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectOne;
+import jakarta.faces.component.UISelectOne;
/**
* Render a single selection option listbox.
@@ -59,12 +59,12 @@ import javax.faces.component.UISelectOne;
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOneListbox",
- uiComponentFacesClass = "javax.faces.component.UISelectOne",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectOne",
componentFamily = UISelectOne.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_ONE_LISTBOX,
allowedChildComponenents = {
- "javax.faces.SelectItem",
- "javax.faces.SelectItems"
+ "jakarta.faces.SelectItem",
+ "jakarta.faces.SelectItems"
},
behaviors = {
@Behavior(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
index 162615b..2bc1e02 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneRadioTagDeclaration.java
@@ -51,7 +51,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectOne;
+import jakarta.faces.component.UISelectOne;
/**
* Render a set of radio buttons.
@@ -60,12 +60,12 @@ import javax.faces.component.UISelectOne;
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOneRadio",
- uiComponentFacesClass = "javax.faces.component.UISelectOne",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectOne",
componentFamily = UISelectOne.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_ONE_RADIO,
allowedChildComponenents = {
- "javax.faces.SelectItem",
- "javax.faces.SelectItems"
+ "jakarta.faces.SelectItem",
+ "jakarta.faces.SelectItems"
},
behaviors = {
@Behavior(
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
index dc889b8..c83c74e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* Renders a set of option related to and same type as the <strong>for</strong>
@@ -35,7 +35,7 @@ import javax.faces.component.UIOutput;
@Tag(name = "selectReference")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectReference",
- uiComponentFacesClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "jakarta.faces.component.UIOutput",
componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.SELECT_REFERENCE,
allowedChildComponenents = "NONE")
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java
index bc8f4eb..cbb43d1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SeparatorTagDeclaration.java
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
allowedChildComponenents = "NONE",
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
facets = {
@Facet(name = Facets.LABEL,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetPageCommandTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetPageCommandTagDeclaration.java
index 4e431d2..65f7e63 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetPageCommandTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetPageCommandTagDeclaration.java
@@ -22,11 +22,11 @@ package org.apache.myfaces.tobago.internal.taglib.component;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.component.RendererTypes;
-import javax.faces.component.UICommand;
+import jakarta.faces.component.UICommand;
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UICommand",
- uiComponentFacesClass = "javax.faces.component.UICommand",
+ uiComponentFacesClass = "jakarta.faces.component.UICommand",
componentFamily = UICommand.COMPONENT_FAMILY,
generate = false,
rendererType = RendererTypes.SHEET_PAGE_COMMAND)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
index e65cd83..042607f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
import org.apache.myfaces.tobago.layout.ShowPosition;
import org.apache.myfaces.tobago.model.Selectable;
-import javax.faces.component.UIData;
+import jakarta.faces.component.UIData;
/**
* Render a sheet element.
@@ -48,11 +48,11 @@ import javax.faces.component.UIData;
@BodyContentDescription(anyTagOf = "<tc:column>* <tc:columnSelector>? <tc:row>?")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISheet",
- uiComponentFacesClass = "javax.faces.component.UIData",
+ uiComponentFacesClass = "jakarta.faces.component.UIData",
componentFamily = UIData.COMPONENT_FAMILY,
rendererType = RendererTypes.SHEET,
allowedChildComponenents = {
- "javax.faces.Column",
+ "jakarta.faces.Column",
"org.apache.myfaces.tobago.ColumnSelector"},
facets = {
@Facet(
@@ -135,8 +135,8 @@ public interface SheetTagDeclaration
* The sheet's data.
*/
@TagAttribute
- @UIComponentTagAttribute(type = {"java.lang.Object[]", "java.util.List", "javax.servlet.jsp.jstl.sql.Result",
- "java.sql.ResultSet", "java.lang.Object", "javax.faces.model.DataModel"},
+ @UIComponentTagAttribute(type = {"java.lang.Object[]", "java.util.List", "jakarta.servlet.jsp.jstl.sql.Result",
+ "java.sql.ResultSet", "java.lang.Object", "jakarta.faces.model.DataModel"},
expression = DynamicExpression.VALUE_EXPRESSION_REQUIRED)
void setValue(String value);
@@ -241,7 +241,7 @@ public interface SheetTagDeclaration
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ActionEvent")
+ methodSignature = "jakarta.faces.event.ActionEvent")
void setStateChangeListener(String stateChangeListener);
/**
@@ -260,7 +260,7 @@ public interface SheetTagDeclaration
@UIComponentTagAttribute(
type = {},
expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "javax.faces.event.ActionEvent")
+ methodSignature = "jakarta.faces.event.ActionEvent")
void setSortActionListener(String sortActionListener);
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StarsTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StarsTagDeclaration.java
index 9cdeb76..aff193f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StarsTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StarsTagDeclaration.java
@@ -48,7 +48,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* Renders a star rating component.
@@ -56,7 +56,7 @@ import javax.faces.component.UIInput;
@Tag(name = "stars")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIStars",
- uiComponentFacesClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "jakarta.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.STARS,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
index d188fa2..d5dd9ab 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SuggestTagDeclaration.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.model.SuggestFilter;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* Renders a list of suggested texts for a given input field.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
index f28fbe0..edffdd5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Register an TabChangedListener instance on the UIComponent
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
index fab28e2..9d906c7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupTagDeclaration.java
@@ -38,7 +38,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsImmediateCommand;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
import org.apache.myfaces.tobago.model.SwitchType;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Renders a tab group which contains tab panels.
@@ -47,7 +47,7 @@ import javax.faces.component.UIPanel;
@BodyContentDescription(anyTagOf = "(<tc:tab>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITabGroup",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.TAB_GROUP,
allowedChildComponenents = "org.apache.myfaces.tobago.Tab",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
index f23b142..f5f2334 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
@@ -34,7 +34,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
/**
* Renders a tab within a tab group.
@@ -42,7 +42,7 @@ import javax.faces.component.UIPanel;
@Tag(name = "tab")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITab",
- uiComponentFacesClass = "javax.faces.component.UIPanel",
+ uiComponentFacesClass = "jakarta.faces.component.UIPanel",
componentFamily = UIPanel.COMPONENT_FAMILY,
rendererType = RendererTypes.TAB,
facets = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java
index c4f1009..f9c93bf 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TextareaTagDeclaration.java
@@ -50,7 +50,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIInput;
+import jakarta.faces.component.UIInput;
/**
* Renders a multi line text input control.
@@ -58,7 +58,7 @@ import javax.faces.component.UIInput;
@Tag(name = "textarea")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITextarea",
- uiComponentFacesClass = "javax.faces.component.UIInput",
+ uiComponentFacesClass = "jakarta.faces.component.UIInput",
componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = RendererTypes.TEXTAREA,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java
index 5e39ae5..bc7b7e5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIconTagDeclaration.java
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIGraphic;
+import jakarta.faces.component.UIGraphic;
/**
* Renders an image beside a tree node.
@@ -38,12 +38,12 @@ import javax.faces.component.UIGraphic;
@Tag(name = "treeIcon")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeIcon",
- uiComponentFacesClass = "javax.faces.component.UIGraphic",
+ uiComponentFacesClass = "jakarta.faces.component.UIGraphic",
componentFamily = UIGraphic.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_ICON,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE")
public interface TreeIconTagDeclaration extends HasIdBindingAndRendered, HasTip, IsDisabled, IsVisual, HasAlt {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIndentTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIndentTagDeclaration.java
index d482d9d..d23b7ae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIndentTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeIndentTagDeclaration.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIGraphic;
+import jakarta.faces.component.UIGraphic;
/**
* Renders an indent beside a tree node.
@@ -36,12 +36,12 @@ import javax.faces.component.UIGraphic;
@Tag(name = "treeIndent")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeIndent",
- uiComponentFacesClass = "javax.faces.component.UIGraphic",
+ uiComponentFacesClass = "jakarta.faces.component.UIGraphic",
componentFamily = UIGraphic.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_INDENT,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE")
public interface TreeIndentTagDeclaration extends HasIdBindingAndRendered, HasTip, IsVisual {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java
index 493a491..1d93a1a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeLabelTagDeclaration.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRend
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIOutput;
+import jakarta.faces.component.UIOutput;
/**
* Renders a label inside of a tree.
@@ -36,12 +36,12 @@ import javax.faces.component.UIOutput;
@Tag(name = "treeLabel")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeLabel",
- uiComponentFacesClass = "javax.faces.component.UIOutput",
+ uiComponentFacesClass = "jakarta.faces.component.UIOutput",
componentFamily = UIOutput.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_LABEL,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = "NONE"
)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
index 6f72ecf..7ba763d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeListboxTagDeclaration.java
@@ -34,7 +34,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
import org.apache.myfaces.tobago.model.Selectable;
-import javax.faces.component.UIData;
+import jakarta.faces.component.UIData;
/**
* A tree data structure displayed as a set of list boxes.
@@ -43,12 +43,12 @@ import javax.faces.component.UIData;
@BodyContentDescription(anyTagOf = "<tc:treeNode>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeListbox",
- uiComponentFacesClass = "javax.faces.component.UIData",
+ uiComponentFacesClass = "jakarta.faces.component.UIData",
componentFamily = UIData.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_LISTBOX,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeNode"
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
index 27545ec..94c4a03 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UIColumn;
+import jakarta.faces.component.UIColumn;
/**
* Creates a tree node. This component represents a single node inside a tree structure.
@@ -41,7 +41,7 @@ import javax.faces.component.UIColumn;
@BodyContentDescription(anyTagOf = "<tc:treeIndent>|<tc:treeIcon>|<tc:treeSelect>|<tc:treeLabel>|<tc:link>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
- uiComponentFacesClass = "javax.faces.component.UIColumn",
+ uiComponentFacesClass = "jakarta.faces.component.UIColumn",
componentFamily = UIColumn.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_NODE,
allowedChildComponenents = {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
index 5e84f63..5814d66 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeSelectTagDeclaration.java
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequiredForSelect;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
-import javax.faces.component.UISelectBoolean;
+import jakarta.faces.component.UISelectBoolean;
/**
* Makes a tree node selectable.
@@ -47,7 +47,7 @@ import javax.faces.component.UISelectBoolean;
@Tag(name = "treeSelect")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeSelect",
- uiComponentFacesClass = "javax.faces.component.UISelectBoolean",
+ uiComponentFacesClass = "jakarta.faces.component.UISelectBoolean",
componentFamily = UISelectBoolean.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE_SELECT,
allowedChildComponenents = "NONE",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
index ba65fde..24032a3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
@@ -34,7 +34,7 @@ import org.apache.myfaces.tobago.internal.taglib.declaration.IsShowRootJunction;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsVisual;
import org.apache.myfaces.tobago.model.Selectable;
-import javax.faces.component.UIData;
+import jakarta.faces.component.UIData;
/**
* A tree with classical look.
@@ -44,12 +44,12 @@ import javax.faces.component.UIData;
@BodyContentDescription(anyTagOf = "<tc:treeNode>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITree",
- uiComponentFacesClass = "javax.faces.component.UIData",
+ uiComponentFacesClass = "jakarta.faces.component.UIData",
componentFamily = UIData.COMPONENT_FAMILY,
rendererType = RendererTypes.TREE,
interfaces = {
// As long as no behavior event names are defined, ClientBehaviorHolder must be implemented for Mojarra.
- "javax.faces.component.behavior.ClientBehaviorHolder"
+ "jakarta.faces.component.behavior.ClientBehaviorHolder"
},
allowedChildComponenents = {
"org.apache.myfaces.tobago.TreeNode"
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
index e2982cc..3893342 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.ValidatorTag;
import org.apache.myfaces.tobago.validator.FileItemValidator;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Register an {@link FileItemValidator} instance on the UIComponent
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
index 4e51c42..a81fbd0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.ValidatorTag;
import org.apache.myfaces.tobago.validator.SubmittedValueLengthValidator;
-import javax.el.ValueExpression;
+import jakarta.el.ValueExpression;
/**
* Register an {@link SubmittedValueLengthValidator} instance on the UIComponent
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
index 75870a8..90e51d5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
@@ -28,7 +28,7 @@ public interface HasAction {
* Action to invoke when clicked.
* This must be a MethodExpression or a String representing the application action to invoke when
* this component is activated by the user.
- * The {@link javax.el.MethodExpression} must evaluate to a public method that takes no parameters,
+ * The {@link jakarta.el.MethodExpression} must evaluate to a public method that takes no parameters,
* and returns a {@link String} (the logical outcome) which is passed to the
* {@link javax.faces.application.NavigationHandler} for this application.
* The string is directly passed to the navigation handler.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java
index b7d37d3..01f7e74 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java
@@ -28,6 +28,6 @@ public interface HasBinding {
* For Facelets, the component is the outer UIPanel, not the input control.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
+ @UIComponentTagAttribute(type = "jakarta.faces.component.UIComponent")
void setBinding(String binding);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
index 0ebea59..cb9e61e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
@@ -33,6 +33,6 @@ public interface HasValidator {
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = { "jakarta.faces.context.FacesContext", "jakarta.faces.component.UIComponent", "java.lang.Object" })
void setValidator(String validator);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
index f1db794..04c044e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AccessKeyLogger.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
index 3c97522..a4aa5d9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
@@ -22,16 +22,16 @@ package org.apache.myfaces.tobago.internal.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.el.ELContext;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.annotation.security.DenyAll;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.el.ELContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.AnnotatedElement;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
index f2b041b..eafcda0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/CookieUtils.java
@@ -22,9 +22,9 @@ package org.apache.myfaces.tobago.internal.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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 java.lang.invoke.MethodHandles;
public class CookieUtils {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
index 32b2908..b4db007 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlRendererUtils.java
@@ -32,12 +32,12 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Locale;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java
index 63f2bb4..02dfb60 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HttpPartWrapper.java
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.internal.util;
-import javax.faces.FacesException;
-import javax.faces.FacesWrapper;
-import javax.faces.component.StateHolder;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.Part;
+import jakarta.faces.FacesException;
+import jakarta.faces.FacesWrapper;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.Part;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
index f081868..185343c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.internal.util;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Part;
/**
* Only needed for Servlet 3.0. Not needed for Servlet 3.1 or higher.
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
index 261fc5a..271a96c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/RenderUtils.java
@@ -37,18 +37,18 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.application.ViewHandler;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIPanel;
-import javax.faces.component.UIParameter;
-import javax.faces.component.behavior.AjaxBehavior;
-import javax.faces.component.behavior.ClientBehavior;
-import javax.faces.component.behavior.ClientBehaviorBase;
-import javax.faces.component.behavior.ClientBehaviorContext;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.render.ClientBehaviorRenderer;
+import jakarta.faces.application.ViewHandler;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIPanel;
+import jakarta.faces.component.UIParameter;
+import jakarta.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.component.behavior.ClientBehavior;
+import jakarta.faces.component.behavior.ClientBehaviorBase;
+import jakarta.faces.component.behavior.ClientBehaviorContext;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.render.ClientBehaviorRenderer;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
index 05a5c90..4c7f8ab 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ResponseUtils.java
@@ -26,8 +26,8 @@ import org.apache.myfaces.tobago.internal.context.Nonce;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.HttpServletResponse;
import java.lang.invoke.MethodHandles;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
index 89a4180..d601b2c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
@@ -26,12 +26,12 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UISelectItem;
-import javax.faces.component.UISelectItems;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UISelectItem;
+import jakarta.faces.component.UISelectItems;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -74,7 +74,7 @@ public class SelectItemUtils {
/**
* Creates a list of SelectItems to use for rendering.
* You should only use this method (which returns a list), when you need a list.
- * Otherwise please use {@link #getItemIterator(javax.faces.context.FacesContext, javax.faces.component.UIComponent)}
+ * Otherwise please use {@link #getItemIterator(jakarta.faces.context.FacesContext, jakarta.faces.component.UIComponent)}
*/
public static List<SelectItem> getItemList(final FacesContext facesContext, final UIComponent selector) {
if (selector.getChildCount() == 0) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java
index 6ca4fef..4c7e081 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SortingUtils.java
@@ -29,18 +29,18 @@ import org.apache.myfaces.tobago.util.ValueExpressionComparator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIColumn;
-import javax.faces.component.UICommand;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
-import javax.faces.component.UISelectBoolean;
-import javax.faces.component.UISelectMany;
-import javax.faces.component.UISelectOne;
-import javax.faces.context.FacesContext;
-import javax.faces.model.DataModel;
+import jakarta.el.ValueExpression;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIColumn;
+import jakarta.faces.component.UICommand;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.UIOutput;
+import jakarta.faces.component.UISelectBoolean;
+import jakarta.faces.component.UISelectMany;
+import jakarta.faces.component.UISelectOne;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.DataModel;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
@@ -207,7 +207,7 @@ public class SortingUtils {
break;
}
if (child instanceof UICommand
- || child instanceof javax.faces.component.UIPanel) {
+ || child instanceof jakarta.faces.component.UIPanel) {
child = getFirstSortableChild(child.getChildren());
if (child instanceof UIOutput) {
break;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
index 4a185d6..3c42a9c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeFilter.java
@@ -22,13 +22,13 @@ package org.apache.myfaces.tobago.internal.webapp;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
index 3d85d0b..ea85390 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugContentTypeResponse.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.internal.webapp;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import java.lang.invoke.MethodHandles;
public class DebugContentTypeResponse extends HttpServletResponseWrapper {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
index 25a1e34..165aad8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugResponseWriterWrapper.java
@@ -26,10 +26,10 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.Writer;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
index 756fa4c..428bba2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.webapp;
import org.apache.myfaces.tobago.internal.util.HtmlWriterHelper;
import org.apache.myfaces.tobago.internal.util.WriterHelper;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.context.ResponseWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.Charset;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
index 8b9aec5..4a21240 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/LoggingMdcFilter.java
@@ -23,14 +23,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
index d24d0eb..46d4efb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
import java.io.IOException;
import java.io.Writer;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
index cfd4ed1..b93fd50 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlTypes;
import org.apache.myfaces.tobago.renderkit.html.MarkupLanguageAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import javax.faces.component.UIComponent;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.ResponseWriter;
import java.io.IOException;
import java.io.Writer;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
index 0612997..6edaee2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.internal.webapp;
import org.apache.myfaces.tobago.internal.util.HtmlWriterHelper;
import org.apache.myfaces.tobago.internal.util.WriterHelper;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.context.ResponseWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.Charset;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java
index 019308f..2611e70 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/lifecycle/SecretPhaseListener.java
@@ -24,10 +24,10 @@ import org.apache.myfaces.tobago.webapp.Secret;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseEvent;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PhaseListener;
import java.lang.invoke.MethodHandles;
import java.util.Map;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java
index 81232ef..fb3dc37 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java
@@ -23,7 +23,7 @@ import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.renderkit.css.CustomClass;
-public class SelectItem extends javax.faces.model.SelectItem implements Visual {
+public class SelectItem extends jakarta.faces.model.SelectItem implements Visual {
private static final long serialVersionUID = 2582455665060354639L;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeDataModel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeDataModel.java
index 905e09f..471ce0d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeDataModel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeDataModel.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.model;
-import javax.faces.model.DataModel;
+import jakarta.faces.model.DataModel;
import java.util.List;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java
index 08afa94..9e2cc4f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.renderkit;
-import javax.faces.render.Renderer;
+import jakarta.faces.render.Renderer;
public class GenericRenderer extends Renderer {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
index 18a7a68..5bca4e9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
import java.lang.invoke.MethodHandles;
import java.util.Locale;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
index d15f00a..f38b13a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
@@ -50,24 +50,24 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.ValueHolder;
-import javax.faces.component.behavior.AjaxBehavior;
-import javax.faces.component.behavior.ClientBehavior;
-import javax.faces.component.behavior.ClientBehaviorBase;
-import javax.faces.component.behavior.ClientBehaviorContext;
-import javax.faces.component.behavior.ClientBehaviorHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.model.SelectItem;
-import javax.faces.model.SelectItemGroup;
-import javax.faces.render.ClientBehaviorRenderer;
-import javax.faces.render.Renderer;
+import jakarta.el.ValueExpression;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.ValueHolder;
+import jakarta.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.component.behavior.ClientBehavior;
+import jakarta.faces.component.behavior.ClientBehaviorBase;
+import jakarta.faces.component.behavior.ClientBehaviorContext;
+import jakarta.faces.component.behavior.ClientBehaviorHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseWriter;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.model.SelectItem;
+import jakarta.faces.model.SelectItemGroup;
+import jakarta.faces.render.ClientBehaviorRenderer;
+import jakarta.faces.render.Renderer;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
index 46354eb..c307aeb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
@@ -26,16 +26,16 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.FactoryFinder;
-import javax.faces.application.ProjectStage;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseStream;
-import javax.faces.context.ResponseWriter;
-import javax.faces.render.ClientBehaviorRenderer;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-import javax.faces.render.Renderer;
-import javax.faces.render.ResponseStateManager;
+import jakarta.faces.FactoryFinder;
+import jakarta.faces.application.ProjectStage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.ResponseStream;
+import jakarta.faces.context.ResponseWriter;
+import jakarta.faces.render.ClientBehaviorRenderer;
+import jakarta.faces.render.RenderKit;
+import jakarta.faces.render.RenderKitFactory;
+import jakarta.faces.render.Renderer;
+import jakarta.faces.render.ResponseStateManager;
import java.io.OutputStream;
import java.io.Writer;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
index eb075a0..88e5fb7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
@@ -33,8 +33,8 @@ import org.apache.myfaces.tobago.layout.VerticalAlign;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
index 6ca88d1..6872c19 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
@@ -22,9 +22,9 @@ package org.apache.myfaces.tobago.renderkit.css;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
index 0b856d6..4ff23fc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
@@ -19,21 +19,21 @@
package org.apache.myfaces.tobago.servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
-import javax.faces.application.NavigationHandler;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.context.FacesContextFactory;
-import javax.faces.lifecycle.Lifecycle;
-import javax.faces.lifecycle.LifecycleFactory;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.faces.FactoryFinder;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.context.FacesContextFactory;
+import jakarta.faces.lifecycle.Lifecycle;
+import jakarta.faces.lifecycle.LifecycleFactory;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java
index 9a5bc5c..e3a1138 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AjaxUtils.java
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.util;
-import javax.faces.application.Application;
-import javax.faces.application.NavigationHandler;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
index 8771768..02612a3 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
@@ -38,26 +38,26 @@ import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.FactoryFinder;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UINamingContainer;
-import javax.faces.component.UIParameter;
-import javax.faces.component.UISelectMany;
-import javax.faces.component.UIViewRoot;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-import javax.faces.render.Renderer;
-import javax.faces.view.facelets.FaceletContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.FactoryFinder;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.NamingContainer;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.component.UINamingContainer;
+import jakarta.faces.component.UIParameter;
+import jakarta.faces.component.UISelectMany;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.component.ValueHolder;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.ValueChangeEvent;
+import jakarta.faces.render.RenderKit;
+import jakarta.faces.render.RenderKitFactory;
+import jakarta.faces.render.Renderer;
+import jakarta.faces.view.facelets.FaceletContext;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java
index 88c165b..520c242 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ContextCallback.java
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.util;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.component.UIComponent;
public interface ContextCallback {
void invokeContextCallback(FacesContext facesContext, UIComponent component);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
index c0a4482..f9d564f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugActionListener.java
@@ -22,9 +22,9 @@ package org.apache.myfaces.tobago.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.event.ActionListener;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionListener;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.AbortProcessingException;
import java.lang.invoke.MethodHandles;
public class DebugActionListener implements ActionListener {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
index d8e4a00..6a9d85d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugNavigationHandler.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.application.NavigationHandler;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.NavigationHandler;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
public class DebugNavigationHandler extends NavigationHandler {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
index 2ff1d80..ab4cdc5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
@@ -22,15 +22,15 @@ package org.apache.myfaces.tobago.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.ProjectStage;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.application.ProjectStage;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseEvent;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PhaseListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.lang.invoke.MethodHandles;
import java.text.MessageFormat;
import java.util.Iterator;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java
index e1fe8cf..0eb41bc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugUtils.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.util;
-import javax.faces.application.FacesMessage;
-import javax.faces.application.ProjectStage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.application.ProjectStage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -83,9 +83,9 @@ public final class DebugUtils {
// buf.append(component.getId());
// buf.append(" ");
buf.append(component.getClientId(FacesContext.getCurrentInstance()));
- if (component instanceof javax.faces.component.UIViewRoot) {
+ if (component instanceof jakarta.faces.component.UIViewRoot) {
buf.append(" viewId=");
- buf.append(((javax.faces.component.UIViewRoot) component).getViewId());
+ buf.append(((jakarta.faces.component.UIViewRoot) component).getViewId());
}
buf.append(" rendered=");
buf.append(component.isRendered());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesELUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesELUtils.java
index 95dafb7..c34b1fe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesELUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesELUtils.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.util;
-import javax.el.MethodExpression;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.FacesEvent;
+import jakarta.el.MethodExpression;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.FacesEvent;
public final class FacesELUtils {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
index bc36fe6..b56c485 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/FacesVersion.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.util;
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.Application;
+import jakarta.faces.context.FacesContext;
public enum FacesVersion {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java
index 06cd61d..9cd6727 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFormat.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.util;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
/**
* Helper class for the EL functions <code>tc:format1()</code> ... <code>tc:format9()</code>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
index 919517b68..bb5c128 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageUtils.java
@@ -21,11 +21,11 @@ package org.apache.myfaces.tobago.util;
import org.apache.myfaces.tobago.application.LabelValueExpressionFacesMessage;
-import javax.el.ValueExpression;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ResourceUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ResourceUtils.java
index ca33afb..5c7a744 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ResourceUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ResourceUtils.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.util;
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.Application;
+import jakarta.faces.context.FacesContext;
import java.util.ResourceBundle;
public class ResourceUtils {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
index b687500..ac5c6c9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueExpressionComparator.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
+import jakarta.el.ValueExpression;
+import jakarta.faces.context.FacesContext;
import java.lang.invoke.MethodHandles;
import java.util.Comparator;
import java.util.Map;
@@ -33,11 +33,11 @@ public class ValueExpressionComparator extends ComparatorBase {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private FacesContext facesContext;
+ private final FacesContext facesContext;
- private String var;
+ private final String var;
- private ValueExpression valueExpression;
+ private final ValueExpression valueExpression;
public ValueExpressionComparator(
final FacesContext facesContext, final String var,
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java
index f288860..e5ea532 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.util;
-import javax.el.ELContext;
-import javax.faces.context.FacesContext;
+import jakarta.el.ELContext;
+import jakarta.faces.context.FacesContext;
public final class VariableResolverUtils {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
index cbaf672..ca5e5ab 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
@@ -26,14 +26,14 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import javax.faces.application.ViewHandler;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import jakarta.faces.application.ViewHandler;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.ServletContext;
import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
index c22e201..173835c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
@@ -23,12 +23,12 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
-import javax.faces.event.PhaseId;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.ActionListener;
+import jakarta.faces.event.PhaseId;
import java.lang.invoke.MethodHandles;
import java.util.StringTokenizer;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java
index 55dda6f..c98f0dd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/FileItemValidator.java
@@ -23,13 +23,13 @@ import org.apache.myfaces.tobago.internal.component.AbstractUIFile;
import org.apache.myfaces.tobago.internal.util.ContentType;
import org.apache.myfaces.tobago.util.MessageUtils;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
-import javax.servlet.http.Part;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.Validator;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.servlet.http.Part;
import java.util.Arrays;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
index 291db03..ae29a6a 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/SubmittedValueLengthValidator.java
@@ -22,12 +22,12 @@ package org.apache.myfaces.tobago.validator;
import org.apache.myfaces.tobago.apt.annotation.Validator;
import org.apache.myfaces.tobago.util.MessageUtils;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.LengthValidator;
-import javax.faces.validator.ValidatorException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.EditableValueHolder;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.LengthValidator;
+import jakarta.faces.validator.ValidatorException;
import java.util.Objects;
/**
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
index 4d49c21..66ac885 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
@@ -22,13 +22,13 @@ package org.apache.myfaces.tobago.webapp;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.FacesException;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
-import javax.servlet.http.HttpSession;
+import jakarta.faces.FacesException;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AbortProcessingException;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.ActionListener;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java
index dba57c0..89b1568 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/Secret.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.webapp;
import org.apache.myfaces.tobago.internal.util.RandomUtils;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpSession;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.HttpSession;
import java.io.Serializable;
public final class Secret implements Serializable {
@@ -43,7 +43,7 @@ public final class Secret implements Serializable {
/**
* Create a secret attribute in the session.
- * Should usually be called in a {@link javax.servlet.http.HttpSessionListener}.
+ * Should usually be called in a {@link jakarta.servlet.http.HttpSessionListener}.
*/
public static void create(final HttpSession session) {
session.setAttribute(Secret.KEY, new Secret());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/SecretSessionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/SecretSessionListener.java
index 79d4b0d..ccff3b7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/SecretSessionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/SecretSessionListener.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.webapp;
import org.apache.myfaces.tobago.config.TobagoConfig;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
public class SecretSessionListener implements HttpSessionListener {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
index 2d461af..187eaf1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
@@ -26,8 +26,8 @@ import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlTypes;
import org.apache.myfaces.tobago.renderkit.html.MarkupLanguageAttributes;
-import javax.faces.component.UIComponent;
-import javax.faces.context.ResponseWriter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.ResponseWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
index ec0a492..5ff843f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.webapp;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
import java.lang.invoke.MethodHandles;
public class TobagoServletContextListener implements ServletContextListener {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AbstractGeneratedUIComponentsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AbstractGeneratedUIComponentsUnitTest.java
index 0baf504..a410be9 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AbstractGeneratedUIComponentsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AbstractGeneratedUIComponentsUnitTest.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.component;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.junit.jupiter.api.BeforeEach;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
import java.io.File;
import java.io.IOException;
import java.net.URL;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java
index 07b29ed..b6de60e 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/AttributesOfGeneratedUIComponentsUnitTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
index 74db5b7..572329e 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/MethodOverwritingOfGeneratedUIComponentsUnitTest.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.component;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
index 0cc3579..fa19031 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
import java.util.List;
public class UIMessagesUnitTest extends AbstractTobagoTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java
index aecfa4f..7280842 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/component/UISheetUnitTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.faces.model.ListDataModel;
+import jakarta.faces.model.ListDataModel;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java
index 3cb6b83..c632b7b 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.faces.convert.Converter;
+import jakarta.faces.convert.Converter;
public class DurationConverterUnitTest extends AbstractTobagoTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java
index 1388304..8df88e2 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayoutUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.component.UIComponent;
+import jakarta.faces.component.UIComponent;
import java.util.Arrays;
public class AbstractUIGridLayoutUnitTest extends AbstractTobagoTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
index cc67f04..fc7a432 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
@@ -94,10 +94,10 @@ import org.apache.myfaces.tobago.internal.webapp.HtmlResponseWriter;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import javax.faces.component.behavior.AjaxBehavior;
-import javax.faces.convert.DateTimeConverter;
-import javax.faces.render.RenderKit;
-import javax.servlet.ServletContext;
+import jakarta.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.convert.DateTimeConverter;
+import jakarta.faces.render.RenderKit;
+import jakarta.servlet.ServletContext;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
index f520164..481addd 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.internal.mock.servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionContext;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockServletInputStream.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockServletInputStream.java
index aba7490..d575aeb 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockServletInputStream.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockServletInputStream.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.internal.mock.servlet;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
import java.io.IOException;
public class MockServletInputStream extends ServletInputStream {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java
index c54a7a4..27d761a 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/DateRendererUnitTest.java
@@ -29,8 +29,8 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.convert.Converter;
-import javax.faces.convert.DateTimeConverter;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.DateTimeConverter;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.text.ParseException;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
index 13a1932..1a381ce 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRendererUnitTest.java
@@ -36,8 +36,8 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.behavior.AjaxBehavior;
import java.io.IOException;
import java.util.Arrays;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java
index 3170f62..f3bff76 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRendererUnitTest.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.component.UIPanel;
+import jakarta.faces.component.UIPanel;
import java.io.IOException;
public class SelectOneRadioRendererUnitTest extends RendererTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRendererUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRendererUnitTest.java
index e0740ee..13f8882 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRendererUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRendererUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.component.behavior.AjaxBehavior;
+import jakarta.faces.component.behavior.AjaxBehavior;
import java.io.IOException;
public class TreeSelectRendererUnitTest extends TreeRendererTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
index 519a3b9..0e7a40f 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/RenderUtilsUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.internal.config.AbstractTobagoTestBase;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.component.UIParameter;
+import jakarta.faces.component.UIParameter;
public class RenderUtilsUnitTest extends AbstractTobagoTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtilsUnitTest.java
index 24583b0..c55bd54 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/StyleRenderUtilsUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
public class StyleRenderUtilsUnitTest extends AbstractTobagoTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java
index 01a8b6e..a8dca90 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ComponentUtilsUnitTest.java
@@ -27,9 +27,9 @@ import org.apache.myfaces.tobago.internal.config.AbstractTobagoTestBase;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
public class ComponentUtilsUnitTest extends AbstractTobagoTestBase {
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/MessageUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/MessageUtilsUnitTest.java
index 57cc9ca..0e6e84a 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/MessageUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/MessageUtilsUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.validator.FileItemValidator;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import javax.faces.application.FacesMessage;
+import jakarta.faces.application.FacesMessage;
import java.util.Locale;
public class MessageUtilsUnitTest extends AbstractTobagoTestBase {
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 5b187e6..2a5e167 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Examples</name>
@@ -243,7 +243,7 @@
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
- <version>1.2.7</version>
+ <version>2.0.0</version>
</dependency>
<dependency> <!-- Optional, only when <f:websocket> is used. -->
<groupId>org.glassfish</groupId>
@@ -378,25 +378,75 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
+
+ <!-- openwebbeans -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-owb</artifactId>
<version>${project.version}</version>
@@ -405,7 +455,6 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
- <version>1.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -438,25 +487,75 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
+
+ <!-- openwebbeans -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-owb</artifactId>
<version>${project.version}</version>
diff --git a/tobago-example/tobago-example-assembly/pom.xml b/tobago-example/tobago-example-assembly/pom.xml
index 0c0ba1d..1befb9d 100644
--- a/tobago-example/tobago-example-assembly/pom.xml
+++ b/tobago-example/tobago-example-assembly/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/tobago-example/tobago-example-blank/pom.xml b/tobago-example/tobago-example-blank/pom.xml
index 5318cc7..7d1d501 100644
--- a/tobago-example/tobago-example-blank/pom.xml
+++ b/tobago-example/tobago-example-blank/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-blank</artifactId>
<packaging>${app.packaging}</packaging>
diff --git a/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java b/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
index 8d44973..36d6531 100644
--- a/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
+++ b/tobago-example/tobago-example-blank/src/main/java/org/apache/myfaces/tobago/example/blank/Hello.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.blank;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.lang.invoke.MethodHandles;
@Named
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 662b747..63a6759 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-demo</artifactId>
<packaging>${app.packaging}</packaging>
@@ -170,8 +170,8 @@
<!-- Tobago -->
<dependency>
- <groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test23</artifactId>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-test</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -392,25 +392,75 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
+
+ <!-- openwebbeans -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-resource</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-owb</artifactId>
<version>${project.version}</version>
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AjaxSpecialCharacterController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AjaxSpecialCharacterController.java
index 90748cf..486c4d5 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AjaxSpecialCharacterController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AjaxSpecialCharacterController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.Date;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
index 6fb512e..fe2d6ca 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
@@ -22,9 +22,9 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java
index f5cea8f..5845220 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AstroData.java
@@ -24,8 +24,8 @@ import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import org.apache.myfaces.tobago.model.SelectItem;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.InputStreamReader;
import java.io.Serializable;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AttributeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AttributeController.java
index e4f93f3..14c570e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AttributeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/AttributeController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@Named
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BadgeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BadgeController.java
index 8b948bf..3d82eb4 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BadgeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BadgeController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
index 94bf065..c1665ec 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorController.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorTestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorTestController.java
index 32efec7..0b08f11 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorTestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BehaviorTestController.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BoxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BoxController.java
index 70e0f11..90ff1a2 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BoxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BoxController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@Named
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BundleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BundleController.java
index 8b4133a..5417ce1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BundleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BundleController.java
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Observes;
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.faces.application.Application;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Enumeration;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
index 593ea75..20a5056 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ButtonLinkController.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CkeditorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CkeditorController.java
index 2c9a644..890c45e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CkeditorController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CkeditorController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java
index 652abc5..d6b8bd8 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleBoxController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
index 0b0634a..be15cd5 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleController.java
@@ -22,9 +22,9 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java
index 2390aba..0d19ac0 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePanelController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java
index 65afba1..158c0f1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsiblePopupController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java
index d4981e3..7f2d89b 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CollapsibleSectionController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
index 4a79935..cdf3905 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.Conversation;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.Conversation;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
// XXX a solution might be putting this example to its own small JAR.
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java
index a6dcb27..1a46166 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversionController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConvertDateTimeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConvertDateTimeController.java
index 398db76..cf8a3b1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConvertDateTimeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConvertDateTimeController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrencyController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrencyController.java
index f33b313..66f558d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrencyController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrencyController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.Currency;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
index b776254..48fe686 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/CurrentValueController.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
index 27ce57c..b90e141 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
@@ -22,13 +22,13 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.validator.ValidatorException;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.text.ParseException;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
index 22cb122..cff9e9b 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DefaultCommandController.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.event.ActionEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.event.ActionEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerController.java
index d24bdbd..8f6ce5c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java
index def5450..bec7bae 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/EventController.java
@@ -73,13 +73,13 @@ import org.apache.myfaces.tobago.component.UITreeListbox;
import org.apache.myfaces.tobago.component.UITreeSelect;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.component.UIComponentBase;
-import javax.faces.component.UIData;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.faces.event.ValueChangeEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.component.UIComponentBase;
+import jakarta.faces.component.UIData;
+import jakarta.faces.event.ActionEvent;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.event.ValueChangeEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
index 3142811..470e0d2 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.io.PrintWriter;
import java.io.Serializable;
import java.io.StringWriter;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
index 23194f1..7a577b1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionHandlerController.java
@@ -23,12 +23,12 @@ import org.apache.myfaces.tobago.model.SheetState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.faces.event.ComponentSystemEvent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
index 4f8e6e5..79f8f89 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExecuteController.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
index c67597b..79c7def 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ForEachController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java
index 8eca99d..2b897f1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormAjaxController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
index ecdab98..acabf58 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java
index d3c9cda..487e127 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/FormRequiredController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
index 7828d19..d2f8f50 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
@@ -23,9 +23,9 @@ import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.Currency;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/HeaderFooterController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/HeaderFooterController.java
index ce5b8de..3390349 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/HeaderFooterController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/HeaderFooterController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@Named
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
index a823948..dbdaf42 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InController.java
@@ -22,9 +22,9 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Named;
import java.lang.invoke.MethodHandles;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
index 0d067cc..5526cbe 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/InputSuggestController.java
@@ -26,10 +26,10 @@ import org.apache.myfaces.tobago.model.AutoSuggestItems;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.component.UIInput;
-import javax.faces.model.SelectItem;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.model.SelectItem;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java
index 489c22f..c044e1d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Jsr303Bean.java
@@ -22,11 +22,11 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.lang.invoke.MethodHandles;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/KillSession.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/KillSession.java
index 15a056f..e7c9409 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/KillSession.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/KillSession.java
@@ -19,12 +19,12 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
/**
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
index 763a885..f0b0bdf 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LocaleController.java
@@ -24,16 +24,16 @@ import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Event;
-import javax.faces.application.Application;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.faces.application.Application;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java
index e922b9c..4cae97a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoggingController.java
@@ -23,8 +23,8 @@ import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.core.status.Status;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java
index 95b8242..dc8fa6f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/LoginController.java
@@ -22,13 +22,13 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
index 3e1cbfe..8988ef5 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ManifestReader.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.model.SheetState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.net.URL;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java
index 352a689..3a2c676 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessageLayoutController.java
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.io.Serializable;
@Named
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessagesController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessagesController.java
index 2e618fa..4e42d0e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessagesController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MessagesController.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java
index f22494c..12f5ce9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MetaController.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration4Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration4Controller.java
index 6bffe3f..0eaebe9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration4Controller.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration4Controller.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import java.io.Serializable;
@Singleton
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration5Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration5Controller.java
index e3c7af1..8dc03a9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration5Controller.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Migration5Controller.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import java.io.Serializable;
@Singleton
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java
index 75d7137..254eeb0 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NamedNode.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.event.ActionEvent;
import javax.swing.tree.DefaultMutableTreeNode;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
index 9d279e8..0f6b6d1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
@@ -26,12 +26,12 @@ import org.apache.myfaces.tobago.model.TreeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Observes;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
index 17918c6..1423511 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
@@ -23,14 +23,14 @@ import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ObjectController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ObjectController.java
index 82f6a91..a87da94 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ObjectController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ObjectController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java
index 97dc9cd..8f602c6 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OnOffConverter.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
import java.lang.invoke.MethodHandles;
/**
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OutController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OutController.java
index e59595c..1ffa796 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OutController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/OutController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@Named
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java
index 72526f4..d307739 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PanelController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
index 201a58c..832de44 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PartialReloadController.java
@@ -23,13 +23,13 @@ import org.apache.myfaces.tobago.util.AjaxUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.el.ELContext;
+import jakarta.el.ValueExpression;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.lang.invoke.MethodHandles;
import java.util.Date;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
index 013d14b..9e6b56f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PopupController.java
@@ -20,9 +20,9 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.time.LocalTime;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
index ae708a7..0b9f39e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ProgressController.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.event.FacesEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.event.FacesEvent;
+import jakarta.inject.Named;
import javax.swing.DefaultBoundedRangeModel;
import java.io.Serializable;
import java.text.SimpleDateFormat;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RangeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RangeController.java
index c629881..cac9131 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RangeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RangeController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
@RequestScoped
@Named
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java
index fa547c3..c5022ae 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ResizeController.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.inject.Model;
+import jakarta.enterprise.inject.Model;
import java.lang.invoke.MethodHandles;
@Model
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
index a121b44..2ae3c13 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/RoleController.java
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.annotation.security.RolesAllowed;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.time.LocalTime;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
index 9ec3009..f50dddc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanCheckboxController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanToggleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanToggleController.java
index 83d3a45..df18b50 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanToggleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectBooleanToggleController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java
index dae8114..8f8e189 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectController.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.model.SelectItem;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java
index 5e9fb39..5935c0f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectItemModel.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.model.SelectItem;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.Currency;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
index 815928d..bfcdcf5 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyCheckboxController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
index 1b9fbd9..8ee0bce 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyListboxController.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.model.SelectItem;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java
index f607417..b90cd8f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectManyShuttleController.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
index 1e8e238..18dfd44 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneChoiceController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
index b08f3dc..b67e1d0 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneListboxController.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.model.SelectItem;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
index de12fdb..134a44d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SelectOneRadioController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
index d17615c..7663f66 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
@@ -22,11 +22,11 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.NormalScope;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.NormalScope;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SeverityController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SeverityController.java
index 6c2a4c1..185d7f1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SeverityController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SeverityController.java
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
@Named
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java
index 5810eb4..efa2b8e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetConfig.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.layout.ShowPosition;
import org.apache.myfaces.tobago.model.Selectable;
-import javax.faces.model.SelectItem;
+import jakarta.faces.model.SelectItem;
import java.util.HashSet;
import java.util.Set;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
index 4610b1c..f19dbf9 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetController.java
@@ -19,6 +19,12 @@
package org.apache.myfaces.tobago.example.demo;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIData;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.DateTimeConverter;
+import jakarta.faces.event.FacesEvent;
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.model.SelectItem;
import org.apache.myfaces.tobago.model.Selectable;
@@ -27,15 +33,10 @@ import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.DateTimeConverter;
-import javax.faces.event.FacesEvent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -155,7 +156,7 @@ public class SheetController implements Serializable {
return columnEventSample;
}
- public javax.faces.convert.Converter getYearConverter() {
+ public Converter getYearConverter() {
final DateTimeConverter dateTimeConverter = new DateTimeConverter() {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetEditableController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetEditableController.java
index 13261f0..ffb3b46 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetEditableController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetEditableController.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
index 62429de..5e45e46 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetFilterController.java
@@ -24,15 +24,15 @@ import org.apache.myfaces.tobago.model.SelectItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
index 29ab595..181beef 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetSortingController.java
@@ -25,12 +25,12 @@ import org.apache.myfaces.tobago.model.SheetState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.Collections;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetTreeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetTreeController.java
index aa4dc79..d76a96d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetTreeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SheetTreeController.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.Serializable;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarConverter.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarConverter.java
index bafc6bf..ecc5fed 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarConverter.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarConverter.java
@@ -22,13 +22,13 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.inject.spi.CDI;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-import javax.faces.convert.FacesConverter;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.ConverterException;
+import jakarta.faces.convert.FacesConverter;
+import jakarta.inject.Inject;
import java.lang.invoke.MethodHandles;
@FacesConverter(forClass = SolarObject.class)// XXX fixme: is not running with Quarkus!
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java
index f1bb4fe..22178aa 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SolarObject.java
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.event.AjaxBehaviorEvent;
+import jakarta.faces.event.AjaxBehaviorEvent;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.Collections;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
index 5f1527f..fb2e8bc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
@@ -23,8 +23,8 @@ import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java
index 7ebab87..fe9ec86 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SplitLayoutController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java
index d3b1138..e24a838 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/StarsController.java
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import javax.swing.DefaultBoundedRangeModel;
import java.io.Serializable;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
index c1f5459..3b2beac 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestController.java
@@ -23,11 +23,11 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.component.UIInput;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.component.UIInput;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java
index 590c1bc..5f64b9e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SuggestQuotMarkController.java
@@ -23,8 +23,8 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java
index a01d1ba..99e96ad 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java
@@ -23,11 +23,11 @@ import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
+import jakarta.faces.component.UIViewRoot;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseEvent;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PhaseListener;
//todo @JsfPhaseListener
public class SynchronizeNavigationPhaseListener implements PhaseListener {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
index 3148168..0bdcddc 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TabController.java
@@ -24,8 +24,8 @@ import org.apache.myfaces.tobago.example.demo.actionlistener.SimpleTabChangeList
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
index 2673651..b5c8281 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestController.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import java.io.File;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
index 3df98c7..79c5539 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TextareaController.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
index 8ea5e3e..789b181 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ThemeController.java
@@ -27,10 +27,10 @@ import org.apache.myfaces.tobago.util.ResourceUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java
index 515af10..12ac981 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TinyMceController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java
index 667022f..8beee70 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeCommandTypesController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
@SessionScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
index dbd8b15..051602a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.Serializable;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
index 2990853..cc1f4ab 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeEditorController.java
@@ -22,10 +22,10 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeListboxController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeListboxController.java
index ba884e5..a8d1308 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeListboxController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeListboxController.java
@@ -24,9 +24,9 @@ import org.apache.myfaces.tobago.model.TreeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java
index 7165cde..9078c47 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeSelectController.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.model.Selectable;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.Serializable;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
index c5b9913..0bac1f7 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/UploadController.java
@@ -22,12 +22,12 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AjaxBehaviorEvent;
-import javax.inject.Named;
-import javax.servlet.http.Part;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.AjaxBehaviorEvent;
+import jakarta.inject.Named;
+import jakarta.servlet.http.Part;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java
index bd8d96f..d137e5d 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationController.java
@@ -19,13 +19,13 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.ValidatorException;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.inject.Named;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java
index d7833c9..3c80211 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ValidationJsr303Controller.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.example.demo;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.io.Serializable;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Version.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Version.java
index fe7abd9..afab02a 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Version.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Version.java
@@ -21,8 +21,8 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.myfaces.tobago.util.FacesVersion;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
@Named
@ApplicationScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/WebSocketController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/WebSocketController.java
index df4af5e..014f85f 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/WebSocketController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/WebSocketController.java
@@ -22,11 +22,11 @@ package org.apache.myfaces.tobago.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.push.Push;
-import javax.faces.push.PushContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.push.Push;
+import jakarta.faces.push.PushContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.time.LocalTime;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
index ecf0215..13a40d2 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
@@ -24,10 +24,10 @@ import org.apache.myfaces.tobago.example.demo.DemoException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/ToolBarCustomizer.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/ToolBarCustomizer.java
index 31bef28..cd5a890 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/ToolBarCustomizer.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/ToolBarCustomizer.java
@@ -19,10 +19,10 @@
package org.apache.myfaces.tobago.example.demo.bestpractice;
-import javax.enterprise.context.SessionScoped;
-import javax.faces.component.UIParameter;
-import javax.faces.event.ActionEvent;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.component.UIParameter;
+import jakarta.faces.event.ActionEvent;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
index acdb968..654e200 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/TransitionController.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.demo.bestpractice;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.lang.invoke.MethodHandles;
@RequestScoped
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java
index 544b863..7acf55c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/Activity.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.example.demo.info;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import java.io.Serializable;
import java.util.Date;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
index f0e0063..770a136 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityList.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.demo.info;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
index f280e3d..a85b753 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
@@ -22,13 +22,13 @@ package org.apache.myfaces.tobago.example.demo.info;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.inject.spi.CDI;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.inject.Inject;
-import javax.servlet.http.HttpSession;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.PhaseEvent;
+import jakarta.faces.event.PhaseId;
+import jakarta.faces.event.PhaseListener;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpSession;
import java.lang.invoke.MethodHandles;
// XXX @Inject in PhaseListener doesn't work with Quarkus
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java
index 15a60ba..259ad6b 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivitySessionListener.java
@@ -19,10 +19,11 @@
package org.apache.myfaces.tobago.example.demo.info;
-import javax.enterprise.inject.spi.CDI;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
+
+import jakarta.enterprise.inject.spi.CDI;
public class ActivitySessionListener implements HttpSessionListener {
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
index 20f085e..78b826e 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/nonfacesrequest/FishPond.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.demo.nonfacesrequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.SessionScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Named;
import java.io.Serializable;
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
diff --git a/tobago-example/tobago-example-spring-boot/pom.xml b/tobago-example/tobago-example-spring-boot/pom.xml
index 7f169a3..a181d25 100644
--- a/tobago-example/tobago-example-spring-boot/pom.xml
+++ b/tobago-example/tobago-example-spring-boot/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-spring-boot</artifactId>
<packaging>jar</packaging>
diff --git a/tobago-example/tobago-example-spring-boot/src/main/java/org/apache/myfaces/tobago/example/spring/HelloSpring.java b/tobago-example/tobago-example-spring-boot/src/main/java/org/apache/myfaces/tobago/example/spring/HelloSpring.java
index a8bfe8c..f83a667 100644
--- a/tobago-example/tobago-example-spring-boot/src/main/java/org/apache/myfaces/tobago/example/spring/HelloSpring.java
+++ b/tobago-example/tobago-example-spring-boot/src/main/java/org/apache/myfaces/tobago/example/spring/HelloSpring.java
@@ -22,8 +22,8 @@ package org.apache.myfaces.tobago.example.spring;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Named;
import java.lang.invoke.MethodHandles;
@Named
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index 83a9477..3822b90 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Themes</name>
diff --git a/tobago-theme/tobago-theme-charlotteville/pom.xml b/tobago-theme/tobago-theme-charlotteville/pom.xml
index ba60135..43da9f3 100644
--- a/tobago-theme/tobago-theme-charlotteville/pom.xml
+++ b/tobago-theme/tobago-theme-charlotteville/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-charlotteville</artifactId>
<name>Tobago Theme Charlotteville</name>
diff --git a/tobago-theme/tobago-theme-roxborough/pom.xml b/tobago-theme/tobago-theme-roxborough/pom.xml
index 5788d43..ba29768 100644
--- a/tobago-theme/tobago-theme-roxborough/pom.xml
+++ b/tobago-theme/tobago-theme-roxborough/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-roxborough</artifactId>
<packaging>jar</packaging>
diff --git a/tobago-theme/tobago-theme-scarborough/pom.xml b/tobago-theme/tobago-theme-scarborough/pom.xml
index 42d0791..5a8ab8e 100644
--- a/tobago-theme/tobago-theme-scarborough/pom.xml
+++ b/tobago-theme/tobago-theme-scarborough/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-scarborough</artifactId>
<packaging>jar</packaging>
diff --git a/tobago-theme/tobago-theme-speyside/pom.xml b/tobago-theme/tobago-theme-speyside/pom.xml
index 1be1fb3..fa12f40 100644
--- a/tobago-theme/tobago-theme-speyside/pom.xml
+++ b/tobago-theme/tobago-theme-speyside/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-speyside</artifactId>
<packaging>jar</packaging>
diff --git a/tobago-theme/tobago-theme-standard/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index fc2731b..dd4feaf 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-standard</artifactId>
<packaging>jar</packaging>
@@ -44,8 +44,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test23</artifactId>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-test</artifactId>
</dependency>
</dependencies>
diff --git a/tobago-tool/pom.xml b/tobago-tool/pom.xml
index 55b44cb..b2d589c0 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Tool</name>
diff --git a/tobago-tool/tobago-config-dev/pom.xml b/tobago-tool/tobago-config-dev/pom.xml
index 7d1e089..61e0c26 100644
--- a/tobago-tool/tobago-config-dev/pom.xml
+++ b/tobago-tool/tobago-config-dev/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-config-dev</artifactId>
diff --git a/tobago-tool/tobago-config-mojarra/pom.xml b/tobago-tool/tobago-config-mojarra/pom.xml
index 4cec62f..6b81f8e 100644
--- a/tobago-tool/tobago-config-mojarra/pom.xml
+++ b/tobago-tool/tobago-config-mojarra/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-config-mojarra</artifactId>
diff --git a/tobago-tool/tobago-config-myfaces/pom.xml b/tobago-tool/tobago-config-myfaces/pom.xml
index dcc7ca9..ad15110 100644
--- a/tobago-tool/tobago-config-myfaces/pom.xml
+++ b/tobago-tool/tobago-config-myfaces/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-config-myfaces</artifactId>
diff --git a/tobago-tool/tobago-config-owb/pom.xml b/tobago-tool/tobago-config-owb/pom.xml
index 7ddda3e..0ca9738 100644
--- a/tobago-tool/tobago-config-owb/pom.xml
+++ b/tobago-tool/tobago-config-owb/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-config-owb</artifactId>
@@ -29,10 +29,76 @@
<description>Includes the OWB activation listener.</description>
<dependencies>
+ <!-- openwebbeans -->
+<!-- XXX
+ it seems that the "classifier" tag breaks the call of
+ mvn dependency-check:check
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <classifier>jakarta</classifier>
<version>${openwebbeans.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ -->
</dependencies>
</project>
diff --git a/tobago-tool/tobago-tool-annotation/pom.xml b/tobago-tool/tobago-tool-annotation/pom.xml
index 0c1d839..9727e7c 100644
--- a/tobago-tool/tobago-tool-annotation/pom.xml
+++ b/tobago-tool/tobago-tool-annotation/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-tool-annotation</artifactId>
<packaging>jar</packaging>
diff --git a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
index ee929ab..9cefb96 100644
--- a/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
+++ b/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
@@ -37,7 +37,7 @@ public @interface UIComponentTag {
@Deprecated
String uiComponentBaseClass() default "";
- String uiComponentFacesClass() default "javax.faces.component.UIComponentBase";
+ String uiComponentFacesClass() default "jakarta.faces.component.UIComponentBase";
/**
* @deprecated since 4.4.0. Will set automatically.
diff --git a/tobago-tool/tobago-tool-apt/pom.xml b/tobago-tool/tobago-tool-apt/pom.xml
index c27e360..f9d3993 100644
--- a/tobago-tool/tobago-tool-apt/pom.xml
+++ b/tobago-tool/tobago-tool-apt/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>tobago-tool-apt</artifactId>
<packaging>jar</packaging>
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java
index 6da4b1d..1765666 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java
@@ -100,7 +100,7 @@ public class PropertyInfo {
}
public boolean isMethodExpression() {
- return "javax.el.MethodExpression".equals(type);
+ return "jakarta.el.MethodExpression".equals(type);
}
public String getShortType() {
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
index f118ff8..f0cdef4 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
@@ -34,7 +34,6 @@ import org.apache.myfaces.tobago.apt.generate.PropertyInfo;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.faces.component.UIComponent;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
@@ -42,6 +41,7 @@ import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.tools.FileObject;
+import jakarta.faces.component.UIComponent;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -189,7 +189,7 @@ public class ClassesGenerator extends AbstractGenerator {
final ComponentPropertyInfo componentPropertyInfo = (ComponentPropertyInfo) info.fill(new ComponentPropertyInfo());
componentInfo.addImport(componentPropertyInfo.getUnmodifiedType());
... 71 lines suppressed ...
[myfaces-tobago] 03/03: feat: Jakarta EE 9 support
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 9b8be5d04df6719416e40adcf69da9ee5684d24c
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Oct 8 14:57:17 2021 +0200
feat: Jakarta EE 9 support
* basic migration
* tested with Glassfish 6.2.2
* Jetty/TomEE/Tomcat profiles are NOT running, yet!
issue: TOBAGO-2094
---
.../org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java | 2 +-
.../apache/myfaces/tobago/internal/taglib/declaration/HasAction.java | 2 +-
.../tobago/internal/taglib/declaration/IsDisabledBySecurity.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java
index 0726655..596d214 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/SecurityAnnotation.java
@@ -20,7 +20,7 @@
package org.apache.myfaces.tobago.internal.config;
/**
- * Defines how Tobago should check security annotations like e. g. {@link javax.annotation.security.RolesAllowed}.
+ * Defines how Tobago should check security annotations like e. g. {@link jakarta.annotation.security.RolesAllowed}.
*/
public enum SecurityAnnotation {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
index 90e51d5..95a5418 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
@@ -30,7 +30,7 @@ public interface HasAction {
* this component is activated by the user.
* The {@link jakarta.el.MethodExpression} must evaluate to a public method that takes no parameters,
* and returns a {@link String} (the logical outcome) which is passed to the
- * {@link javax.faces.application.NavigationHandler} for this application.
+ * {@link jakarta.faces.application.NavigationHandler} for this application.
* The string is directly passed to the navigation handler.
*/
@TagAttribute
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDisabledBySecurity.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDisabledBySecurity.java
index f20e378..773a693 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDisabledBySecurity.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/IsDisabledBySecurity.java
@@ -25,8 +25,8 @@ import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface IsDisabledBySecurity {
/**
* Flag indicating that this element is disabled. If configured so in the tobago-config.xml the action will be
- * checked for the annotations {@link javax.annotation.security.RolesAllowed},
- * {@link javax.annotation.security.PermitAll} or {@link javax.annotation.security.DenyAll}.
+ * checked for the annotations {@link jakarta.annotation.security.RolesAllowed},
+ * {@link jakarta.annotation.security.PermitAll} or {@link jakarta.annotation.security.DenyAll}.
*/
@TagAttribute()
@UIComponentTagAttribute(type = "boolean", generate = false)