You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/06/19 11:51:13 UTC

[causeway-app-referenceapp] branch spring6 created (now 5f1ed90)

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git


      at 5f1ed90  moving 'demo app' from framework main repo into its own (branch: spring6)

This branch includes the following new commits:

     new 5f1ed90  moving 'demo app' from framework main repo into its own (branch: spring6)

The 1 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.



[causeway-app-referenceapp] 01/01: moving 'demo app' from framework main repo into its own (branch: spring6)

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git

commit 5f1ed90485c1dbf3ac37aef1387a820364606bbb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jun 19 13:51:06 2023 +0200

    moving 'demo app' from framework main repo into its own (branch:
    spring6)
---
 domain-tests/pom.xml                               |  6 ++---
 .../domain/tests/DomainIntrospectionTestJdo.java   |  2 +-
 .../domain/tests/DomainIntrospectionTestJpa.java   |  2 +-
 domain/pom.xml                                     |  2 +-
 .../HasAsciiDocDescription_description.java        |  2 +-
 .../HasAsciiDocDescription_sources.java            |  2 +-
 .../dom/_infra/fixtures/DemoFixtureScript.java     |  2 +-
 .../_infra/resources/AsciiDocConverterService.java |  4 ++--
 .../_infra/resources/AsciiDocReaderService.java    |  2 +-
 .../AsciiDocValueSemanticsWithPreprocessing.java   |  4 ++--
 .../_infra/resources/MarkdownReaderService.java    |  4 ++--
 .../dom/_infra/resources/MarkupReaderService.java  |  4 ++--
 .../resources/MarkupVariableResolverService.java   |  4 ++--
 .../_infra/resources/ResourceReaderService.java    |  4 ++--
 .../samples/asciidoc/CausewayAsciiDocSamples.java  |  2 +-
 .../samples/markdown/CausewayMarkdownSamples.java  |  2 +-
 .../dom/_infra/seed/SeedServiceAbstract.java       |  2 +-
 .../UrlEncodingServiceNaiveInMemory.java           |  6 ++---
 .../demoapp/dom/_infra/values/ValueHolder.java     |  2 +-
 .../dom/_infra/values/ValueHolderRepository.java   |  2 +-
 .../demoapp/dom/domain/_changes/ChangesVm.java     | 10 ++++-----
 .../_changes/ExposeCapturedChanges_clear.java      |  2 +-
 .../ExposeCapturedChanges_recentChanges.java       |  2 +-
 .../domain/_commands/ExposePersistedCommands.java  |  2 +-
 .../ExposePersistedCommands_commands.java          |  2 +-
 .../ExposePersistedExecutions_interactions.java    |  2 +-
 .../dom/domain/_interactions/InteractionDtoVm.java |  4 ++--
 .../ExposePropertyChanges_propertyChanges.java     |  2 +-
 .../dom/domain/actions/Action/ActionMenu.java      |  6 ++---
 .../ActionChoicesFromEntitySeeding.java            |  2 +-
 .../Action/choicesFrom/ActionChoicesFromPage.java  | 10 ++++-----
 .../choicesFrom/ActionChoicesFromPage_objects.java |  2 +-
 .../jdo/ActionChoicesFromEntityImpl.java           |  2 +-
 .../jpa/ActionChoicesFromEntityImpl.java           | 12 +++++-----
 .../ActionCommandPublishingEntitySeeding.java      |  2 +-
 ...nCommandPublishingEntity_publishedCommands.java |  2 +-
 .../ActionCommandPublishingPage.java               | 10 ++++-----
 ...mmandPublishingPage_changeNameNotPublished.java |  2 +-
 ...nCommandPublishingPage_changeNamePublished.java |  2 +-
 .../ActionCommandPublishingPage_objects.java       |  2 +-
 ...ionCommandPublishingPage_publishedCommands.java |  2 +-
 .../jdo/ActionCommandPublishingEntityImpl.java     |  2 +-
 .../jpa/ActionCommandPublishingEntityImpl.java     | 12 +++++-----
 .../ActionDomainEventControlSubscriber.java        |  2 +-
 .../Action/domainEvent/ActionDomainEventPage.java  | 12 +++++-----
 ...ctionDomainEventPage_changeControlStrategy.java |  2 +-
 .../ActionDomainEventPage_controlStrategy.java     |  2 +-
 .../ActionExecutionPublishingEntitySeeding.java    |  2 +-
 ...cutionPublishingEntity_publishedExecutions.java |  2 +-
 .../ActionExecutionPublishingPage.java             | 10 ++++-----
 ...utionPublishingPage_changeNameNotPublished.java |  2 +-
 ...xecutionPublishingPage_changeNamePublished.java |  2 +-
 ...nExecutionPublishingPage_changeNameWrapped.java |  2 +-
 .../ActionExecutionPublishingPage_objects.java     |  2 +-
 ...xecutionPublishingPage_publishedExecutions.java |  2 +-
 .../jdo/ActionExecutionPublishingEntityImpl.java   |  2 +-
 .../jpa/ActionExecutionPublishingEntityImpl.java   | 12 +++++-----
 .../Action/restrictTo/ActionRestrictToPage.java    | 12 +++++-----
 .../Action/semantics/ActionSemanticsPage.java      | 16 ++++++-------
 .../actions/Action/typeOf/ActionTypeOfPage.java    | 10 ++++-----
 .../Action/typeOf/child/ActionTypeOfChildVm.java   | 12 +++++-----
 .../actions/ActionLayout/ActionLayoutMenu.java     |  6 ++---
 .../ActionLayoutAssociateWithPage.java             | 12 +++++-----
 .../child/ActionLayoutAssociateWithChildVm.java    | 12 +++++-----
 .../cssClass/ActionLayoutCssClassPage.java         | 12 +++++-----
 .../cssClassFa/ActionLayoutCssClassFaPage.java     | 12 +++++-----
 .../describedAs/ActionLayoutDescribedAsPage.java   | 12 +++++-----
 .../child/ActionLayoutDescribedAsChildVm.java      | 12 +++++-----
 .../fieldSet/ActionLayoutFieldSetPage.java         | 12 +++++-----
 .../hidden/ActionLayoutHiddenEntitySeeding.java    |  2 +-
 .../hidden/ActionLayoutHiddenPage.java             | 10 ++++-----
 .../hidden/ActionLayoutHiddenPage_objects.java     |  2 +-
 .../hidden/jdo/ActionLayoutHiddenEntityImpl.java   |  2 +-
 .../hidden/jpa/ActionLayoutHiddenEntityImpl.java   | 12 +++++-----
 .../ActionLayout/named/ActionLayoutNamedPage.java  | 12 +++++-----
 .../position/ActionLayoutPositionPage.java         | 12 +++++-----
 .../promptStyle/ActionLayoutPromptStylePage.java   | 12 +++++-----
 .../ActionLayoutRedirectPolicyEntitySeeding.java   |  2 +-
 .../ActionLayoutRedirectPolicyPage.java            | 10 ++++-----
 .../ActionLayoutRedirectPolicyPage_objects.java    |  2 +-
 .../jdo/ActionLayoutRedirectPolicyEntityImpl.java  |  2 +-
 ...onLayoutRedirectPolicyEntityImplRepository.java |  2 +-
 .../jpa/ActionLayoutRedirectPolicyEntityImpl.java  | 26 +++++++++++++---------
 ...onLayoutRedirectPolicyEntityImplRepository.java |  2 +-
 .../sequence/ActionLayoutSequencePage.java         | 12 +++++-----
 .../ActionLayoutSequencePage_noopSeqX.java         |  2 +-
 .../ActionLayoutSequencePage_noopSeqY.java         |  2 +-
 .../child/ActionLayoutSequenceChildVm.java         |  4 ++--
 .../collections/Collection/CollectionMenu.java     |  6 ++---
 .../CollectionDomainEventControlSubscriber.java    |  2 +-
 .../domainEvent/CollectionDomainEventPage.java     | 14 ++++++------
 ...ctionDomainEventPage_changeControlStrategy.java |  2 +-
 .../CollectionDomainEventPage_controlStrategy.java |  2 +-
 .../child/CollectionDomainEventChildVm.java        | 12 +++++-----
 .../Collection/typeOf/CollectionTypeOfPage.java    | 10 ++++-----
 .../typeOf/child/CollectionTypeOfChildVm.java      | 15 ++++++-------
 .../CollectionLayout/CollectionLayoutMenu.java     |  6 ++---
 .../cssClass/CollectionLayoutCssClassPage.java     | 14 ++++++------
 .../child/CollectionLayoutCssClassChildVm.java     | 12 +++++-----
 .../CollectionLayoutDefaultViewPage.java           | 14 ++++++------
 .../child/CollectionLayoutDefaultViewChildVm.java  | 12 +++++-----
 .../CollectionLayoutDescribedAsPage.java           | 14 ++++++------
 .../child/CollectionLayoutDescribedAsChildVm.java  |  4 ++--
 .../hidden/CollectionLayoutHiddenPage.java         | 14 ++++++------
 .../child/CollectionLayoutHiddenChildVm.java       | 12 +++++-----
 .../named/CollectionLayoutNamedPage.java           | 14 ++++++------
 .../named/child/CollectionLayoutNamedChildVm.java  | 12 +++++-----
 .../paged/CollectionLayoutPagedPage.java           | 14 ++++++------
 .../paged/child/CollectionLayoutPagedChildVm.java  | 12 +++++-----
 .../sequence/CollectionLayoutSequencePage.java     | 14 ++++++------
 .../child/CollectionLayoutSequenceChildVm.java     |  4 ++--
 .../sortedBy/CollectionLayoutSortedByPage.java     | 14 ++++++------
 .../child/CollectionLayoutSortedByChildVm.java     | 12 +++++-----
 .../CollectionLayoutTableDecoratorPage.java        | 14 ++++++------
 .../CollectionLayoutTableDecoratorChildVm.java     | 12 +++++-----
 .../objects/DomainObject/DomainObjectMenu.java     |  6 ++---
 .../aliased/DomainObjectAliasedEntity.java         |  2 +-
 .../aliased/DomainObjectAliasedEntitySeeding.java  |  2 +-
 .../aliased/DomainObjectAliasedPage.java           | 10 ++++-----
 .../aliased/DomainObjectAliasedPage_lookup.java    |  2 +-
 .../aliased/DomainObjectAliasedPage_objects.java   |  2 +-
 .../aliased/jdo/DomainObjectAliasedEntityImpl.java |  2 +-
 .../aliased/jpa/DomainObjectAliasedEntityImpl.java | 12 +++++-----
 .../DomainObjectAutoCompleteEntity.java            |  2 +-
 .../DomainObjectAutoCompleteEntitySeeding.java     |  2 +-
 .../autoComplete/DomainObjectAutoCompletePage.java | 10 ++++-----
 .../DomainObjectAutoCompletePage_characters.java   |  2 +-
 .../jdo/DomainObjectAutoCompleteEntityImpl.java    |  2 +-
 ...mainObjectAutoCompleteEntityImplRepository.java |  2 +-
 .../jpa/DomainObjectAutoCompleteEntityImpl.java    | 12 +++++-----
 ...mainObjectAutoCompleteEntityImplRepository.java |  2 +-
 .../bounded/DomainObjectBoundingEntitySeeding.java |  2 +-
 .../bounded/DomainObjectBoundingPage.java          | 10 ++++-----
 .../bounded/DomainObjectBoundingPage_objects.java  |  2 +-
 .../jdo/DomainObjectBoundingEntityImpl.java        |  2 +-
 .../jpa/DomainObjectBoundingEntityImpl.java        | 12 +++++-----
 .../editing/DomainObjectEditingEntitySeeding.java  |  2 +-
 .../editing/DomainObjectEditingPage.java           | 10 ++++-----
 .../editing/DomainObjectEditingPage_objects.java   |  2 +-
 .../editing/jdo/DomainObjectEditingEntityImpl.java |  2 +-
 .../editing/jpa/DomainObjectEditingEntityImpl.java | 12 +++++-----
 .../DomainObjectEntityChangePublishingEntity.java  |  2 +-
 ...nObjectEntityChangePublishingEntitySeeding.java |  2 +-
 .../DomainObjectEntityChangePublishingPage.java    | 10 ++++-----
 ...ainObjectEntityChangePublishingPage_modify.java |  2 +-
 ...inObjectEntityChangePublishingPage_objects.java |  2 +-
 ...mainObjectEntityChangePublishingEntityImpl.java |  2 +-
 ...mainObjectEntityChangePublishingEntityImpl.java | 12 +++++-----
 .../DomainObjectIntrospectionPage.java             | 10 ++++-----
 ...ObjectIntrospectionPage_annotationOptional.java |  2 +-
 ...ObjectIntrospectionPage_annotationRequired.java |  2 +-
 ...inObjectIntrospectionAnnotOptEntitySeeding.java |  2 +-
 ...omainObjectIntrospectionAnnotOptEntityImpl.java |  2 +-
 ...omainObjectIntrospectionAnnotOptEntityImpl.java | 12 +++++-----
 ...nObjectIntrospectionAnnotReqdEntitySeeding.java |  2 +-
 ...mainObjectIntrospectionAnnotReqdEntityImpl.java |  2 +-
 ...mainObjectIntrospectionAnnotReqdEntityImpl.java | 12 +++++-----
 ...jectIntrospectionEncapsulatedEntitySeeding.java |  2 +-
 ...nObjectIntrospectionEncapsulatedEntityImpl.java |  2 +-
 ...jectIntrospectionPage_encapsulationEnabled.java |  2 +-
 ...nObjectIntrospectionEncapsulatedEntityImpl.java | 12 +++++-----
 ...jectIntrospectionPage_encapsulationEnabled.java |  2 +-
 .../DomainObjectMixinMethodEntitySeeding.java      |  2 +-
 .../mixinMethod/DomainObjectMixinMethodPage.java   | 10 ++++-----
 .../DomainObjectMixinMethodPage_objects.java       |  2 +-
 .../DomainObjectMixinMethodPage_updateName.java    |  2 +-
 .../jdo/DomainObjectMixinMethodEntityImpl.java     |  2 +-
 .../jpa/DomainObjectMixinMethodEntityImpl.java     | 12 +++++-----
 .../nature/DomainObjectNaturePage.java             | 10 ++++-----
 .../nature/DomainObjectNaturePage_entities.java    |  2 +-
 .../nature/DomainObjectNaturePage_viewModels.java  |  2 +-
 .../entity/DomainObjectNatureEntitySeeding.java    |  2 +-
 .../entity/jdo/DomainObjectNatureEntityImpl.java   |  4 ++--
 .../entity/jpa/DomainObjectNatureEntityImpl.java   | 14 ++++++------
 .../viewmodel/DomainObjectNatureViewModel.java     | 18 +++++++--------
 ...omainObjectXxxDomainEventControlSubscriber.java |  2 +-
 .../DomainObjectXxxDomainEventPage.java            | 14 ++++++------
 ...ctXxxDomainEventPage_changeControlStrategy.java |  2 +-
 ...inObjectXxxDomainEventPage_controlStrategy.java |  2 +-
 .../child/DomainObjectXxxDomainEventChildVm.java   | 12 +++++-----
 .../DomainObjectLifecycleEventVm.java              | 12 +++++-----
 .../DomainObjectXxxLifecycleEventPage.java         | 12 +++++-----
 ...ainObjectXxxLifecycleEventPage_clearEvents.java |  2 +-
 ...inObjectXxxLifecycleEventPage_createEntity.java |  2 +-
 ...inObjectXxxLifecycleEventPage_deleteEntity.java |  2 +-
 .../DomainObjectXxxLifecycleEventPage_events.java  |  2 +-
 .../DomainObjectXxxLifecycleEventSubscriber.java   |  2 +-
 .../DomainObjectXxxLifecycleEventEntityImpl.java   |  2 +-
 .../DomainObjectXxxLifecycleEventEntityImpl.java   | 12 +++++-----
 .../DomainObjectLayout/DomainObjectLayoutMenu.java |  4 ++--
 ...DomainObjectLayoutBookmarkingEntitySeeding.java |  2 +-
 .../DomainObjectLayoutBookmarkingNestedVm.java     | 12 +++++-----
 .../DomainObjectLayoutBookmarkingPage.java         | 10 ++++-----
 .../DomainObjectLayoutBookmarkingPage_objects.java |  2 +-
 .../DomainObjectLayoutBookmarking_addChildren.java |  2 +-
 ...mainObjectLayoutBookmarkingChildEntityImpl.java |  6 ++---
 .../DomainObjectLayoutBookmarkingEntityImpl.java   |  2 +-
 ...mainObjectLayoutBookmarkingChildEntityImpl.java | 16 ++++++-------
 .../DomainObjectLayoutBookmarkingEntityImpl.java   | 16 ++++++-------
 .../DomainObjectLayoutCssClassEntitySeeding.java   |  2 +-
 .../cssClass/DomainObjectLayoutCssClassPage.java   | 10 ++++-----
 .../DomainObjectLayoutCssClassPage_objects.java    |  2 +-
 .../jdo/DomainObjectLayoutCssClassEntityImpl.java  |  2 +-
 .../jpa/DomainObjectLayoutCssClassEntityImpl.java  | 12 +++++-----
 .../DomainObjectLayoutCssClassFaEntitySeeding.java |  2 +-
 .../DomainObjectLayoutCssClassFaPage.java          | 10 ++++-----
 .../DomainObjectLayoutCssClassFaPage_objects.java  |  2 +-
 .../DomainObjectLayoutCssClassFaEntityImpl.java    |  2 +-
 .../DomainObjectLayoutCssClassFaEntityImpl.java    | 12 +++++-----
 ...DomainObjectLayoutDescribedAsEntitySeeding.java |  2 +-
 .../DomainObjectLayoutDescribedAsPage.java         | 10 ++++-----
 .../DomainObjectLayoutDescribedAsPage_objects.java |  2 +-
 .../DomainObjectLayoutDescribedAsEntityImpl.java   |  2 +-
 .../DomainObjectLayoutDescribedAsEntityImpl.java   | 12 +++++-----
 .../DomainObjectLayoutNamedEntitySeeding.java      |  2 +-
 .../named/DomainObjectLayoutNamedPage.java         | 10 ++++-----
 .../named/DomainObjectLayoutNamedPage_objects.java |  2 +-
 .../jdo/DomainObjectLayoutNamedEntityImpl.java     |  2 +-
 .../jpa/DomainObjectLayoutNamedEntityImpl.java     | 12 +++++-----
 .../DomainObjectLayoutPagedEntitySeeding.java      |  2 +-
 .../paged/DomainObjectLayoutPagedPage.java         | 10 ++++-----
 ...jectLayoutPagedPage_actionReturningObjects.java |  2 +-
 .../paged/DomainObjectLayoutPagedPage_objects.java |  2 +-
 .../jdo/DomainObjectLayoutPagedEntityImpl.java     |  2 +-
 .../jpa/DomainObjectLayoutPagedEntityImpl.java     | 12 +++++-----
 ...ainObjectLayoutTableDecoratorEntitySeeding.java |  2 +-
 .../DomainObjectLayoutTableDecoratorPage.java      | 10 ++++-----
 ...tTableDecoratorPage_actionReturningObjects.java |  2 +-
 ...mainObjectLayoutTableDecoratorPage_objects.java |  2 +-
 ...DomainObjectLayoutTableDecoratorEntityImpl.java |  2 +-
 ...DomainObjectLayoutTableDecoratorEntityImpl.java | 12 +++++-----
 .../DomainObjectLayoutXxxUiEventEntitySeeding.java |  2 +-
 .../DomainObjectLayoutXxxUiEventPage.java          | 10 ++++-----
 .../DomainObjectLayoutXxxUiEventPage_objects.java  |  2 +-
 .../DomainObjectLayoutXxxUiEventSubscriber.java    |  4 ++--
 .../DomainObjectLayoutXxxUiEventEntityImpl.java    |  2 +-
 .../DomainObjectLayoutXxxUiEventEntityImpl.java    | 12 +++++-----
 .../domain/properties/Property/PropertyMenu.java   |  6 ++---
 .../PropertyCommandPublishingEntitySeeding.java    |  2 +-
 ...yCommandPublishingEntity_publishedCommands.java |  2 +-
 .../PropertyCommandPublishingPage.java             | 10 ++++-----
 .../PropertyCommandPublishingPage_objects.java     |  2 +-
 .../jdo/PropertyCommandPublishingEntityImpl.java   |  2 +-
 .../jpa/PropertyCommandPublishingEntityImpl.java   | 12 +++++-----
 .../PropertyDomainEventControlSubscriber.java      |  2 +-
 .../domainEvent/PropertyDomainEventPage.java       | 12 +++++-----
 ...pertyDomainEventPage_changeControlStrategy.java |  2 +-
 .../PropertyDomainEventPage_controlStrategy.java   |  2 +-
 .../editing/PropertyEditingEntitySeeding.java      |  2 +-
 .../Property/editing/PropertyEditingPage.java      | 10 ++++-----
 .../editing/PropertyEditingPage_objects.java       |  2 +-
 .../editing/jdo/PropertyEditingEntityImpl.java     |  2 +-
 .../editing/jpa/PropertyEditingEntityImpl.java     | 12 +++++-----
 .../PropertyExecutionPublishingEntitySeeding.java  |  2 +-
 ...cutionPublishingEntity_publishedExecutions.java |  2 +-
 .../PropertyExecutionPublishingPage.java           | 10 ++++-----
 .../PropertyExecutionPublishingPage_objects.java   |  2 +-
 .../jdo/PropertyExecutionPublishingEntityImpl.java |  2 +-
 .../jpa/PropertyExecutionPublishingEntityImpl.java | 12 +++++-----
 .../fileAccept/PropertyFileAcceptPage.java         | 12 +++++-----
 .../Property/maxLength/PropertyMaxLengthPage.java  | 12 +++++-----
 .../mustSatisfy/PropertyMustSatisfyPage.java       | 12 +++++-----
 .../optionality/PropertyOptionalityPage.java       | 12 +++++-----
 .../projecting/PropertyProjectingChildEntity.java  |  4 ++--
 .../PropertyProjectingChildEntitySeeding.java      |  2 +-
 .../projecting/PropertyProjectingChildVm.java      | 12 +++++-----
 .../projecting/PropertyProjectingPage.java         | 14 ++++++------
 .../jdo/PropertyProjectingChildEntityImpl.java     |  4 ++--
 .../jpa/PropertyProjectingChildEntityImpl.java     | 14 ++++++------
 .../regexPattern/PropertyRegexPatternPage.java     | 12 +++++-----
 .../snapshot/PropertySnapshotEntitySeeding.java    |  2 +-
 .../Property/snapshot/PropertySnapshotPage.java    | 12 +++++-----
 .../snapshot/PropertySnapshotPage_friends.java     |  2 +-
 .../PropertySnapshotPage_takeXmlSnapshot.java      |  2 +-
 .../snapshot/jdo/PropertySnapshotEntityImpl.java   |  2 +-
 .../snapshot/jpa/PropertySnapshotEntityImpl.java   | 12 +++++-----
 .../PropertyLayout/PropertyLayoutMenu.java         |  6 ++---
 .../cssClass/PropertyLayoutCssClassPage.java       | 12 +++++-----
 .../describedAs/PropertyLayoutDescribedAsPage.java | 12 +++++-----
 .../hidden/PropertyLayoutHiddenPage.java           | 10 ++++-----
 .../hidden/PropertyLayoutHiddenPage_objects.java   |  2 +-
 .../hidden/PropertyLayoutHiddenSeeding.java        |  2 +-
 .../hidden/jdo/PropertyLayoutHiddenEntityImpl.java |  2 +-
 .../hidden/jpa/PropertyLayoutHiddenEntityImpl.java | 12 +++++-----
 .../PropertyLayoutLabelPositionPage.java           | 12 +++++-----
 .../multiLine/PropertyLayoutMultiLinePage.java     | 12 +++++-----
 .../named/PropertyLayoutNamedPage.java             | 12 +++++-----
 .../PropertyLayout/navigable/FileNodeVm.java       |  4 ++--
 .../PropertyLayout/navigable/FileNodeVm_tree.java  |  2 +-
 .../navigable/FileTreeNodeService.java             |  8 +++----
 .../repainting/PropertyLayoutRepaintingPage.java   | 10 ++++-----
 .../PropertyLayoutTypicalLengthPage.java           | 12 +++++-----
 .../ValueSemantics/ValueSemanticsMenu.java         |  9 ++++----
 .../ValueSemanticsDateRenderAdjustDaysPage.java    | 14 ++++++------
 ...ticsDateRenderAdjustDaysPage_downloadAsXml.java |  2 +-
 .../ValueSemanticsProviderForPercentage.java       |  4 ++--
 .../ValueSemanticsProviderPercentagePage.java      | 12 +++++-----
 .../java/demoapp/dom/featured/FeaturedMenu.java    |  6 ++---
 .../causewayext/cal/CalendarEventsMenu.java        |  5 ++---
 .../causewayext/cal/CalendarEventsPage.java        | 14 ++++++------
 .../cal/holder/CausewayCalendarEventHolder.java    |  2 +-
 ...endarEventHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...ntHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../cal/jdo/CausewayCalendarEventJdo.java          |  2 +-
 .../cal/jpa/CausewayCalendarEventJpa.java          | 14 ++++++------
 .../persistence/CausewayCalendarEventEntity.java   |  2 +-
 .../persistence/CausewayCalendarEventSeeding.java  |  2 +-
 .../cal/vm/CausewayCalendarEventVm.java            | 12 +++++-----
 .../dom/featured/causewayext/sse/DemoTask.java     |  2 +-
 .../dom/featured/causewayext/sse/SseDemoMenu.java  |  6 ++---
 .../dom/featured/causewayext/sse/SseDemoPage.java  | 18 +++++++--------
 .../dom/featured/customui/GeoapifyClient.java      |  2 +-
 .../dom/featured/customui/WhereInTheWorldPage.java | 10 ++++-----
 .../dom/featured/layout/tooltip/DemoItem.java      |  2 +-
 .../dom/featured/layout/tooltip/TooltipPage.java   | 14 ++++++------
 .../java/demoapp/dom/homepage/DemoHomePage.java    |  4 ++--
 .../demoapp/dom/progmodel/actions/TvCharacter.java |  2 +-
 .../autocomplete/ActionAutoCompleteMenu.java       |  6 ++---
 .../autocomplete/ActionAutoCompletePage.java       | 14 ++++++------
 .../actions/bulk/BulkActionItemEntity.java         |  2 +-
 .../actions/bulk/BulkActionItemEntitySeeding.java  |  2 +-
 .../dom/progmodel/actions/bulk/BulkActionMenu.java |  6 ++---
 .../dom/progmodel/actions/bulk/BulkActionPage.java | 14 ++++++------
 .../actions/bulk/jdo/BulkActionItemEntityImpl.java |  4 ++--
 .../actions/bulk/jpa/BulkActionItemEntityImpl.java | 14 ++++++------
 .../actions/choices/ActionChoicesMenu.java         |  6 ++---
 .../actions/choices/ActionChoicesPage.java         | 14 ++++++------
 .../actions/defaults/ActionDefaultsMenu.java       |  6 ++---
 .../actions/defaults/ActionDefaultsPage.java       | 14 ++++++------
 .../actions/validate/ActionValidateMenu.java       |  6 ++---
 .../actions/validate/ActionValidatePage.java       | 14 ++++++------
 .../dom/progmodel/actions/veto/ActionVetoMenu.java |  6 ++---
 .../dom/progmodel/actions/veto/ActionVetoPage.java | 14 ++++++------
 .../ComplexNumberValueSemantics.java               |  2 +-
 .../compositevalues/CompositeValueTypeMenu.java    |  6 ++---
 .../compositevalues/CompositeValueTypePage.java    |  2 +-
 .../customvalues/EmailAddressValueSemantics.java   |  2 +-
 .../customvalues/ScalarValueTypeMenu.java          |  6 ++---
 .../customvalues/ScalarValueTypePage.java          |  2 +-
 .../embeddedvalues/NumberConstantEntity.java       |  2 +-
 .../embeddedvalues/NumberConstantSeeding.java      |  2 +-
 .../jdo/ComplexNumberJdoValueSemantics.java        |  2 +-
 .../embeddedvalues/jdo/EmbeddedTypeMenuJdo.java    |  6 ++---
 .../embeddedvalues/jdo/EmbeddedTypePageJdo.java    |  4 ++--
 .../embeddedvalues/jdo/NumberConstantJdo.java      |  2 +-
 .../embeddedvalues/jpa/ComplexNumberJpa.java       |  6 ++---
 .../jpa/ComplexNumberJpaValueSemantics.java        |  2 +-
 .../embeddedvalues/jpa/EmbeddedTypeMenuJpa.java    |  6 ++---
 .../embeddedvalues/jpa/EmbeddedTypePageJpa.java    |  4 ++--
 .../embeddedvalues/jpa/NumberConstantJpa.java      | 14 ++++++------
 .../demoapp/dom/progmodel/mixins/CountHolder.java  |  2 +-
 .../dom/progmodel/mixins/FibonacciNumberVm.java    |  2 +-
 .../demoapp/dom/progmodel/mixins/MixinMenu.java    |  4 ++--
 .../demoapp/dom/progmodel/mixins/MixinPage.java    | 10 ++++-----
 .../demoapp/dom/progmodel/uihints/UiHintsMenu.java |  4 ++--
 .../demoapp/dom/services/core/ServicesMenu.java    | 12 +++++-----
 .../ErrorReportingServiceDemoPage.java             | 10 ++++-----
 .../ErrorReportingServiceForDemo.java              |  2 +-
 .../eventbusservice/EventBusServiceDemoPage.java   |  4 ++--
 .../core/eventbusservice/EventLogEntry.java        |  2 +-
 .../core/eventbusservice/EventLogEntryJdo.java     |  2 +-
 .../EventLogEntryJdoRepository.java                |  4 ++--
 .../core/eventbusservice/EventLogEntryJpa.java     | 14 ++++++------
 .../EventLogEntryJpaRepository.java                |  4 ++--
 .../eventbusservice/EventSubscriberForDemo.java    |  4 ++--
 .../messageservice/MessageServiceDemoPage.java     |  4 ++--
 .../services/core/wrapperFactory/PrimeNumber.java  |  2 +-
 .../core/wrapperFactory/PrimeNumberGenerator.java  |  4 ++--
 .../wrapperFactory/WrapperFactoryDemoPage.java     | 10 ++++-----
 .../WrapperFactoryDemoPage_createPrimes.java       |  2 +-
 .../WrapperFactoryDemoPage_primeNumbers.java       |  2 +-
 .../core/wrapperFactory/jdo/PrimeNumberJdo.java    |  2 +-
 .../core/wrapperFactory/jpa/PrimeNumberJpa.java    | 14 ++++++------
 .../services/extensions/secman/ExtSecManMenu.java  |  4 ++--
 .../secman/apptenancy/AppTenancyPage.java          | 14 ++++++------
 .../secman/apptenancy/jdo/TenantedJdo.java         |  2 +-
 .../secman/apptenancy/jpa/TenantedJpa.java         | 12 +++++-----
 .../apptenancy/persistence/TenantedEntity.java     |  2 +-
 .../apptenancy/persistence/TenantedSeeding.java    |  2 +-
 .../dom/types/causeway/CausewayTypesMenu.java      |  4 ++--
 .../dom/types/causeway/blobs/CausewayBlobs.java    | 14 ++++++------
 .../causeway/blobs/holder/CausewayBlobHolder.java  |  2 +-
 ...usewayBlobHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...obHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/causeway/blobs/jdo/CausewayBlobJdo.java  |  2 +-
 .../types/causeway/blobs/jpa/CausewayBlobJpa.java  | 20 ++++++++---------
 .../blobs/persistence/CausewayBlobEntity.java      |  2 +-
 .../blobs/persistence/CausewayBlobSeeding.java     |  2 +-
 .../types/causeway/blobs/vm/CausewayBlobVm.java    | 12 +++++-----
 .../dom/types/causeway/clobs/CausewayClobs.java    | 14 ++++++------
 .../causeway/clobs/holder/CausewayClobHolder.java  |  2 +-
 ...usewayClobHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...obHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/causeway/clobs/jdo/CausewayClobJdo.java  |  2 +-
 .../types/causeway/clobs/jpa/CausewayClobJpa.java  | 20 ++++++++---------
 .../clobs/persistence/CausewayClobEntity.java      |  2 +-
 .../clobs/persistence/CausewayClobSeeding.java     |  2 +-
 .../types/causeway/clobs/vm/CausewayClobVm.java    | 12 +++++-----
 .../CausewayLocalResourcePaths.java                | 14 ++++++------
 .../holder/CausewayLocalResourcePathHolder.java    |  2 +-
 ...sourcePathHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...thHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jdo/CausewayLocalResourcePathJdo.java          |  2 +-
 .../jpa/CausewayLocalResourcePathJpa.java          | 14 ++++++------
 .../CausewayLocalResourcePathEntity.java           |  2 +-
 .../CausewayLocalResourcePathSeeding.java          |  2 +-
 .../vm/CausewayLocalResourcePathVm.java            | 12 +++++-----
 .../types/causeway/markups/CausewayMarkups.java    | 14 ++++++------
 .../markups/holder/CausewayMarkupHolder.java       |  2 +-
 ...ewayMarkupHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...upHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../causeway/markups/jdo/CausewayMarkupJdo.java    |  2 +-
 .../causeway/markups/jpa/CausewayMarkupJpa.java    | 20 ++++++++---------
 .../markups/persistence/CausewayMarkupEntity.java  |  2 +-
 .../markups/persistence/CausewayMarkupSeeding.java |  2 +-
 .../causeway/markups/vm/CausewayMarkupVm.java      | 12 +++++-----
 .../causeway/passwords/CausewayPasswords.java      | 14 ++++++------
 .../passwords/holder/CausewayPasswordHolder.java   |  2 +-
 ...ayPasswordHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...rdHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../passwords/jdo/CausewayPasswordJdo.java         |  2 +-
 .../passwords/jpa/CausewayPasswordJpa.java         | 14 ++++++------
 .../persistence/CausewayPasswordEntity.java        |  2 +-
 .../CausewayPasswordEntity_checkPassword.java      |  2 +-
 .../CausewayPasswordEntity_showPassword.java       |  2 +-
 .../persistence/CausewayPasswordSeeding.java       |  2 +-
 .../causeway/passwords/vm/CausewayPasswordVm.java  | 14 ++++++------
 .../dom/types/causeway/treenode/FileNodeVm.java    |  4 ++--
 .../types/causeway/treenode/FileNodeVm_tree.java   |  2 +-
 .../causeway/treenode/FileTreeNodeService.java     |  8 +++----
 .../types/causewayval/CausewayValTypesMenu.java    |  4 ++--
 .../causewayval/asciidocs/CausewayAsciiDocs.java   | 14 ++++++------
 .../asciidocs/holder/CausewayAsciiDocHolder.java   |  2 +-
 ...ayAsciiDocHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...ocHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../asciidocs/jdo/CausewayAsciiDocJdo.java         |  2 +-
 .../asciidocs/jpa/CausewayAsciiDocJpa.java         | 20 ++++++++---------
 .../persistence/CausewayAsciiDocEntity.java        |  2 +-
 .../persistence/CausewayAsciiDocSeeding.java       |  2 +-
 .../asciidocs/vm/CausewayAsciiDocVm.java           | 12 +++++-----
 .../causewayval/markdowns/CausewayMarkdowns.java   | 14 ++++++------
 .../markdowns/holder/CausewayMarkdownHolder.java   |  2 +-
 ...ayMarkdownHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...wnHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../markdowns/jdo/CausewayMarkdownJdo.java         |  2 +-
 .../markdowns/jpa/CausewayMarkdownJpa.java         | 20 ++++++++---------
 .../persistence/CausewayMarkdownEntity.java        |  2 +-
 .../persistence/CausewayMarkdownSeeding.java       |  2 +-
 .../markdowns/vm/CausewayMarkdownVm.java           | 12 +++++-----
 .../dom/types/causewayval/vegas/CausewayVegas.java | 14 ++++++------
 .../vegas/holder/CausewayVegaHolder.java           |  2 +-
 ...usewayVegaHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...gaHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../causewayval/vegas/jdo/CausewayVegaJdo.java     |  2 +-
 .../causewayval/vegas/jpa/CausewayVegaJpa.java     | 20 ++++++++---------
 .../vegas/persistence/CausewayVegaEntity.java      |  2 +-
 .../vegas/persistence/CausewayVegaSeeding.java     |  2 +-
 .../types/causewayval/vegas/vm/CausewayVegaVm.java | 12 +++++-----
 .../dom/types/javaawt/JavaAwtTypesMenu.java        |  4 ++--
 .../dom/types/javaawt/images/BufferedImages.java   | 14 ++++++------
 .../javaawt/images/holder/BufferedImageHolder.java |  2 +-
 ...feredImageHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...geHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../images/holder/JavaAwtBufferedImageHolder.java  |  2 +-
 ...feredImageHolder_actionReturningCollection.java |  2 +-
 ...geHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/javaawt/images/jdo/BufferedImageJdo.java |  2 +-
 .../types/javaawt/images/jpa/BufferedImageJpa.java | 14 ++++++------
 .../images/persistence/BufferedImageEntity.java    |  2 +-
 .../images/persistence/BufferedImageSeeding.java   |  2 +-
 .../samples/JavaAwtBufferedImagesSamples.java      |  2 +-
 .../dom/types/javalang/JavaLangTypesMenu.java      |  4 ++--
 .../types/javalang/JavaLangWrapperTypesMenu.java   |  4 ++--
 .../types/javalang/booleans/WrapperBooleans.java   | 14 ++++++------
 .../booleans/holder/WrapperBooleanHolder.java      |  2 +-
 ...perBooleanHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...anHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javalang/booleans/jdo/WrapperBooleanJdo.java   |  2 +-
 .../javalang/booleans/jpa/WrapperBooleanJpa.java   | 14 ++++++------
 .../booleans/persistence/WrapperBooleanEntity.java |  2 +-
 .../persistence/WrapperBooleanSeeding.java         |  2 +-
 .../javalang/booleans/vm/WrapperBooleanVm.java     | 12 +++++-----
 .../dom/types/javalang/bytes/WrapperBytes.java     | 14 ++++++------
 .../javalang/bytes/holder/WrapperByteHolder.java   |  2 +-
 ...rapperByteHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/javalang/bytes/jdo/WrapperByteJdo.java   |  2 +-
 .../types/javalang/bytes/jpa/WrapperByteJpa.java   | 14 ++++++------
 .../bytes/persistence/WrapperByteEntity.java       |  2 +-
 .../bytes/persistence/WrapperByteSeeding.java      |  2 +-
 .../dom/types/javalang/bytes/vm/WrapperByteVm.java | 12 +++++-----
 .../javalang/characters/WrapperCharacters.java     | 14 ++++++------
 .../characters/holder/WrapperCharacterHolder.java  |  2 +-
 ...rCharacterHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...erHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../characters/jdo/WrapperCharacterJdo.java        |  2 +-
 .../characters/jpa/WrapperCharacterJpa.java        | 14 ++++++------
 .../persistence/WrapperCharacterEntity.java        |  2 +-
 .../persistence/WrapperCharacterSeeding.java       |  2 +-
 .../javalang/characters/vm/WrapperCharacterVm.java | 12 +++++-----
 .../dom/types/javalang/doubles/WrapperDoubles.java | 14 ++++++------
 .../doubles/holder/WrapperDoubleHolder.java        |  2 +-
 ...pperDoubleHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...leHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javalang/doubles/jdo/WrapperDoubleJdo.java     |  2 +-
 .../javalang/doubles/jpa/WrapperDoubleJpa.java     | 14 ++++++------
 .../doubles/persistence/WrapperDoubleEntity.java   |  2 +-
 .../doubles/persistence/WrapperDoubleSeeding.java  |  2 +-
 .../types/javalang/doubles/vm/WrapperDoubleVm.java | 12 +++++-----
 .../dom/types/javalang/enums/JavaLangEnums.java    | 14 ++++++------
 .../javalang/enums/holder/JavaLangEnumHolder.java  |  2 +-
 ...vaLangEnumHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...umHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/javalang/enums/jdo/JavaLangEnumJdo.java  |  2 +-
 .../types/javalang/enums/jpa/JavaLangEnumJpa.java  | 14 ++++++------
 .../enums/persistence/JavaLangEnumEntity.java      |  2 +-
 .../enums/persistence/JavaLangEnumSeeding.java     |  2 +-
 .../types/javalang/enums/vm/JavaLangEnumVm.java    | 12 +++++-----
 .../dom/types/javalang/floats/WrapperFloats.java   | 14 ++++++------
 .../javalang/floats/holder/WrapperFloatHolder.java |  2 +-
 ...apperFloatHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...atHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/javalang/floats/jdo/WrapperFloatJdo.java |  2 +-
 .../types/javalang/floats/jpa/WrapperFloatJpa.java | 14 ++++++------
 .../floats/persistence/WrapperFloatEntity.java     |  2 +-
 .../floats/persistence/WrapperFloatSeeding.java    |  2 +-
 .../types/javalang/floats/vm/WrapperFloatVm.java   | 12 +++++-----
 .../types/javalang/integers/WrapperIntegers.java   | 14 ++++++------
 .../integers/holder/WrapperIntegerHolder.java      |  2 +-
 ...perIntegerHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...erHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javalang/integers/jdo/WrapperIntegerJdo.java   |  2 +-
 .../javalang/integers/jpa/WrapperIntegerJpa.java   | 14 ++++++------
 .../integers/persistence/WrapperIntegerEntity.java |  2 +-
 .../persistence/WrapperIntegerSeeding.java         |  2 +-
 .../javalang/integers/vm/WrapperIntegerVm.java     | 12 +++++-----
 .../dom/types/javalang/longs/WrapperLongs.java     | 14 ++++++------
 .../javalang/longs/holder/WrapperLongHolder.java   |  2 +-
 ...rapperLongHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/javalang/longs/jdo/WrapperLongJdo.java   |  2 +-
 .../types/javalang/longs/jpa/WrapperLongJpa.java   | 14 ++++++------
 .../longs/persistence/WrapperLongEntity.java       |  2 +-
 .../longs/persistence/WrapperLongSeeding.java      |  2 +-
 .../dom/types/javalang/longs/vm/WrapperLongVm.java | 12 +++++-----
 .../dom/types/javalang/shorts/WrapperShorts.java   | 14 ++++++------
 .../javalang/shorts/holder/WrapperShortHolder.java |  2 +-
 ...apperShortHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...rtHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/javalang/shorts/jdo/WrapperShortJdo.java |  2 +-
 .../types/javalang/shorts/jpa/WrapperShortJpa.java | 14 ++++++------
 .../shorts/persistence/WrapperShortEntity.java     |  2 +-
 .../shorts/persistence/WrapperShortSeeding.java    |  2 +-
 .../types/javalang/shorts/vm/WrapperShortVm.java   | 12 +++++-----
 .../types/javalang/strings/JavaLangStrings.java    | 14 ++++++------
 .../strings/holder/JavaLangStringHolder.java       |  2 +-
 ...LangStringHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javalang/strings/jdo/JavaLangStringJdo.java    |  2 +-
 .../javalang/strings/jpa/JavaLangStringJpa.java    | 14 ++++++------
 .../strings/persistence/JavaLangStringEntity.java  |  2 +-
 .../strings/persistence/JavaLangStringSeeding.java |  2 +-
 .../javalang/strings/vm/JavaLangStringVm.java      | 12 +++++-----
 .../dom/types/javalang/voids/JavaLangVoids.java    | 14 ++++++------
 .../dom/types/javamath/JavaMathTypesMenu.java      |  4 ++--
 .../types/javamath/bigdecimals/BigDecimals.java    | 14 ++++++------
 .../bigdecimals/holder/BigDecimalHolder.java       |  2 +-
 ...BigDecimalHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...alHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javamath/bigdecimals/jdo/BigDecimalJdo.java    |  2 +-
 .../javamath/bigdecimals/jpa/BigDecimalJpa.java    | 14 ++++++------
 .../bigdecimals/persistence/BigDecimalEntity.java  |  2 +-
 .../bigdecimals/persistence/BigDecimalSeeding.java |  2 +-
 .../javamath/bigdecimals/vm/BigDecimalVm.java      | 12 +++++-----
 .../types/javamath/bigintegers/BigIntegers.java    | 14 ++++++------
 .../bigintegers/holder/BigIntegerHolder.java       |  2 +-
 ...BigIntegerHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...erHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javamath/bigintegers/jdo/BigIntegerJdo.java    |  2 +-
 .../javamath/bigintegers/jpa/BigIntegerJpa.java    | 14 ++++++------
 .../bigintegers/persistence/BigIntegerEntity.java  |  2 +-
 .../bigintegers/persistence/BigIntegerSeeding.java |  2 +-
 .../javamath/bigintegers/vm/BigIntegerVm.java      | 12 +++++-----
 .../dom/types/javanet/JavaNetTypesMenu.java        |  4 ++--
 .../java/demoapp/dom/types/javanet/urls/Url.java   | 14 ++++++------
 .../dom/types/javanet/urls/holder/UrlHolder.java   |  2 +-
 .../UrlHolder_actionReturningCollection.java       |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...rlHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../demoapp/dom/types/javanet/urls/jdo/UrlJdo.java |  2 +-
 .../demoapp/dom/types/javanet/urls/jpa/UrlJpa.java | 14 ++++++------
 .../types/javanet/urls/persistence/UrlEntity.java  |  2 +-
 .../types/javanet/urls/persistence/UrlSeeding.java |  2 +-
 .../demoapp/dom/types/javanet/urls/vm/UrlVm.java   | 12 +++++-----
 .../dom/types/javasql/JavaSqlTypesMenu.java        |  4 ++--
 .../types/javasql/javasqldate/JavaSqlDates.java    | 14 ++++++------
 .../javasqldate/holder/JavaSqlDateHolder.java      |  2 +-
 ...avaSqlDateHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javasql/javasqldate/jdo/JavaSqlDateJdo.java    |  2 +-
 .../javasql/javasqldate/jpa/JavaSqlDateJpa.java    | 14 ++++++------
 .../javasqldate/persistence/JavaSqlDateEntity.java |  2 +-
 .../persistence/JavaSqlDateSeeding.java            |  2 +-
 .../javasql/javasqldate/vm/JavaSqlDateVm.java      | 12 +++++-----
 .../javasqltimestamp/JavaSqlTimestamps.java        | 14 ++++++------
 .../holder/JavaSqlTimestampHolder.java             |  2 +-
 ...lTimestampHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...mpHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javasqltimestamp/jdo/JavaSqlTimestampJdo.java  |  2 +-
 .../javasqltimestamp/jpa/JavaSqlTimestampJpa.java  | 14 ++++++------
 .../persistence/JavaSqlTimestampEntity.java        |  2 +-
 .../persistence/JavaSqlTimestampSeeding.java       |  2 +-
 .../javasqltimestamp/vm/JavaSqlTimestampVm.java    | 14 ++++++------
 .../dom/types/javatime/JavaTimeTypesMenu.java      | 16 ++++++-------
 .../javatime/javatimelocaldate/LocalDates.java     | 14 ++++++------
 .../javatimelocaldate/holder/LocalDateHolder.java  |  2 +-
 .../LocalDateHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javatimelocaldate/jdo/LocalDateJdo.java        |  2 +-
 .../javatimelocaldate/jpa/LocalDateJpa.java        | 14 ++++++------
 .../persistence/LocalDateEntity.java               |  2 +-
 .../persistence/LocalDateSeeding.java              |  2 +-
 .../javatime/javatimelocaldate/vm/LocalDateVm.java | 14 ++++++------
 .../javatimelocaldatetime/LocalDateTimes.java      | 14 ++++++------
 .../holder/LocalDateTimeHolder.java                |  2 +-
 ...alDateTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jdo/LocalDateTimeJdo.java                      |  2 +-
 .../jpa/LocalDateTimeJpa.java                      | 14 ++++++------
 .../persistence/LocalDateTimeEntity.java           |  2 +-
 .../persistence/LocalDateTimeSeeding.java          |  2 +-
 .../javatimelocaldatetime/vm/LocalDateTimeVm.java  | 14 ++++++------
 .../javatime/javatimelocaltime/LocalTimes.java     | 14 ++++++------
 .../javatimelocaltime/holder/LocalTimeHolder.java  |  2 +-
 .../LocalTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javatimelocaltime/jdo/LocalTimeJdo.java        |  2 +-
 .../javatimelocaltime/jpa/LocalTimeJpa.java        | 14 ++++++------
 .../persistence/LocalTimeEntity.java               |  2 +-
 .../persistence/LocalTimeSeeding.java              |  2 +-
 .../javatime/javatimelocaltime/vm/LocalTimeVm.java | 14 ++++++------
 .../javatimeoffsetdatetime/OffsetDateTimes.java    | 14 ++++++------
 .../holder/OffsetDateTimeHolder.java               |  2 +-
 ...etDateTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jdo/OffsetDateTimeJdo.java                     |  2 +-
 .../jpa/OffsetDateTimeJpa.java                     | 14 ++++++------
 .../persistence/OffsetDateTimeEntity.java          |  2 +-
 .../persistence/OffsetDateTimeSeeding.java         |  2 +-
 .../vm/OffsetDateTimeVm.java                       | 14 ++++++------
 .../javatime/javatimeoffsettime/OffsetTimes.java   | 14 ++++++------
 .../holder/OffsetTimeHolder.java                   |  2 +-
 ...OffsetTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javatimeoffsettime/jdo/OffsetTimeJdo.java      |  2 +-
 .../javatimeoffsettime/jpa/OffsetTimeJpa.java      | 14 ++++++------
 .../persistence/OffsetTimeEntity.java              |  2 +-
 .../persistence/OffsetTimeSeeding.java             |  2 +-
 .../javatimeoffsettime/vm/OffsetTimeVm.java        | 14 ++++++------
 .../javatimezoneddatetime/ZonedDateTimes.java      | 14 ++++++------
 .../holder/ZonedDateTimeHolder.java                |  2 +-
 ...edDateTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jdo/ZonedDateTimeJdo.java                      |  2 +-
 .../jpa/ZonedDateTimeJpa.java                      | 14 ++++++------
 .../persistence/ZonedDateTimeEntity.java           |  2 +-
 .../persistence/ZonedDateTimeSeeding.java          |  2 +-
 .../javatimezoneddatetime/vm/ZonedDateTimeVm.java  | 14 ++++++------
 .../dom/types/javautil/JavaUtilTypesMenu.java      |  4 ++--
 .../types/javautil/javautildate/JavaUtilDates.java | 14 ++++++------
 .../javautildate/holder/JavaUtilDateHolder.java    |  2 +-
 ...vaUtilDateHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../javautil/javautildate/jdo/JavaUtilDateJdo.java |  2 +-
 .../javautil/javautildate/jpa/JavaUtilDateJpa.java | 14 ++++++------
 .../persistence/JavaUtilDateEntity.java            |  2 +-
 .../persistence/JavaUtilDateSeeding.java           |  2 +-
 .../javautil/javautildate/vm/JavaUtilDateVm.java   | 12 +++++-----
 .../dom/types/javautil/uuids/JavaUtilUuids.java    | 14 ++++++------
 .../javautil/uuids/holder/JavaUtilUuidHolder.java  |  2 +-
 ...vaUtilUuidHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...idHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/javautil/uuids/jdo/JavaUtilUuidJdo.java  |  2 +-
 .../types/javautil/uuids/jpa/JavaUtilUuidJpa.java  | 14 ++++++------
 .../uuids/persistence/JavaUtilUuidEntity.java      |  2 +-
 .../uuids/persistence/JavaUtilUuidSeeding.java     |  2 +-
 .../types/javautil/uuids/vm/JavaUtilUuidVm.java    | 12 +++++-----
 .../dom/types/jodatime/JodaTimeTypesMenu.java      |  4 ++--
 .../types/jodatime/jodadatetime/JodaDateTimes.java | 14 ++++++------
 .../jodadatetime/holder/JodaDateTimeHolder.java    |  2 +-
 ...daDateTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jodatime/jodadatetime/jdo/JodaDateTimeJdo.java |  2 +-
 .../jodatime/jodadatetime/jpa/JodaDateTimeJpa.java | 14 ++++++------
 .../persistence/JodaDateTimeEntity.java            |  2 +-
 .../persistence/JodaDateTimeJdoSeeding.java        |  2 +-
 .../persistence/JodaDateTimeSeeding.java           |  2 +-
 .../jodatime/jodadatetime/vm/JodaDateTimeVm.java   | 14 ++++++------
 .../jodatime/jodalocaldate/JodaLocalDates.java     | 14 ++++++------
 .../jodalocaldate/holder/JodaLocalDateHolder.java  |  2 +-
 ...aLocalDateHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jodalocaldate/jdo/JodaLocalDateJdo.java        |  2 +-
 .../jodalocaldate/jpa/JodaLocalDateJpa.java        | 14 ++++++------
 .../persistence/JodaLocalDateEntity.java           |  2 +-
 .../persistence/JodaLocalDateJdoSeeding.java       |  2 +-
 .../persistence/JodaLocalDateSeeding.java          |  2 +-
 .../jodatime/jodalocaldate/vm/JodaLocalDateVm.java | 14 ++++++------
 .../jodalocaldatetime/JodaLocalDateTimes.java      | 14 ++++++------
 .../holder/JodaLocalDateTimeHolder.java            |  2 +-
 ...alDateTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jdo/JodaLocalDateTimeJdo.java                  |  2 +-
 .../jpa/JodaLocalDateTimeJpa.java                  | 14 ++++++------
 .../persistence/JodaLocalDateTimeEntity.java       |  2 +-
 .../persistence/JodaLocalDateTimeSeeding.java      |  2 +-
 .../jodalocaldatetime/vm/JodaLocalDateTimeVm.java  | 14 ++++++------
 .../jodatime/jodalocaltime/JodaLocalTimes.java     | 14 ++++++------
 .../jodalocaltime/holder/JodaLocalTimeHolder.java  |  2 +-
 ...aLocalTimeHolder_actionReturningCollection.java |  2 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  2 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../jodalocaltime/jdo/JodaLocalTimeJdo.java        |  2 +-
 .../jodalocaltime/jpa/JodaLocalTimeJpa.java        | 14 ++++++------
 .../persistence/JodaLocalTimeEntity.java           |  2 +-
 .../persistence/JodaLocalTimeSeeding.java          |  2 +-
 .../jodatime/jodalocaltime/vm/JodaLocalTimeVm.java | 14 ++++++------
 .../dom/types/primitive/PrimitiveTypesMenu.java    |  4 ++--
 .../primitive/booleans/PrimitiveBooleans.java      | 14 ++++++------
 .../booleans/holder/PrimitiveBooleanHolder.java    |  2 +-
 ...rimitiveBooleanHolder_actionReturningArray.java |  2 +-
 ...anHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../booleans/jdo/PrimitiveBooleanJdo.java          |  2 +-
 .../booleans/jpa/PrimitiveBooleanJpa.java          | 12 +++++-----
 .../persistence/PrimitiveBooleanEntity.java        |  2 +-
 .../persistence/PrimitiveBooleanSeeding.java       |  2 +-
 .../primitive/booleans/vm/PrimitiveBooleanVm.java  | 10 ++++-----
 .../dom/types/primitive/bytes/PrimitiveBytes.java  | 14 ++++++------
 .../bytes/holder/PrimitiveByteHolder.java          |  2 +-
 .../PrimitiveByteHolder_actionReturningArray.java  |  2 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../primitive/bytes/jdo/PrimitiveByteJdo.java      |  2 +-
 .../primitive/bytes/jpa/PrimitiveByteJpa.java      | 12 +++++-----
 .../bytes/persistence/PrimitiveByteEntity.java     |  2 +-
 .../bytes/persistence/PrimitiveByteSeeding.java    |  2 +-
 .../types/primitive/bytes/vm/PrimitiveByteVm.java  | 10 ++++-----
 .../dom/types/primitive/chars/PrimitiveChars.java  | 14 ++++++------
 .../chars/holder/PrimitiveCharHolder.java          |  2 +-
 .../PrimitiveCharHolder_actionReturningArray.java  |  2 +-
 ...arHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../primitive/chars/jdo/PrimitiveCharJdo.java      |  2 +-
 .../primitive/chars/jpa/PrimitiveCharJpa.java      | 12 +++++-----
 .../chars/persistence/PrimitiveCharEntity.java     |  2 +-
 .../chars/persistence/PrimitiveCharSeeding.java    |  2 +-
 .../types/primitive/chars/vm/PrimitiveCharVm.java  | 10 ++++-----
 .../types/primitive/doubles/PrimitiveDoubles.java  | 14 ++++++------
 .../doubles/holder/PrimitiveDoubleHolder.java      |  2 +-
 ...PrimitiveDoubleHolder_actionReturningArray.java |  2 +-
 ...leHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../primitive/doubles/jdo/PrimitiveDoubleJdo.java  |  2 +-
 .../primitive/doubles/jpa/PrimitiveDoubleJpa.java  | 12 +++++-----
 .../doubles/persistence/PrimitiveDoubleEntity.java |  2 +-
 .../persistence/PrimitiveDoubleSeeding.java        |  2 +-
 .../primitive/doubles/vm/PrimitiveDoubleVm.java    | 10 ++++-----
 .../types/primitive/floats/PrimitiveFloats.java    | 14 ++++++------
 .../floats/holder/PrimitiveFloatHolder.java        |  2 +-
 .../PrimitiveFloatHolder_actionReturningArray.java |  2 +-
 ...atHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../primitive/floats/jdo/PrimitiveFloatJdo.java    |  2 +-
 .../primitive/floats/jpa/PrimitiveFloatJpa.java    | 12 +++++-----
 .../floats/persistence/PrimitiveFloatEntity.java   |  2 +-
 .../floats/persistence/PrimitiveFloatSeeding.java  |  2 +-
 .../primitive/floats/vm/PrimitiveFloatVm.java      | 10 ++++-----
 .../dom/types/primitive/ints/PrimitiveInts.java    | 14 ++++++------
 .../primitive/ints/holder/PrimitiveIntHolder.java  |  2 +-
 .../PrimitiveIntHolder_actionReturningArray.java   |  2 +-
 ...ntHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../types/primitive/ints/jdo/PrimitiveIntJdo.java  |  2 +-
 .../types/primitive/ints/jpa/PrimitiveIntJpa.java  | 12 +++++-----
 .../ints/persistence/PrimitiveIntEntity.java       |  2 +-
 .../ints/persistence/PrimitiveIntSeeding.java      |  2 +-
 .../types/primitive/ints/vm/PrimitiveIntVm.java    | 10 ++++-----
 .../dom/types/primitive/longs/PrimitiveLongs.java  | 14 ++++++------
 .../longs/holder/PrimitiveLongHolder.java          |  2 +-
 .../PrimitiveLongHolder_actionReturningArray.java  |  2 +-
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../primitive/longs/jdo/PrimitiveLongJdo.java      |  2 +-
 .../primitive/longs/jpa/PrimitiveLongJpa.java      | 12 +++++-----
 .../longs/persistence/PrimitiveLongEntity.java     |  2 +-
 .../longs/persistence/PrimitiveLongSeeding.java    |  2 +-
 .../types/primitive/longs/vm/PrimitiveLongVm.java  | 10 ++++-----
 .../types/primitive/shorts/PrimitiveShorts.java    | 14 ++++++------
 .../shorts/holder/PrimitiveShortHolder.java        |  2 +-
 .../PrimitiveShortHolder_actionReturningArray.java |  2 +-
 ...rtHolder_updateReadOnlyPropertyWithChoices.java |  2 +-
 .../primitive/shorts/jdo/PrimitiveShortJdo.java    |  2 +-
 .../primitive/shorts/jpa/PrimitiveShortJpa.java    | 12 +++++-----
 .../shorts/persistence/PrimitiveShortEntity.java   |  2 +-
 .../shorts/persistence/PrimitiveShortSeeding.java  |  2 +-
 .../primitive/shorts/vm/PrimitiveShortVm.java      | 10 ++++-----
 domain/src/main/resources/application.yml          |  7 ++++++
 .../customui/WhereInTheWorldPanelFactory.java      |  4 ++--
 pom.xml                                            |  3 +--
 testing/jdo/pom.xml                                |  2 +-
 testing/jpa/pom.xml                                |  2 +-
 testing/pom.xml                                    |  2 +-
 web/pom.xml                                        |  2 +-
 .../java/demoapp/web/DemoAppManifestCommon.java    |  7 +++---
 .../web/notifications/NotificationsResource.java   | 20 ++++++++---------
 .../PrototypeActionsVisibilityAdvisor.java         |  4 ++--
 wicket/common/pom.xml                              |  2 +-
 .../customui/WhereInTheWorldPanelFactory.java      |  4 ++--
 wicket/jdo/pom.xml                                 |  2 +-
 wicket/jpa-and-graphql/pom.xml                     |  2 +-
 wicket/jpa/pom.xml                                 |  2 +-
 850 files changed, 2452 insertions(+), 2444 deletions(-)

diff --git a/domain-tests/pom.xml b/domain-tests/pom.xml
index 7ba09a7..b2b1add 100644
--- a/domain-tests/pom.xml
+++ b/domain-tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.apache.causeway.examples.apps</groupId>
 		<artifactId>demo-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>demo-domain-tests</artifactId>
@@ -71,14 +71,14 @@
 		<dependency>
 			<groupId>org.apache.causeway.valuetypes</groupId>
 			<artifactId>causeway-valuetypes-asciidoc-ui</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>3.0.0-SNAPSHOT</version>
 		</dependency> 
 
 		<!-- provides DomainObjectTesterFactory -->
 		<dependency>
 			<groupId>org.apache.causeway.regressiontests</groupId>
 			<artifactId>causeway-regressiontests-stable</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
 		
 	</dependencies>
diff --git a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java b/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
index 6c5bebb..e4aee41 100644
--- a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
+++ b/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.tests;
 
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java b/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
index 762254f..e79616a 100644
--- a/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
+++ b/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.tests;
 
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/domain/pom.xml b/domain/pom.xml
index 255a8cd..066a95a 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.apache.causeway.examples.apps</groupId>
 		<artifactId>demo-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>demo-domain</artifactId>
diff --git a/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java b/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
index 8bcf410..d57d53e 100644
--- a/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
+++ b/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom._infra.asciidocdesc;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java b/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
index c3f51cd..32badcb 100644
--- a/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
+++ b/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom._infra.asciidocdesc;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/domain/src/main/java/demoapp/dom/_infra/fixtures/DemoFixtureScript.java b/domain/src/main/java/demoapp/dom/_infra/fixtures/DemoFixtureScript.java
index 00756c9..637bf08 100644
--- a/domain/src/main/java/demoapp/dom/_infra/fixtures/DemoFixtureScript.java
+++ b/domain/src/main/java/demoapp/dom/_infra/fixtures/DemoFixtureScript.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom._infra.fixtures;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocConverterService.java b/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocConverterService.java
index 7c4cd42..b085450 100644
--- a/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocConverterService.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocConverterService.java
@@ -20,8 +20,8 @@ package demoapp.dom._infra.resources;
 
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.asciidoctor.Asciidoctor;
 import org.asciidoctor.Attributes;
diff --git a/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java b/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
index 5e342c4..6555aa7 100644
--- a/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom._infra.resources;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocValueSemanticsWithPreprocessing.java b/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocValueSemanticsWithPreprocessing.java
index fedabf3..1ebd77b 100644
--- a/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocValueSemanticsWithPreprocessing.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocValueSemanticsWithPreprocessing.java
@@ -20,8 +20,8 @@
 
 package demoapp.dom._infra.resources;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
diff --git a/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java b/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java
index 500695f..308e9fc 100644
--- a/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom._infra.resources;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/_infra/resources/MarkupReaderService.java b/domain/src/main/java/demoapp/dom/_infra/resources/MarkupReaderService.java
index 0a8b703..8d25c15 100644
--- a/domain/src/main/java/demoapp/dom/_infra/resources/MarkupReaderService.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/MarkupReaderService.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom._infra.resources;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java b/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
index d17399e..7bd67ba 100644
--- a/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
@@ -24,8 +24,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/_infra/resources/ResourceReaderService.java b/domain/src/main/java/demoapp/dom/_infra/resources/ResourceReaderService.java
index dfab46c..8e60299 100644
--- a/domain/src/main/java/demoapp/dom/_infra/resources/ResourceReaderService.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/ResourceReaderService.java
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/CausewayAsciiDocSamples.java b/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/CausewayAsciiDocSamples.java
index 93e74c2..2ec60de 100644
--- a/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/CausewayAsciiDocSamples.java
+++ b/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/CausewayAsciiDocSamples.java
@@ -21,7 +21,7 @@ package demoapp.dom._infra.samples.asciidoc;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/_infra/samples/markdown/CausewayMarkdownSamples.java b/domain/src/main/java/demoapp/dom/_infra/samples/markdown/CausewayMarkdownSamples.java
index 344e657..a60c643 100644
--- a/domain/src/main/java/demoapp/dom/_infra/samples/markdown/CausewayMarkdownSamples.java
+++ b/domain/src/main/java/demoapp/dom/_infra/samples/markdown/CausewayMarkdownSamples.java
@@ -21,7 +21,7 @@ package demoapp.dom._infra.samples.markdown;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java b/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
index 751839a..0ffad5d 100644
--- a/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
+++ b/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
@@ -20,7 +20,7 @@ package demoapp.dom._infra.seed;
 
 import java.util.function.Supplier;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.events.metamodel.MetamodelListener;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java b/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
index 3ffb0ba..3569844 100644
--- a/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
+++ b/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
@@ -22,9 +22,9 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/_infra/values/ValueHolder.java b/domain/src/main/java/demoapp/dom/_infra/values/ValueHolder.java
index f9ee34d..00c7b03 100644
--- a/domain/src/main/java/demoapp/dom/_infra/values/ValueHolder.java
+++ b/domain/src/main/java/demoapp/dom/_infra/values/ValueHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom._infra.values;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Programmatic;
 
diff --git a/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java b/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
index f2ad829..c97d1e5 100644
--- a/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
+++ b/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
@@ -24,7 +24,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.services.repository.RepositoryService;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java b/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java
index 41f68d1..ab37367 100644
--- a/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java
@@ -20,11 +20,11 @@ package demoapp.dom.domain._changes;
 
 import java.time.LocalDateTime;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_clear.java b/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_clear.java
index e76f1d2..19a9a3f 100644
--- a/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_clear.java
+++ b/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_clear.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain._changes;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java b/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java
index 43118b2..833a9e9 100644
--- a/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java
+++ b/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_recentChanges.java
@@ -21,7 +21,7 @@ package demoapp.dom.domain._changes;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java b/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java
index 9779c9f..07b3f80 100644
--- a/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java
+++ b/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java
@@ -34,7 +34,7 @@ import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
 public interface ExposePersistedCommands {
 
     @Service
-    @javax.annotation.Priority(PriorityPrecedence.EARLY)
+    @jakarta.annotation.Priority(PriorityPrecedence.EARLY)
     public static class TableColumnOrderDefault extends TableColumnOrderForCollectionTypeAbstract<CommandLogEntry> {
 
         public TableColumnOrderDefault() { super(CommandLogEntry.class); }
diff --git a/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands_commands.java b/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands_commands.java
index f26bb8e..18cf21f 100644
--- a/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands_commands.java
+++ b/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands_commands.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain._commands;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/_interactions/ExposePersistedExecutions_interactions.java b/domain/src/main/java/demoapp/dom/domain/_interactions/ExposePersistedExecutions_interactions.java
index 7258830..729e353 100644
--- a/domain/src/main/java/demoapp/dom/domain/_interactions/ExposePersistedExecutions_interactions.java
+++ b/domain/src/main/java/demoapp/dom/domain/_interactions/ExposePersistedExecutions_interactions.java
@@ -21,7 +21,7 @@ package demoapp.dom.domain._interactions;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry;
diff --git a/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java b/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
index a758cd7..5ea5fc0 100644
--- a/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
@@ -21,8 +21,8 @@ package demoapp.dom.domain._interactions;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.ViewModel;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/domain/_propertychanges/ExposePropertyChanges_propertyChanges.java b/domain/src/main/java/demoapp/dom/domain/_propertychanges/ExposePropertyChanges_propertyChanges.java
index 1d8b296..2e27a67 100644
--- a/domain/src/main/java/demoapp/dom/domain/_propertychanges/ExposePropertyChanges_propertyChanges.java
+++ b/domain/src/main/java/demoapp/dom/domain/_propertychanges/ExposePropertyChanges_propertyChanges.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain._propertychanges;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
index 445ef7e..2c44d0b 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.actions.Action;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -43,7 +43,7 @@ import demoapp.dom.domain.actions.Action.typeOf.child.ActionTypeOfChildVm;
 
 @Named("demo.ActionMenu")
 @DomainService(nature=NatureOfService.VIEW)
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 public class ActionMenu {
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntitySeeding.java
index fba8274..cab3cc6 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
index 5057bab..cfdadeb 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage_objects.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage_objects.java
index b4e085b..73f1017 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.Action.choicesFrom;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jdo/ActionChoicesFromEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jdo/ActionChoicesFromEntityImpl.java
index dae1f2e..a6d0bff 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jdo/ActionChoicesFromEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jdo/ActionChoicesFromEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromEntityImpl.java
index a270b51..0a5a38d 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntitySeeding.java
index 57cbb2f..188230b 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.commandPublishing;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity_publishedCommands.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity_publishedCommands.java
index 979e831..125d92f 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity_publishedCommands.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity_publishedCommands.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.Action.commandPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
index 680ca31..d2f4bb0 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.Action.commandPublishing;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNameNotPublished.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNameNotPublished.java
index c21b46b..8960380 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNameNotPublished.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNameNotPublished.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.actions.Action.commandPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNamePublished.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNamePublished.java
index b026f2a..ff229f7 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNamePublished.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_changeNamePublished.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.actions.Action.commandPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_objects.java
index c81a2b6..b59583a 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.Action.commandPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_publishedCommands.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_publishedCommands.java
index d33013d..e0a9a62 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_publishedCommands.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_publishedCommands.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.Action.commandPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
index 2596240..bbba4df 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.commandPublishing.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingEntityImpl.java
index 6920f58..27fbf0e 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.commandPublishing.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventControlSubscriber.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventControlSubscriber.java
index 15cd231..5c74bf2 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventControlSubscriber.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventControlSubscriber.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
index ea9c2ce..e3a9a48 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.domainEvent;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_changeControlStrategy.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_changeControlStrategy.java
index 16db7a3..a5395e6 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_changeControlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_changeControlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_controlStrategy.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_controlStrategy.java
index 1bd693d..619ede5 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_controlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_controlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntitySeeding.java
index 7aa7a62..42dc30a 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity_publishedExecutions.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity_publishedExecutions.java
index ecfe770..896cba6 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity_publishedExecutions.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity_publishedExecutions.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.Action.executionPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
index e0d518c..98cfeeb 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameNotPublished.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameNotPublished.java
index 7ab5c10..725ff46 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameNotPublished.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameNotPublished.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.actions.Action.executionPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNamePublished.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNamePublished.java
index ebbe8ca..5e1a33f 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNamePublished.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNamePublished.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.actions.Action.executionPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameWrapped.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameWrapped.java
index 4fdfa78..febbf96 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameWrapped.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_changeNameWrapped.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.actions.Action.executionPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_objects.java
index aac5808..4e7b128 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.Action.executionPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_publishedExecutions.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_publishedExecutions.java
index d3d5011..f5923b2 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_publishedExecutions.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_publishedExecutions.java
@@ -3,7 +3,7 @@ package demoapp.dom.domain.actions.Action.executionPublishing;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
index 8b5e990..b17f9e0 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingEntityImpl.java
index 5c9a164..75e7504 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
index fe260b2..656e3b6 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.restrictTo;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
index d380410..668db83 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
@@ -18,14 +18,14 @@
  */
 package demoapp.dom.domain.actions.Action.semantics;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
index 6a21f14..79c05d3 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
@@ -22,11 +22,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.Collection;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java b/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
index b053984..44a7fed 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.typeOf.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
index 32b5ff6..dbcfd9a 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.actions.ActionLayout;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -47,7 +47,7 @@ import demoapp.dom.domain.actions.ActionLayout.sequence.ActionLayoutSequencePage
 
 @DomainService(nature=NatureOfService.VIEW)
 @Named("demo.ActionLayoutMenu")
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 //tag::menu-item-described-as[]
 public class ActionLayoutMenu {
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
index 5f484d2..00df42e 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
@@ -21,12 +21,12 @@ package demoapp.dom.domain.actions.ActionLayout.associateWith;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
index 18f0f0d..b03e7a9 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.associateWith.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
index 1e69d9a..7a5d990 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.cssClass;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
index 806783f..e14633f 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.cssClassFa;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
index 0833bac..586b38e 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
@@ -22,12 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
index 98b76f7..4a2b479 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.describedAs.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
index 6fcd083..f615765 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.fieldSet;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenEntitySeeding.java
index bad4712..352ccd0 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.hidden;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
index 638d95d..644eccc 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.hidden;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage_objects.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage_objects.java
index c021951..f2d1e77 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.ActionLayout.hidden;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jdo/ActionLayoutHiddenEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jdo/ActionLayoutHiddenEntityImpl.java
index 9016250..1c8765f 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jdo/ActionLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jdo/ActionLayoutHiddenEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.hidden.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenEntityImpl.java
index f21df18..078f110 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.hidden.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
index fcdaa93..161417b 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.named;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
index 52c4a02..c062213 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.position;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
index dcec87a..eee0ad6 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.promptStyle;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyEntitySeeding.java
index ad73d24..a8d6ad0 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
index b23e774..dc9a3ed 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java
index c8e32a1..debeec2 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.actions.ActionLayout.redirectPolicy;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
index 243dbd0..cc8965f 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java
index 0243e4c..f2081a3 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImplRepository.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.joda.time.DateTime;
 import org.springframework.context.annotation.Profile;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImpl.java
index 19ac1ef..8e7861c 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImpl.java
@@ -18,11 +18,18 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy.jpa;
 
-import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyEntity;
+import jakarta.inject.Named;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import org.springframework.context.annotation.Profile;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
@@ -30,13 +37,12 @@ import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.value.Blob;
 import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
-
 import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
 
-import org.springframework.context.annotation.Profile;
-
-import javax.inject.Named;
-import javax.persistence.*;
+import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyEntity;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Profile("demo-jpa")
 @Entity
@@ -54,7 +60,7 @@ public class ActionLayoutRedirectPolicyEntityImpl extends ActionLayoutRedirectPo
     // ...
 //end::class[]
 
-    public ActionLayoutRedirectPolicyEntityImpl(String value) {
+    public ActionLayoutRedirectPolicyEntityImpl(final String value) {
         setName(value);
     }
 
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java
index ce255a7..5ee6a0c 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jpa/ActionLayoutRedirectPolicyEntityImplRepository.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.redirectPolicy.jpa;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
index 9e85db6..3d6c41b 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
@@ -21,12 +21,12 @@ package demoapp.dom.domain.actions.ActionLayout.sequence;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqX.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqX.java
index c2fc78c..736320c 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqX.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqX.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.actions.ActionLayout.sequence;
 
 import lombok.RequiredArgsConstructor;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqY.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqY.java
index bd595b4..e338c52 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqY.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqY.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.actions.ActionLayout.sequence;
 
 import lombok.RequiredArgsConstructor;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
index eaa916b..37c11f7 100644
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
@@ -24,8 +24,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.*;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.*;
 
 import org.apache.causeway.applib.annotation.*;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
index 9569c83..cbce593 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.domain.collections.Collection;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventControlSubscriber.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventControlSubscriber.java
index d4a7761..b86b233 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventControlSubscriber.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventControlSubscriber.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.collections.Collection.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
index 42850a8..d2f5156 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.Collection.domainEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_changeControlStrategy.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_changeControlStrategy.java
index 1fc427a..ab4ab96 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_changeControlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_changeControlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.collections.Collection.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_controlStrategy.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_controlStrategy.java
index f69c4dc..9e29e1c 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_controlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_controlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.collections.Collection.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
index 0f216af..92ee149 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.Collection.domainEvent.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
index c3c49cb..1f4b1cf 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
@@ -21,11 +21,11 @@ package demoapp.dom.domain.collections.Collection.typeOf;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/child/CollectionTypeOfChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/child/CollectionTypeOfChildVm.java
index 970004a..605a53e 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/child/CollectionTypeOfChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/child/CollectionTypeOfChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.Collection.typeOf.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
@@ -31,12 +31,11 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
 //tag::class[]
 @Named("demo.CollectionTypeOfChildVm")
 @DomainObject(nature=Nature.VIEW_MODEL)
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/CollectionLayoutMenu.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/CollectionLayoutMenu.java
index 79c7789..3b42b17 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/CollectionLayoutMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/CollectionLayoutMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
index 855300f..d719eb6 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.cssClass;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/child/CollectionLayoutCssClassChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/child/CollectionLayoutCssClassChildVm.java
index d643d04..7383df0 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/child/CollectionLayoutCssClassChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/child/CollectionLayoutCssClassChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout.cssClass.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
index eac3aa4..5f7655c 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.defaultView;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/child/CollectionLayoutDefaultViewChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/child/CollectionLayoutDefaultViewChildVm.java
index b5fda85..ee45019 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/child/CollectionLayoutDefaultViewChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/child/CollectionLayoutDefaultViewChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout.defaultView.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
index 61144c7..ff10c5c 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.describedAs;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/child/CollectionLayoutDescribedAsChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/child/CollectionLayoutDescribedAsChildVm.java
index 591a341..66639d5 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/child/CollectionLayoutDescribedAsChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/child/CollectionLayoutDescribedAsChildVm.java
@@ -24,8 +24,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.*;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.*;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
index ef88425..abf640d 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.hidden;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/child/CollectionLayoutHiddenChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/child/CollectionLayoutHiddenChildVm.java
index bec2a25..7b1c121 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/child/CollectionLayoutHiddenChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/child/CollectionLayoutHiddenChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout.hidden.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
index 5ee2e13..24d86ad 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.named;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/child/CollectionLayoutNamedChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/child/CollectionLayoutNamedChildVm.java
index 8143437..d2da1e8 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/child/CollectionLayoutNamedChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/child/CollectionLayoutNamedChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout.named.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
index d977ba9..7221a38 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.paged;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/child/CollectionLayoutPagedChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/child/CollectionLayoutPagedChildVm.java
index 6808269..a21edd7 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/child/CollectionLayoutPagedChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/child/CollectionLayoutPagedChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout.paged.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
index b819574..220779c 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.sequence;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/child/CollectionLayoutSequenceChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/child/CollectionLayoutSequenceChildVm.java
index 84d9758..48eda98 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/child/CollectionLayoutSequenceChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/child/CollectionLayoutSequenceChildVm.java
@@ -24,8 +24,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.*;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.*;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
index c17e1cc..6d080af 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.sortedBy;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/child/CollectionLayoutSortedByChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/child/CollectionLayoutSortedByChildVm.java
index fd30eff..13be2fc 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/child/CollectionLayoutSortedByChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/child/CollectionLayoutSortedByChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout.sortedBy.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/CollectionLayoutTableDecoratorPage.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/CollectionLayoutTableDecoratorPage.java
index 17d7559..d2e3c44 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/CollectionLayoutTableDecoratorPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/CollectionLayoutTableDecoratorPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.CollectionLayout.tabledec;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/child/CollectionLayoutTableDecoratorChildVm.java b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/child/CollectionLayoutTableDecoratorChildVm.java
index 29c0b4b..c5c189d 100644
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/child/CollectionLayoutTableDecoratorChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/child/CollectionLayoutTableDecoratorChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.collections.CollectionLayout.tabledec.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
index 4d255d8..f0043e9 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.domain.objects.DomainObject;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntity.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntity.java
index 745cfc5..7caf12e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntitySeeding.java
index e37087c..93db9d7 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
index 937caf4..8804011 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_lookup.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_lookup.java
index 0b0791a..9265089 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_lookup.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_lookup.java
@@ -3,7 +3,7 @@ package demoapp.dom.domain.objects.DomainObject.aliased;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_objects.java
index db9d407..9cf4d7d 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObject.aliased;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
index 1924c86..6208f93 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
index 67e585a..5edd257 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntity.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntity.java
index 1549687..81769d0 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntitySeeding.java
index 316b1ae..c6eef6f 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
index 2f667f6..ad35047 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage_characters.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage_characters.java
index 0b432e2..4b02e05 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage_characters.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage_characters.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObject.autoComplete;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImpl.java
index 1c046c7..fb8fa6d 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImplRepository.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImplRepository.java
index 25d8427..953f9bd 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImplRepository.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImplRepository.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Repository;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImpl.java
index b537ac1..b073600 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImplRepository.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImplRepository.java
index 2bbb457..d0d243f 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImplRepository.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteEntityImplRepository.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete.jpa;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Repository;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingEntitySeeding.java
index fb2de84..02c3854 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.bounded;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
index c3282cd..effe62c 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.bounded;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage_objects.java
index 9deadfb..50e6aa1 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObject.bounded;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingEntityImpl.java
index 1b6197d..1738011 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.bounded.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingEntityImpl.java
index 3fe4ecd..8e0a866 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.bounded.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingEntitySeeding.java
index 1e674ff..5e2fdc6 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.editing;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
index 82f8af5..b912e99 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.editing;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage_objects.java
index 8e61132..8501158 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObject.editing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jdo/DomainObjectEditingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jdo/DomainObjectEditingEntityImpl.java
index ea4ac80..0ed0bf3 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jdo/DomainObjectEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jdo/DomainObjectEditingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.editing.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingEntityImpl.java
index 8483aeb..65f6ea3 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.editing.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java
index 4dfa516..d7d21e6 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntitySeeding.java
index 3996c86..f34ab64 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage.java
index 0133002..c007c08 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_modify.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_modify.java
index 84b495c..530f821 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_modify.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_modify.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_objects.java
index d548813..f73b58a 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_objects.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObject.entityChangePublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingEntityImpl.java
index 0f93936..00f0fd1 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingEntityImpl.java
index 07a7fcc..da5ad79 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
index 6e2726d..319d50b 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationOptional.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationOptional.java
index acb6b33..da63e89 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationOptional.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationOptional.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObject.introspection;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationRequired.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationRequired.java
index 319d885..5c70135 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationRequired.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationRequired.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObject.introspection;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptEntitySeeding.java
index 67330e6..245068e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotOpt;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jdo/DomainObjectIntrospectionAnnotOptEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jdo/DomainObjectIntrospectionAnnotOptEntityImpl.java
index 35d5476..46bba4e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jdo/DomainObjectIntrospectionAnnotOptEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jdo/DomainObjectIntrospectionAnnotOptEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotOpt.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptEntityImpl.java
index fa71c43..9f4273d 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotOpt.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdEntitySeeding.java
index a83c101..8ef8ec9 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotReqd;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jdo/DomainObjectIntrospectionAnnotReqdEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jdo/DomainObjectIntrospectionAnnotReqdEntityImpl.java
index 390d981..6303dc7 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jdo/DomainObjectIntrospectionAnnotReqdEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jdo/DomainObjectIntrospectionAnnotReqdEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotReqd.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdEntityImpl.java
index d7d2ef1..848c503 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotReqd.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedEntitySeeding.java
index 9345158..78ce62a 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionEncapsulatedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionEncapsulatedEntityImpl.java
index f1cac71..c8d550e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionEncapsulatedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionEncapsulatedEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionPage_encapsulationEnabled.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionPage_encapsulationEnabled.java
index dffcbef..570a021 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionPage_encapsulationEnabled.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionPage_encapsulationEnabled.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated.jdo;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedEntityImpl.java
index 20a261c..9b0e637 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionPage_encapsulationEnabled.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionPage_encapsulationEnabled.java
index f820758..6d1f78b 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionPage_encapsulationEnabled.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionPage_encapsulationEnabled.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated.jpa;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodEntitySeeding.java
index 3d69458..6a2fe44 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.mixinMethod;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
index aadb2f6..98934bf 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.mixinMethod;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_objects.java
index bae56f1..846eb0e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObject.mixinMethod;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_updateName.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_updateName.java
index 8c039c6..014ba58 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_updateName.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_updateName.java
@@ -3,7 +3,7 @@ package demoapp.dom.domain.objects.DomainObject.mixinMethod;
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jdo/DomainObjectMixinMethodEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jdo/DomainObjectMixinMethodEntityImpl.java
index 5a4cb51..c0763d5 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jdo/DomainObjectMixinMethodEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jdo/DomainObjectMixinMethodEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.mixinMethod.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodEntityImpl.java
index 478947b..21ddc11 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.mixinMethod.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
index 3d3c6a2..4d75675 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_entities.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_entities.java
index 81d3f7f..eeff09e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_entities.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_entities.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObject.nature;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_viewModels.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_viewModels.java
index 2ddaf3b..0624c84 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_viewModels.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_viewModels.java
@@ -3,7 +3,7 @@ package demoapp.dom.domain.objects.DomainObject.nature;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java
index 80a4f90..7e809bc 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.entity;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jdo/DomainObjectNatureEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jdo/DomainObjectNatureEntityImpl.java
index 2b8f9ae..e38c929 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jdo/DomainObjectNatureEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jdo/DomainObjectNatureEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.entity.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureEntityImpl.java
index 4b7a08b..8a6d76c 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureEntityImpl.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.entity.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
index da40f49..33eb9d4 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
@@ -18,15 +18,15 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.viewmodel;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java
index 685c7cc..038b906 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
index c4fdb00..9d8291f 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.Collection;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java
index f5d3445..df8de7e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
index 52402cb..4ddbb91 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
index 7f1ebcf..c9ddb80 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.child;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
index de09db5..b2fa7d9 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
index 9424adb..bc51e61 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java
index da9f7d5..2558285 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
index 0c6ffe3..5e15f4a 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
index 57b26b0..23c6c13 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_events.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_events.java
index 08ef422..2f14b59 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_events.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_events.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
index 731b157..7260f7a 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
@@ -21,7 +21,7 @@ package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.services.clock.ClockService;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jdo/DomainObjectXxxLifecycleEventEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jdo/DomainObjectXxxLifecycleEventEntityImpl.java
index 119ee2f..2422311 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jdo/DomainObjectXxxLifecycleEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jdo/DomainObjectXxxLifecycleEventEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventEntityImpl.java
index 2eb05c1..93d40d9 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
index 8ad44f4..5761d09 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout;
 
-import javax.annotation.Priority;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingEntitySeeding.java
index 42c8074..d338495 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
index 86dccbf..84fa384 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.BookmarkPolicy;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
index a539e35..5067115 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.BookmarkPolicy;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage_objects.java
index a91133e..d8aa623 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
index a8a2a09..c715b1b 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingChildEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingChildEntityImpl.java
index 05fc4cc..6e53f3e 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingChildEntityImpl.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingEntityImpl.java
index 3372a0e..9e538d1 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingEntityImpl.java
@@ -21,7 +21,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.jdo;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildEntityImpl.java
index 2332e82..ca4e5ab 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildEntityImpl.java
@@ -18,14 +18,14 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingEntityImpl.java
index 44c765a..b57eaab 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingEntityImpl.java
@@ -21,14 +21,14 @@ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.jpa;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.inject.Named;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassEntitySeeding.java
index 50eced8..9fadddf 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClass;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
index 63bbebc..3ab2db9 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClass;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java
index 608a0dd..0c0aec2 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.cssClass;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jdo/DomainObjectLayoutCssClassEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jdo/DomainObjectLayoutCssClassEntityImpl.java
index daf016e..6c07f8a 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jdo/DomainObjectLayoutCssClassEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jdo/DomainObjectLayoutCssClassEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClass.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassEntityImpl.java
index ac2d2dd..e5b3d76 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClass.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaEntitySeeding.java
index ab8e9f7..3cbf79a 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
index 3bab88c..d1ecc46 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage_objects.java
index 74e3ca1..e7072f7 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jdo/DomainObjectLayoutCssClassFaEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jdo/DomainObjectLayoutCssClassFaEntityImpl.java
index fe05384..422e3d6 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jdo/DomainObjectLayoutCssClassFaEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jdo/DomainObjectLayoutCssClassFaEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaEntityImpl.java
index ff81506..62b72f8 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsEntitySeeding.java
index 5690751..adf1674 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.describedAs;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
index ee4e098..08dda01 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.describedAs;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage_objects.java
index f61d781..68645bf 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.describedAs;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jdo/DomainObjectLayoutDescribedAsEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jdo/DomainObjectLayoutDescribedAsEntityImpl.java
index 2cedf67..f44b6ee 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jdo/DomainObjectLayoutDescribedAsEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jdo/DomainObjectLayoutDescribedAsEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.describedAs.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsEntityImpl.java
index 38b38af..b4ca9d3 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.describedAs.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedEntitySeeding.java
index 7208c7f..72efb51 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.named;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
index 263efc2..d32ba6c 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.named;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage_objects.java
index 553aeaa..7a62021 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.named;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jdo/DomainObjectLayoutNamedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jdo/DomainObjectLayoutNamedEntityImpl.java
index 41dc8dd..c1b8dc9 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jdo/DomainObjectLayoutNamedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jdo/DomainObjectLayoutNamedEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.named.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedEntityImpl.java
index fbd72a1..1baa1fb 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.named.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedEntitySeeding.java
index 1858cd5..314142c 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.paged;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
index 1a0fef0..fbce174 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.paged;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
index a077af1..07c3aa7 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.paged;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_objects.java
index d893fd9..fa3a50b 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.paged;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jdo/DomainObjectLayoutPagedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jdo/DomainObjectLayoutPagedEntityImpl.java
index b224057..0cbb31d 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jdo/DomainObjectLayoutPagedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jdo/DomainObjectLayoutPagedEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.paged.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedEntityImpl.java
index 2c5ca2b..e7628b8 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.paged.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorEntitySeeding.java
index 93313b9..7f9beb0 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
index d5bbb53..9ae1c41 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
index 4b2ec59..e274095 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_objects.java
index 92ce8b0..005e685 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jdo/DomainObjectLayoutTableDecoratorEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jdo/DomainObjectLayoutTableDecoratorEntityImpl.java
index 6f49d68..3ac171c 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jdo/DomainObjectLayoutTableDecoratorEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jdo/DomainObjectLayoutTableDecoratorEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.tabledec.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorEntityImpl.java
index 359bb78..8f6477a 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.tabledec.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventEntitySeeding.java
index dd377f0..37879f1 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
index ba7e19a..8c639f7 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage_objects.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage_objects.java
index f79d2f5..22f99e1 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java
index 76e71d9..00d6d24 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jdo/DomainObjectLayoutXxxUiEventEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jdo/DomainObjectLayoutXxxUiEventEntityImpl.java
index caff456..d228c41 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jdo/DomainObjectLayoutXxxUiEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jdo/DomainObjectLayoutXxxUiEventEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventEntityImpl.java
index 9a106ba..171b515 100644
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
index 0d82bc2..1738d70 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
@@ -20,8 +20,8 @@ package demoapp.dom.domain.properties.Property;
 
 import java.util.function.Consumer;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -56,7 +56,7 @@ import demoapp.dom.types.Samples;
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 public class PropertyMenu {
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntitySeeding.java
index 2a64b4f..5620cd4 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.commandPublishing;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity_publishedCommands.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity_publishedCommands.java
index 51d233c..692e6be 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity_publishedCommands.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity_publishedCommands.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.properties.Property.commandPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
index e4c2e9e..20816de 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.Property.commandPublishing;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage_objects.java
index b809483..31810e5 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.properties.Property.commandPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingEntityImpl.java
index 04d221d..aafd1ce 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.commandPublishing.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingEntityImpl.java
index d808014..3c039ab 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.commandPublishing.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java
index 4d709ae..6b6df35 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
index 6a61b9b..4fb02cd 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java
index ac0ea4b..e3ee4af 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java
index b102c84..a3b2564 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingEntitySeeding.java
index 6d1cfcf..979b051 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.editing;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
index 6e77231..82e3bd4 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.Property.editing;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage_objects.java
index 07aacd5..1744a37 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.properties.Property.editing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jdo/PropertyEditingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jdo/PropertyEditingEntityImpl.java
index 11d45be..7be97ab 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jdo/PropertyEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jdo/PropertyEditingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.editing.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingEntityImpl.java
index 3f131e4..f4b6f1a 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.editing.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntitySeeding.java
index 2a25b76..f84e0eb 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.executionPublishing;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity_publishedExecutions.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity_publishedExecutions.java
index 9abd58d..cf2a4ae 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity_publishedExecutions.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity_publishedExecutions.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.properties.Property.executionPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
index 7aa2f7d..6dff9ff 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.Property.executionPublishing;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage_objects.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage_objects.java
index 09fa78c..2cc0b21 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.properties.Property.executionPublishing;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingEntityImpl.java
index 2f38877..987bb3c 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.executionPublishing.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingEntityImpl.java
index c43521b..6f9345a 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.executionPublishing.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
index a6673b0..691a879 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.fileAccept;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
index 8b595e7..2ae3752 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.maxLength;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
index 79d175f..f5034cf 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.mustSatisfy;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
index 0f4693b..cb22149 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.optionality;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntity.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntity.java
index 0e03da4..90a0254 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntity.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.properties.Property.projecting;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntitySeeding.java
index b32aea3..448906f 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.projecting;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
index 8964c56..c841301 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.projecting;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
index c28aaeb..0f34bb9 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.properties.Property.projecting;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildEntityImpl.java
index aee6cf4..6b2d29c 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.projecting.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildEntityImpl.java
index 9d0c10d..dfd4dda 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildEntityImpl.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.domain.properties.Property.projecting.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
index 650b951..33539b4 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
@@ -20,12 +20,12 @@ package demoapp.dom.domain.properties.Property.regexPattern;
 
 import java.util.regex.Pattern;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotEntitySeeding.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotEntitySeeding.java
index 296fbbb..9bd4ac1 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.snapshot;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
index d380fc5..abc4de6 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.snapshot;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_friends.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_friends.java
index 31377f2..cb0a5b5 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_friends.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_friends.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.properties.Property.snapshot;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_takeXmlSnapshot.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_takeXmlSnapshot.java
index b39fecb..25e8a25 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_takeXmlSnapshot.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_takeXmlSnapshot.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.snapshot;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
index 05d952a..424a8a9 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.snapshot.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotEntityImpl.java
index 52d36ee..73fdaf7 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.snapshot.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
index 569701f..b2fc24c 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -44,7 +44,7 @@ import lombok.val;
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = { @Inject })
 //@Log4j2
 public class PropertyLayoutMenu {
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
index f0d000d..3408f45 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.cssClass;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
index 393cddf..943c127 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.describedAs;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
index 767ed9a..516e69d 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.hidden;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage_objects.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage_objects.java
index 60cf0aa..777de6c 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage_objects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.properties.PropertyLayout.hidden;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java
index 8bde7f5..02c958b 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.hidden;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java
index b32ed31..881599e 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.hidden.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java
index e7db54f..06d2ba1 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.hidden.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
index a0a47c3..9cdff8d 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.labelPosition;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
index 6c3903e..09fe57a 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.multiLine;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
index 71d90ce..c005035 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.named;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
index 87c07da..c8af385 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
@@ -20,8 +20,8 @@ package demoapp.dom.domain.properties.PropertyLayout.navigable;
 
 import java.io.File;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm_tree.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm_tree.java
index ad525d0..a3e15f1 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm_tree.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm_tree.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.navigable;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Component;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java
index f763ccb..de8e64b 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java
@@ -20,10 +20,10 @@ package demoapp.dom.domain.properties.PropertyLayout.navigable;
 
 import java.nio.file.FileSystems;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.servlet.http.HttpSession;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
index f837741..1dbd0e4 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.repainting;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
index 7e00a0b..845d358 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.typicalLength;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java
index 9bfd381..eceb30d 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java
@@ -21,8 +21,8 @@ package demoapp.dom.domain.properties.ValueSemantics;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import demoapp.dom.domain.properties.ValueSemantics.percentage.ValueSemanticsProviderPercentagePage;
 
@@ -33,16 +33,15 @@ import org.apache.causeway.applib.annotation.NatureOfService;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
+import demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays.ValueSemanticsDateRenderAdjustDaysPage;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 
-import demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays.ValueSemanticsDateRenderAdjustDaysPage;
-
 @Named("demo.ValueSemanticsMenu")
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = { @Inject })
 //@Log4j2
 public class ValueSemanticsMenu {
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
index 0a91cfb..f4f9b77 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage.java
@@ -20,13 +20,13 @@ package demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays;
 
 import java.time.LocalDate;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_downloadAsXml.java b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_downloadAsXml.java
index 0f09cbd..5ff6db2 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_downloadAsXml.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/dateRenderAdjustDays/ValueSemanticsDateRenderAdjustDaysPage_downloadAsXml.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderForPercentage.java b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderForPercentage.java
index 6ffd9e2..773c047 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderForPercentage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderForPercentage.java
@@ -3,8 +3,8 @@ package demoapp.dom.domain.properties.ValueSemantics.percentage;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-import javax.annotation.Priority;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
diff --git a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java
index 541414e..7c14126 100644
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/percentage/ValueSemanticsProviderPercentagePage.java
@@ -20,12 +20,12 @@ package demoapp.dom.domain.properties.ValueSemantics.percentage;
 
 import java.math.BigDecimal;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java b/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
index 44a26f6..afaa73f 100644
--- a/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
+++ b/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java
@@ -21,8 +21,8 @@ package demoapp.dom.featured;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -45,7 +45,7 @@ import lombok.val;
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = { @Inject })
 public class FeaturedMenu {
 
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsMenu.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsMenu.java
index c993982..d36da4c 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsMenu.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsMenu.java
@@ -1,4 +1,3 @@
-
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +18,7 @@
  */
 package demoapp.dom.featured.causewayext.cal;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -34,7 +33,7 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
         nature=NatureOfService.VIEW
 )
 @DomainObjectLayout(named="CausewayExtTypes")
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class CalendarEventsMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsPage.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsPage.java
index aa54f45..b491305 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsPage.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsPage.java
@@ -20,13 +20,13 @@ package demoapp.dom.featured.causewayext.cal;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder.java
index 8c28769..378a36e 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.featured.causewayext.cal.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
 
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
index ed8a6d8..d821afd 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.featured.causewayext.cal.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 6786be8..5d7c2ef 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.featured.causewayext.cal.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
index fff5499..fc694ca 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.featured.causewayext.cal.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jdo/CausewayCalendarEventJdo.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jdo/CausewayCalendarEventJdo.java
index 52b45c2..00a159f 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jdo/CausewayCalendarEventJdo.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jdo/CausewayCalendarEventJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.featured.causewayext.cal.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jpa/CausewayCalendarEventJpa.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jpa/CausewayCalendarEventJpa.java
index 735ee88..a597098 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jpa/CausewayCalendarEventJpa.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jpa/CausewayCalendarEventJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.featured.causewayext.cal.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventEntity.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventEntity.java
index 0ee658d..fd6f5ea 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventEntity.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.featured.causewayext.cal.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventSeeding.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventSeeding.java
index 1e1bd1f..1ca448c 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventSeeding.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.featured.causewayext.cal.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/vm/CausewayCalendarEventVm.java b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/vm/CausewayCalendarEventVm.java
index 9ae401e..74befc5 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/vm/CausewayCalendarEventVm.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/vm/CausewayCalendarEventVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.featured.causewayext.cal.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/sse/DemoTask.java b/domain/src/main/java/demoapp/dom/featured/causewayext/sse/DemoTask.java
index cff42de..be38ce9 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/sse/DemoTask.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/sse/DemoTask.java
@@ -20,7 +20,7 @@ package demoapp.dom.featured.causewayext.sse;
 
 import java.util.concurrent.atomic.LongAdder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java b/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java
index 140519c..c2eb7de 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.featured.causewayext.sse;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.value.Markup;
 @DomainObjectLayout(
         named="Async Actions"
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class SseDemoMenu {
 
     @Inject private FactoryService factoryService;
diff --git a/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java b/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java
index 5231377..054fde3 100644
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/sse/SseDemoPage.java
@@ -18,15 +18,15 @@
  */
 package demoapp.dom.featured.causewayext.sse;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java b/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java
index 949fd38..4bcacc2 100644
--- a/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java
+++ b/domain/src/main/java/demoapp/dom/featured/customui/GeoapifyClient.java
@@ -26,7 +26,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/domain/src/main/java/demoapp/dom/featured/customui/WhereInTheWorldPage.java b/domain/src/main/java/demoapp/dom/featured/customui/WhereInTheWorldPage.java
index 4abe6dd..2079339 100644
--- a/domain/src/main/java/demoapp/dom/featured/customui/WhereInTheWorldPage.java
+++ b/domain/src/main/java/demoapp/dom/featured/customui/WhereInTheWorldPage.java
@@ -20,11 +20,11 @@ package demoapp.dom.featured.customui;
 
 import java.io.Serializable;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/featured/layout/tooltip/DemoItem.java b/domain/src/main/java/demoapp/dom/featured/layout/tooltip/DemoItem.java
index 56118a2..297e808 100644
--- a/domain/src/main/java/demoapp/dom/featured/layout/tooltip/DemoItem.java
+++ b/domain/src/main/java/demoapp/dom/featured/layout/tooltip/DemoItem.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.featured.layout.tooltip;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/featured/layout/tooltip/TooltipPage.java b/domain/src/main/java/demoapp/dom/featured/layout/tooltip/TooltipPage.java
index 82b287d..6133eb6 100644
--- a/domain/src/main/java/demoapp/dom/featured/layout/tooltip/TooltipPage.java
+++ b/domain/src/main/java/demoapp/dom/featured/layout/tooltip/TooltipPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.featured.layout.tooltip;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java b/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
index 3d2baa4..5418ef4 100644
--- a/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
+++ b/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.homepage;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.HomePage;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/TvCharacter.java b/domain/src/main/java/demoapp/dom/progmodel/actions/TvCharacter.java
index b7fa85e..7879ff5 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/TvCharacter.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/TvCharacter.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.actions;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java
index 8e6ab61..76598d8 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java
@@ -23,9 +23,9 @@ import demoapp.dom.progmodel.actions.TvCharacterPopulator;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.*;
 import org.apache.causeway.applib.services.factory.FactoryService;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage.java b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage.java
index de9e408..015189d 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage.java
@@ -21,13 +21,13 @@ package demoapp.dom.progmodel.actions.autocomplete;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntity.java b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntity.java
index 09a1e6c..2b9f7a7 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntity.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntity.java
@@ -21,7 +21,7 @@ package demoapp.dom.progmodel.actions.bulk;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
 
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntitySeeding.java b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntitySeeding.java
index d9764e8..5aefdef 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntitySeeding.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.actions.bulk;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java
index c907d65..4c0a147 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.actions.bulk;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionPage.java b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionPage.java
index 1bd852d..373b7d1 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionPage.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.progmodel.actions.bulk;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jdo/BulkActionItemEntityImpl.java b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jdo/BulkActionItemEntityImpl.java
index 81e4d4e..227d785 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jdo/BulkActionItemEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jdo/BulkActionItemEntityImpl.java
@@ -18,10 +18,10 @@
  */
 package demoapp.dom.progmodel.actions.bulk.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jpa/BulkActionItemEntityImpl.java b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jpa/BulkActionItemEntityImpl.java
index 418ee84..d17aabb 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jpa/BulkActionItemEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jpa/BulkActionItemEntityImpl.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.progmodel.actions.bulk.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java
index ad881d9..74b2a80 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.actions.choices;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage.java b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage.java
index c83c998..68ad35b 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.progmodel.actions.choices;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java
index b3602c4..f98b27f 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.actions.defaults;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage.java b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage.java
index 1c4cdef..588c2b7 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.progmodel.actions.defaults;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java
index 33712d3..88e2aa7 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.actions.validate;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage.java b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage.java
index 7f2c2f8..b34d25d 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage.java
@@ -21,13 +21,13 @@ package demoapp.dom.progmodel.actions.validate;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java
index 3b15e4b..7c69367 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.actions.veto;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage.java b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage.java
index 6b8d596..25c215f 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.progmodel.actions.veto;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/ComplexNumberValueSemantics.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/ComplexNumberValueSemantics.java
index ecb2967..d7c89de 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/ComplexNumberValueSemantics.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/ComplexNumberValueSemantics.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.compositevalues;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypeMenu.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypeMenu.java
index bd788b3..90d802b 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypeMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypeMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.compositevalues;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypePage.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypePage.java
index e844db7..7cfe4b5 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypePage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/compositevalues/CompositeValueTypePage.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.compositevalues;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/EmailAddressValueSemantics.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/EmailAddressValueSemantics.java
index 854ad87..86c0c3b 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/EmailAddressValueSemantics.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/EmailAddressValueSemantics.java
@@ -22,7 +22,7 @@ import lombok.NonNull;
 
 import java.util.regex.Pattern;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.services.bookmark.IdStringifier;
 import org.apache.causeway.applib.value.semantics.Parser;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java
index d7b2c7c..744114c 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.customvalues;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -32,7 +32,7 @@ import lombok.RequiredArgsConstructor;
 
 @Named("demo.ScalarValueTypeMenu")
 @DomainService(nature=NatureOfService.VIEW)
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 public class ScalarValueTypeMenu {
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypePage.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypePage.java
index 2810c3f..d26c3be 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypePage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypePage.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.customvalues;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantEntity.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantEntity.java
index d0cc682..76c410b 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantEntity.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantSeeding.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantSeeding.java
index b3be233..fd330ad 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantSeeding.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/NumberConstantSeeding.java
@@ -20,7 +20,7 @@
 
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdoValueSemantics.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdoValueSemantics.java
index b323437..b6cad33 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdoValueSemantics.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdoValueSemantics.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypeMenuJdo.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypeMenuJdo.java
index e957d28..673cb41 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypeMenuJdo.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypeMenuJdo.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jdo;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo.java
index 97bcb43..1b3f703 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo.java
@@ -20,8 +20,8 @@ package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jdo;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdo.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdo.java
index 193cc59..ba2c0c1 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdo.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java
index 6e6e88f..c7e7c2b 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java
@@ -27,7 +27,7 @@ import lombok.AccessLevel;
 
 @Profile("demo-jpa")
 //tag::class[]
-@javax.persistence.Embeddable                                       // <.>
+@jakarta.persistence.Embeddable                                       // <.>
 @Value                                                              // <.>
 @lombok.Getter                                                      // <.>
 @lombok.Setter(AccessLevel.PRIVATE)                                 // <.>
@@ -36,10 +36,10 @@ import lombok.AccessLevel;
 public class ComplexNumberJpa
         implements ComplexNumber {
 
-    @javax.persistence.Column(nullable = false)
+    @jakarta.persistence.Column(nullable = false)
     private double re;                                              // <.>
 
-    @javax.persistence.Column(nullable = false)
+    @jakarta.persistence.Column(nullable = false)
     private double im;                                              // <5>
 }
 //end::class[]
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpaValueSemantics.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpaValueSemantics.java
index 36455c0..54f042a 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpaValueSemantics.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpaValueSemantics.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jpa;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypeMenuJpa.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypeMenuJpa.java
index b23e642..ecd818e 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypeMenuJpa.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypeMenuJpa.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jpa;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypePageJpa.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypePageJpa.java
index 31a67da..846bc74 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypePageJpa.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/EmbeddedTypePageJpa.java
@@ -20,8 +20,8 @@ package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jpa;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpa.java b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpa.java
index 8a9c004..7e8ade0 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpa.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
@@ -77,7 +77,7 @@ public class NumberConstantJpa
     @Getter @Setter
     private String name;
 
-    @javax.persistence.Embedded                 // <.>
+    @jakarta.persistence.Embedded                 // <.>
     @Property(editing = Editing.ENABLED)
     @Getter @Setter
     private ComplexNumberJpa number;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/mixins/CountHolder.java b/domain/src/main/java/demoapp/dom/progmodel/mixins/CountHolder.java
index 191daf2..aaf6097 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/mixins/CountHolder.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/mixins/CountHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.mixins;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("demo.CountHolder")
 //tag::class[]
diff --git a/domain/src/main/java/demoapp/dom/progmodel/mixins/FibonacciNumberVm.java b/domain/src/main/java/demoapp/dom/progmodel/mixins/FibonacciNumberVm.java
index 6079917..0e53806 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/mixins/FibonacciNumberVm.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/mixins/FibonacciNumberVm.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.mixins;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java b/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java
index 3455216..b6b3aae 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.mixins;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -32,7 +32,7 @@ import lombok.val;
 @DomainService(
         nature = NatureOfService.VIEW
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class MixinMenu {
 
     @Action
diff --git a/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinPage.java b/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinPage.java
index e4554dc..06398f8 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.progmodel.mixins;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java b/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
index a354bde..0001df2 100644
--- a/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.progmodel.uihints;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -30,7 +30,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
 @DomainService(
         nature = NatureOfService.VIEW
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class UiHintsMenu {
 
     @Action
diff --git a/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java b/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
index e92c139..96c0819 100644
--- a/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
+++ b/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
@@ -18,9 +18,9 @@
  */
 package demoapp.dom.services.core;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -30,13 +30,11 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 import org.apache.causeway.applib.services.factory.FactoryService;
 
-import demoapp.dom.services.core.wrapperFactory.WrapperFactoryDemoPage;
-
-import lombok.RequiredArgsConstructor;
-
 import demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoPage;
 import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage;
 import demoapp.dom.services.core.messageservice.MessageServiceDemoPage;
+import demoapp.dom.services.core.wrapperFactory.WrapperFactoryDemoPage;
+import lombok.RequiredArgsConstructor;
 
 @Named("demo.ServicesMenu")
 @DomainService(nature=NatureOfService.VIEW)
diff --git a/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoPage.java b/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoPage.java
index 801ea9a..845f33c 100644
--- a/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoPage.java
+++ b/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.services.core.errorreportingservice;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceForDemo.java b/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceForDemo.java
index 8836c20..24e4acc 100644
--- a/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceForDemo.java
+++ b/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceForDemo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.core.errorreportingservice;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
diff --git a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoPage.java b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoPage.java
index a406240..9f74ff6 100644
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoPage.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoPage.java
@@ -21,8 +21,8 @@ package demoapp.dom.services.core.eventbusservice;
 import java.util.EventObject;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.Collection;
diff --git a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntry.java b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntry.java
index 6abc2a0..75e428b 100644
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntry.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntry.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.core.eventbusservice;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.ObjectSupport;
diff --git a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
index 1c4f023..0757e41 100644
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
@@ -21,7 +21,7 @@ package demoapp.dom.services.core.eventbusservice;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
index 866b398..866c54b 100644
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
@@ -20,8 +20,8 @@ package demoapp.dom.services.core.eventbusservice;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Repository;
diff --git a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
index f79acfb..b6994e2 100644
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
@@ -21,11 +21,11 @@ package demoapp.dom.services.core.eventbusservice;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
@@ -64,12 +64,12 @@ extends EventLogEntry {
     @GeneratedValue
     private Long id;
 
-    @javax.persistence.Column(nullable = true)
+    @jakarta.persistence.Column(nullable = true)
     @Property(editing = Editing.DISABLED)
     @Getter(onMethod_ = {@Override}) @Setter(onMethod_ = {@Override})
     private String event;
 
-    @javax.persistence.Column(nullable = true)
+    @jakarta.persistence.Column(nullable = true)
     @Property(editing = Editing.ENABLED)
     @Getter(onMethod_ = {@Override}) @Setter(onMethod_ = {@Override})
     private Acknowledge acknowledge;
diff --git a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
index a0d71db..e7c5388 100644
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
@@ -20,8 +20,8 @@ package demoapp.dom.services.core.eventbusservice;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Repository;
diff --git a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java
index ba25396..1989259 100644
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberForDemo.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.services.core.eventbusservice;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.event.EventListener;
diff --git a/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoPage.java b/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoPage.java
index 8457f52..1a4e1f5 100644
--- a/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoPage.java
+++ b/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoPage.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.services.core.messageservice;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumber.java b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumber.java
index c0c05c3..ee68b69 100644
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumber.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumber.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.core.wrapperFactory;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java
index 0f06ced..2ae909f 100644
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/PrimeNumberGenerator.java
@@ -1,7 +1,7 @@
 package demoapp.dom.services.core.wrapperFactory;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
index 32091f7..b135e95 100644
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.services.core.wrapperFactory;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java
index e1c60f3..f62e34c 100644
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_createPrimes.java
@@ -1,6 +1,6 @@
 package demoapp.dom.services.core.wrapperFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java
index 2f95340..82ad582 100644
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage_primeNumbers.java
@@ -2,7 +2,7 @@ package demoapp.dom.services.core.wrapperFactory;
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
diff --git a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdo.java b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdo.java
index 3155c54..f44993e 100644
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdo.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.core.wrapperFactory.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpa.java b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpa.java
index f5bcd23..8cbdb38 100644
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpa.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.services.core.wrapperFactory.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java b/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java
index 6f6f46c..708f73b 100644
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.extensions.secman;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,7 +37,7 @@ import demoapp.dom.services.extensions.secman.apptenancy.AppTenancyPage;
 @DomainObjectLayout(
         named="SecMan"
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class ExtSecManMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyPage.java b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyPage.java
index 373b559..6d9e79b 100644
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyPage.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyPage.java
@@ -20,13 +20,13 @@ package demoapp.dom.services.extensions.secman.apptenancy;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
index 5958e69..e367781 100644
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.extensions.secman.apptenancy.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
index ef56baa..b973ab0 100644
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.services.extensions.secman.apptenancy.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedEntity.java b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedEntity.java
index f3fb34d..702f689 100644
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedEntity.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.extensions.secman.apptenancy.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedSeeding.java b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedSeeding.java
index b6d0fe4..9af71ed 100644
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedSeeding.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/persistence/TenantedSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.services.extensions.secman.apptenancy.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/CausewayTypesMenu.java b/domain/src/main/java/demoapp/dom/types/causeway/CausewayTypesMenu.java
index 51f7e9f..8cd3413 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/CausewayTypesMenu.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/CausewayTypesMenu.java
@@ -19,7 +19,7 @@
  */
 package demoapp.dom.types.causeway;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -43,7 +43,7 @@ import demoapp.dom.types.causeway.treenode.FileNodeVm;
 @DomainObjectLayout(
         named="Causeway Types"
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class CausewayTypesMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.java
index 7f2e8c1..70affb9 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causeway.blobs;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder.java
index 096a22b..1cbd7c0 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.blobs.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.value.Blob;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
index 79345cb..ed977a5 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.blobs.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyOptionalPropertyWithChoices.java
index e745631..269c9c1 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.blobs.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
index e3a5a65..7b1038e 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.blobs.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
index 309ab7f..7ce0acf 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.blobs.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
index acc68f5..a31333b 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
@@ -18,16 +18,16 @@
  */
 package demoapp.dom.types.causeway.blobs.jpa;
 
-import javax.inject.Named;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.java
index c9102a3..10bb50c 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.blobs.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobSeeding.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobSeeding.java
index 87f43c2..4b2a314 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.blobs.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java b/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java
index 9de3292..0aaf96d 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.causeway.blobs.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.java
index d265c55..a2d1f50 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causeway.clobs;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder.java
index 7e69f73..6991692 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.clobs.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.value.Clob;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
index ed447b3..8509e0a 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.clobs.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 60f130b..f6870cd 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.clobs.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
index 0f7cfe2..c8ea189 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.clobs.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
index 939fb3b..0e00e0e 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.clobs.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
index 9609a75..dcfb3a6 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
@@ -18,16 +18,16 @@
  */
 package demoapp.dom.types.causeway.clobs.jpa;
 
-import javax.inject.Named;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.java
index 3e8b028..429eb71 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.clobs.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobSeeding.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobSeeding.java
index eef894c..45e0e78 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.clobs.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java b/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java
index 355a4b3..4f12a25 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.causeway.clobs.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java
index 5a9def1..d4a1b67 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causeway.localresourcepaths;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder.java
index 1fe2eb8..c805fba 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.localresourcepaths.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.value.LocalResourcePath;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
index b8a88fc..2a915b6 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.localresourcepaths.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalPropertyWithChoices.java
index f7a627d..e2956b3 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.localresourcepaths.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
index 11d2e1e..484d00a 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.localresourcepaths.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
index 60b096a..7e0fc05 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.localresourcepaths.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
index 851e305..48b68c5 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.types.causeway.localresourcepaths.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.java
index c467ffd..6a4e884 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.localresourcepaths.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathSeeding.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathSeeding.java
index a28c46c..d3c8abf 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.localresourcepaths.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java
index 41863bc..2e173ae 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.causeway.localresourcepaths.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.java
index 44573fa..5612738 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causeway.markups;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder.java
index 707e901..196fd7d 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.markups.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.value.Markup;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
index 9bb1a16..7dc724a 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.markups.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 95dce88..753d209 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.markups.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
index dd06145..a25581e 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.markups.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
index c40d8b4..a298c3c 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.markups.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
index f59d858..7d32b1a 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
@@ -18,16 +18,16 @@
  */
 package demoapp.dom.types.causeway.markups.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
index 902c3c8..2ca53b6 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.markups.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupSeeding.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupSeeding.java
index c6f8045..24c7b60 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.markups.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java b/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
index e21a4a3..e962854 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.causeway.markups.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.java
index 9baede0..309bd84 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causeway.passwords;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder.java
index 178fd09..38f0f02 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.passwords.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.value.Password;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
index 66d9930..7088813 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.passwords.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 07eb574..9039e9c 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.passwords.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
index ecc8601..e7090f0 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causeway.passwords.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
index 0c0b963..8e2bc3d 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.passwords.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
index 1df4a2d..bb222af 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.types.causeway.passwords.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.java
index 6fe4229..ebe3689 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.passwords.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_checkPassword.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_checkPassword.java
index 0f9710b..7865a89 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_checkPassword.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_checkPassword.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.passwords.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_showPassword.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_showPassword.java
index 064bae8..3a053a9 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_showPassword.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_showPassword.java
@@ -20,7 +20,7 @@ package demoapp.dom.types.causeway.passwords.persistence;
 
 import lombok.RequiredArgsConstructor;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordSeeding.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordSeeding.java
index 2a916a1..3f62a83 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.passwords.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java b/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
index 44fe72a..a66c228 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.types.causeway.passwords.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm.java b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm.java
index 76484d2..d2abfb7 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm.java
@@ -21,8 +21,8 @@ package demoapp.dom.types.causeway.treenode;
 import java.io.File;
 import java.util.Optional;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.LabelPosition;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm_tree.java b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm_tree.java
index d233f55..966fa15 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm_tree.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm_tree.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causeway.treenode;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.graph.tree.TreeNode;
diff --git a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java
index 9a6f406..067717f 100644
--- a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java
@@ -20,10 +20,10 @@ package demoapp.dom.types.causeway.treenode;
 
 import java.nio.file.FileSystems;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.servlet.http.HttpSession;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/CausewayValTypesMenu.java b/domain/src/main/java/demoapp/dom/types/causewayval/CausewayValTypesMenu.java
index d82bd56..17ba1bc 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/CausewayValTypesMenu.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/CausewayValTypesMenu.java
@@ -19,7 +19,7 @@
  */
 package demoapp.dom.types.causewayval;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -38,7 +38,7 @@ import demoapp.dom.types.causewayval.vegas.CausewayVegas;
         nature=NatureOfService.VIEW
 )
 @DomainObjectLayout(named="CausewayValTypes")
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class CausewayValTypesMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.java
index 0978230..0b6df2e 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causewayval.asciidocs;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder.java
index 7377fca..5af00e5 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.asciidocs.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
index 9f5490c..d8fbcaf 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.asciidocs.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 2b42ed0..2a923ec 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.asciidocs.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
index 4d69dfd..378eabe 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.asciidocs.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
index ea21ea3..43ecf5d 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.asciidocs.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
index 881a6ea..42814b2 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
@@ -18,16 +18,16 @@
  */
 package demoapp.dom.types.causewayval.asciidocs.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
index d3fd9d5..fb0b73f 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.asciidocs.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocSeeding.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocSeeding.java
index ec012f0..a66352c 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.asciidocs.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
index de2fff7..da09573 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.causewayval.asciidocs.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.java
index 85e1040..365b441 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causewayval.markdowns;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder.java
index 2263c70..8838796 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.markdowns.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
index d8af418..bb93bfb 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.markdowns.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 78d98d6..2f49544 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.markdowns.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
index d0fb58f..9e4f48b 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.markdowns.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
index d82ff47..b17019f 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.markdowns.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
index 12d54a9..99b1311 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
@@ -18,16 +18,16 @@
  */
 package demoapp.dom.types.causewayval.markdowns.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
index 337db4e..bc5c736 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.markdowns.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownSeeding.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownSeeding.java
index 416fbf2..0ca1a2b 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.markdowns.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
index a764f41..2db6802 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.causewayval.markdowns.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.java
index 701575b..0d52572 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.causewayval.vegas;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder.java
index ce5b845..ef2c5d4 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.vegas.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.valuetypes.vega.applib.value.Vega;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
index 0ff84cf..eb6e5df 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.vegas.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 6a116f8..d8289e0 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.vegas.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
index 7c7b84c..ba1fec2 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.causewayval.vegas.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
index 1166bb2..74a7eba 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.vegas.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
index e4d088c..d129a8f 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
@@ -18,16 +18,16 @@
  */
 package demoapp.dom.types.causewayval.vegas.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
index a6e7f89..f80c696 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.vegas.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaSeeding.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaSeeding.java
index 716b95f..57459a8 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.causewayval.vegas.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
index 3b94c19..dc68012 100644
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.causewayval.vegas.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/JavaAwtTypesMenu.java b/domain/src/main/java/demoapp/dom/types/javaawt/JavaAwtTypesMenu.java
index 93f9cf5..3cb8332 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/JavaAwtTypesMenu.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/JavaAwtTypesMenu.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javaawt;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,7 +37,7 @@ import demoapp.dom.types.javaawt.images.BufferedImages;
 @DomainObjectLayout(
         named="JavaAwtTypes"
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class JavaAwtTypesMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/BufferedImages.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/BufferedImages.java
index dc85f38..118d626 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/BufferedImages.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/BufferedImages.java
@@ -21,13 +21,13 @@ package demoapp.dom.types.javaawt.images;
 import java.awt.image.BufferedImage;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder.java
index 08e4e72..10a1861 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javaawt.images.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import java.awt.image.BufferedImage;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_actionReturningCollection.java
index 76ff4cc..d59c671 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javaawt.images.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 6a4041c..788fcb8 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javaawt.images.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyPropertyWithChoices.java
index ad2205c..cd65f81 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javaawt.images.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder.java
index fabd3ad..56c7f49 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder.java
@@ -20,7 +20,7 @@ package demoapp.dom.types.javaawt.images.holder;
 
 import java.awt.image.BufferedImage;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("demo.JavaAwtBufferedImageHolder")
 //tag::class[]
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
index 7f4c452..4e949ac 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
@@ -22,7 +22,7 @@ import java.awt.image.BufferedImage;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
index a8b1895..506d29b 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
@@ -22,7 +22,7 @@ import java.awt.image.BufferedImage;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
index dc7bafa..8b5fd24 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
@@ -20,7 +20,7 @@ package demoapp.dom.types.javaawt.images.jdo;
 
 import java.awt.image.BufferedImage;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java
index 6009280..3b0f28d 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/BufferedImageJpa.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.javaawt.images.jpa;
 
 import java.awt.image.BufferedImage;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageEntity.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageEntity.java
index dc788ac..c2c326c 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javaawt.images.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageSeeding.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageSeeding.java
index 713a3fa..ee227bd 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javaawt.images.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java b/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
index 11d1d16..30ae9ce 100644
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javaawt.images.samples;
 import java.awt.image.BufferedImage;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/JavaLangTypesMenu.java b/domain/src/main/java/demoapp/dom/types/javalang/JavaLangTypesMenu.java
index 7ecfc72..c4e88d6 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/JavaLangTypesMenu.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/JavaLangTypesMenu.java
@@ -19,7 +19,7 @@
  */
 package demoapp.dom.types.javalang;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -40,7 +40,7 @@ import demoapp.dom.types.javalang.voids.JavaLangVoids;
 @DomainObjectLayout(
         named="JavaLangTypes"
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class JavaLangTypesMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java b/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java
index f02a5d6..7d2d0ae 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -44,7 +44,7 @@ import demoapp.dom.types.javalang.shorts.WrapperShorts;
 @DomainObjectLayout(
         named="JavaLangWrapperTypes"
 )
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
 public class JavaLangWrapperTypesMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java
index ac517f5..2db38fe 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.javalang.booleans;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java
index 46672ac..42a321f 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.booleans.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import java.lang.Boolean;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java
index ee76482..8581740 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.booleans.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 411444b..1f84667 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.booleans.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java
index 06e6ab2..aa4ed2a 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.booleans.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
index 812e55c..819e6fa 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.booleans.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
index 1d74d6a..6fed5e0 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.types.javalang.booleans.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java
index 77e53b5..c348fdd 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.booleans.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java
index 506f436..736977d 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.booleans.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java b/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
index 05c3c8d..d318d91 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.javalang.booleans.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
index 119b04a..f9237cf 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.javalang.bytes;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
index 3814ac8..0867cc3 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.bytes.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import java.lang.Byte;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
index b2a2bc3..8e20922 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.bytes.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalPropertyWithChoices.java
index ca961eb..d164466 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.bytes.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
index 979f3aa..6eabda6 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.bytes.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
index 12b2a98..ba5ae5b 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.bytes.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
index e622df0..5448d66 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.types.javalang.bytes.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java
index b76246d..ff5709e 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.bytes.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteSeeding.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteSeeding.java
index 9ddf512..a77951a 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.bytes.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java b/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
index d36a1fa..c021444 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.javalang.bytes.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
index 3eb7e83..41eaa9c 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.javalang.characters;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
index 0999eeb..c7de68f 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.characters.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import java.lang.Character;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
index 43bd641..45fa75a 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.characters.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalPropertyWithChoices.java
index e66f22b..a6d3c09 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.characters.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
index 4af0958..3e55c5e 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.characters.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
index 279e502..579b4bc 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.characters.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
index a53eba1..3b55baf 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.types.javalang.characters.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java
index 4268460..dfe073c 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.characters.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterSeeding.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterSeeding.java
index cd4012c..6f50422 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.characters.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java b/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
index ca59b97..252fe5b 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.javalang.characters.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java
index 1fecad1..1533085 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.javalang.doubles;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder.java
index 4107e28..038e49d 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.doubles.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import java.lang.Double;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_actionReturningCollection.java
index 3683c31..d884d69 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.doubles.holder;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyOptionalPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 51fecee..1838a12 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.doubles.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyPropertyWithChoices.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyPropertyWithChoices.java
index 604c8ab..30a7f3d 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.doubles.holder;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
index 072018b..47298e3 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.doubles.jdo;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
index ac0d10e..94c7f88 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.types.javalang.doubles.jpa;
 
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.java
index 6fc9e10..22e8a45 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.doubles.persistence;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleSeeding.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleSeeding.java
index 3c2c594..3079486 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.doubles.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java b/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
index 6d9bdc4..89be2d4 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.types.javalang.doubles.vm;
 
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.java b/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.java
index 20780f6..a78d834 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.java
@@ -20,13 +20,13 @@ package demoapp.dom.types.javalang.enums;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder.java b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder.java
index 1bb395b..096926e 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.types.javalang.enums.holder;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import demoapp.dom._infra.samples.DemoEnum;
 
diff --git a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturningCollection.java b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturningCollection.java
index b69fdbf..bb7ad5a 100644
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package demoapp.dom.types.javalang.enums.holder;
... 5415 lines suppressed ...