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 2025/03/17 09:14:41 UTC

(causeway) branch 3866-no.jdo created (now 0f0758f5107)

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

ahuber pushed a change to branch 3866-no.jdo
in repository https://gitbox.apache.org/repos/asf/causeway.git


      at 0f0758f5107 CAUSEWAY-3866: Removal of JDO Integration

This branch includes the following new commits:

     new 0f0758f5107 CAUSEWAY-3866: Removal of JDO Integration

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) 01/01: CAUSEWAY-3866: Removal of JDO Integration

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

ahuber pushed a commit to branch 3866-no.jdo
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 0f0758f51075ce3d00baa116cd820a07e0d6622f
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Mar 17 10:14:33 2025 +0100

    CAUSEWAY-3866: Removal of JDO Integration
    
    yet has ~5 tests disabled
    search for TODO[causeway-regressiontests-CAUSEWAY-3866]
---
 antora/pom.xml                                     |   2 -
 bom/pom.xml                                        | 261 +-------
 .../progmodel/ProgrammingModelConstants.java       |   3 +-
 core/internaltestsupport/pom.xml                   |  11 -
 core/pom.xml                                       |  25 -
 .../commandlog/persistence-jdo/log4j2-test.xml     |  78 ---
 .../persistence-jdo/logging-dn-enhance.properties  |  48 --
 extensions/core/commandlog/persistence-jdo/pom.xml |  94 ---
 .../CausewayModuleExtCommandLogPersistenceJdo.java |  65 --
 .../commandlog/jdo/dom/CommandLogEntry.java        | 318 ---------
 .../jdo/dom/CommandLogEntryRepository.java         |  58 --
 .../commandlog/jdo/integtests/AppManifest.java     |  47 --
 .../integtests/BackgroundService_IntegTest.java    |  38 --
 .../jdo/integtests/CommandLog_IntegTest.java       |  37 --
 .../commandlog/jdo/integtests/model/Counter.java   |  64 --
 .../jdo/integtests/model/CounterRepository.java    |  32 -
 .../src/test/resources/application-test.yml        |  26 -
 extensions/core/commandlog/persistence-jpa/pom.xml |   6 -
 extensions/core/commandlog/pom.xml                 |   6 -
 extensions/core/excel/applib/pom.xml               |   5 -
 .../excel/fixture/logging-dn-enhance.properties    |  41 --
 extensions/core/excel/fixture/pom.xml              |   2 +-
 .../BulkUpdateLineItemForDemoToDoItem.java         |   3 +-
 .../demoapp/todomodule/dom/ExcelDemoToDoItem.java  | 135 ++--
 .../fixturescripts/ExcelDemoToDoItem_tearDown.java |   4 +-
 .../ExcelDemoToDoItem_tearDown2.java               |  10 +-
 extensions/core/excel/integtests/pom.xml           |  10 +-
 .../integtests/ExcelModuleIntegTestAbstract.java   |   5 +-
 .../persistence-jdo/logging-dn-enhance.properties  |  48 --
 .../core/executionlog/persistence-jdo/pom.xml      |  95 ---
 ...ausewayModuleExtExecutionLogPersistenceJdo.java |  66 --
 .../executionlog/jdo/dom/ExecutionLogEntry.java    | 213 ------
 .../executionlog/jdo/dom/ExecutionLogEntryPK.java  |  78 ---
 .../jdo/dom/ExecutionLogEntryRepository.java       |  59 --
 .../jdo/integtests/ExecutionLog_IntegTest.java     |  63 --
 .../executionlog/jdo/integtests/model/Counter.java |  64 --
 .../jdo/integtests/model/CounterRepository.java    |  32 -
 .../src/test/resources/application-test.yml        |  26 -
 extensions/core/executionlog/pom.xml               |   6 -
 .../persistence-jdo/logging-dn-enhance.properties  |  48 --
 .../core/executionoutbox/persistence-jdo/pom.xml   |  95 ---
 ...ewayModuleExtExecutionOutboxPersistenceJdo.java |  67 --
 .../jdo/dom/ExecutionOutboxEntry.java              | 141 ----
 .../jdo/dom/ExecutionOutboxEntryPK.java            |  87 ---
 .../jdo/dom/ExecutionOutboxEntryRepository.java    |  61 --
 .../jdo/integtests/ExecutionOutbox_IntegTest.java  |  62 --
 .../jdo/integtests/model/Counter.java              |  64 --
 .../jdo/integtests/model/CounterRepository.java    |  32 -
 .../src/test/resources/application-test.yml        |  26 -
 extensions/core/executionoutbox/pom.xml            |  13 -
 .../audittrail/persistence-jdo/log4j2-test.xml     |  78 ---
 .../persistence-jdo/logging-dn-enhance.properties  |  41 --
 .../security/audittrail/persistence-jdo/pom.xml    |  78 ---
 .../CausewayModuleExtAuditTrailPersistenceJdo.java |  63 --
 .../audittrail/jdo/dom/AuditTrailEntry.java        | 273 --------
 .../jdo/dom/AuditTrailEntryRepository.java         |  32 -
 .../jdo/integtests/AuditTrail_IntegTest.java       |  64 --
 .../audittrail/jdo/integtests/model/Counter.java   |  65 --
 .../jdo/integtests/model/CounterRepository.java    |  32 -
 .../src/test/resources/application-test.yml        |  26 -
 .../security/audittrail/persistence-jpa/pom.xml    |   6 -
 extensions/security/audittrail/pom.xml             |   6 -
 extensions/security/secman/applib/pom.xml          |   7 -
 .../secman/persistence-jdo/log4j2-test.xml         |  78 ---
 .../persistence-jdo/logging-dn-enhance.properties  |  41 --
 extensions/security/secman/persistence-jdo/pom.xml |  76 ---
 .../jdo/CausewayModuleExtSecmanPersistenceJdo.java |  80 ---
 .../secman/jdo/package.jdo~breaks-mvn-build        |  37 --
 .../jdo/permission/dom/ApplicationPermission.java  | 141 ----
 .../dom/ApplicationPermissionRepository.java       |  36 -
 .../secman/jdo/role/dom/ApplicationRole.java       | 113 ----
 .../jdo/role/dom/ApplicationRoleRepository.java    |  37 --
 .../secman/jdo/tenancy/dom/ApplicationTenancy.java | 130 ----
 .../tenancy/dom/ApplicationTenancyRepository.java  |  37 --
 .../secman/jdo/user/dom/ApplicationUser.java       | 189 ------
 .../jdo/user/dom/ApplicationUserRepository.java    |  37 --
 .../extensions/secman/jdo/util/RegexReplacer.java  |  38 --
 .../ApplicationPermissionRepository_IntegTest.java |  57 --
 .../src/test/resources/application-test.yml        |  45 --
 extensions/security/secman/persistence-jpa/pom.xml |   7 -
 extensions/security/secman/pom.xml                 |   6 -
 .../sessionlog/persistence-jdo/log4j2-test.xml     |  78 ---
 .../persistence-jdo/logging-dn-enhance.properties  |  41 --
 .../security/sessionlog/persistence-jdo/pom.xml    |  76 ---
 .../CausewayModuleExtSessionLogPersistenceJdo.java |  63 --
 .../sessionlog/jdo/dom/SessionLogEntry.java        | 190 ------
 .../jdo/dom/SessionLogEntryRepository.java         |  33 -
 .../jdo/integtests/SessionLog_IntegTest.java       |  54 --
 .../src/test/resources/application-test.yml        |  26 -
 .../security/sessionlog/persistence-jpa/pom.xml    |   6 -
 extensions/security/sessionlog/pom.xml             |   6 -
 .../pdfjs/fixtures/logging-dn-enhance.properties   |  41 --
 extensions/vw/pdfjs/fixtures/pom.xml               |   1 -
 .../demomodule/dom/PdfJsDemoObjectWithBlob.java    |   2 +-
 persistence/jdo/adoc/antora.yml                    |  23 -
 .../images/hints-n-tips/diagnosing-n-plus-1.png    | Bin 143232 -> 0 bytes
 .../party-agreementrole-agreement.png              | Bin 10310 -> 0 bytes
 persistence/jdo/adoc/modules/ROOT/nav.adoc         |   4 -
 persistence/jdo/adoc/modules/ROOT/pages/about.adoc |  15 -
 .../disabling-persistence-by-reachability.adoc     |  91 ---
 .../jdo/adoc/modules/ROOT/pages/db-schemas.adoc    |  47 --
 .../modules/ROOT/pages/dependency-injection.adoc   |  24 -
 .../jdo/adoc/modules/ROOT/pages/enhancer.adoc      |  36 -
 .../adoc/modules/ROOT/pages/hints-and-tips.adoc    |  14 -
 .../jdo/adoc/modules/ROOT/pages/mapping-guide.adoc |  18 -
 .../ROOT/pages/setup-and-configuration.adoc        | 185 ------
 persistence/jdo/adoc/modules/ROOT/pages/spis.adoc  |   8 -
 .../adoc/modules/ROOT/partials/component-nav.adoc  |   2 -
 .../hints-and-tips/diagnosing-n-plus-1.adoc        |  15 -
 .../hints-and-tips/jdoql-and-timestamps.adoc       |  75 ---
 .../hints-and-tips/overriding-jdo-annotations.adoc |  82 ---
 .../subtype-entity-not-fully-populated.adoc        |  59 --
 .../hints-and-tips/tracing-sql-statements.adoc     |  74 ---
 .../typesafe-queries-and-fetchgroups.adoc          | 110 ----
 .../partials/mapping-guide/custom-value-types.adoc | 164 -----
 .../mandatory-properties-in-subtypes.adoc          |  45 --
 .../partials/mapping-guide/mapping-to-a-view.adoc  |  17 -
 .../one-to-m-bidirectional-relationships.adoc      | 320 ---------
 .../jdo/adoc/modules/ROOT/partials/module-nav.adoc |  15 -
 .../partials/spis/JdoEntityDiscoveryListener.adoc  |  69 --
 persistence/jdo/applib/pom.xml                     | 103 ---
 .../jdo/applib/src/main/java/module-info.java      |  31 -
 .../applib/CausewayModulePersistenceJdoApplib.java |  28 -
 .../jdo/applib/services/JdoSupportService.java     | 180 -----
 .../persistence/jdo/applib/types/AddressLine.java  |  72 --
 .../persistence/jdo/applib/types/Description.java  |  81 ---
 .../persistence/jdo/applib/types/Email.java        |  95 ---
 .../persistence/jdo/applib/types/Fqcn.java         |  73 ---
 .../jdo/applib/types/LogicalTypeName.java          |  81 ---
 .../persistence/jdo/applib/types/Money.java        |  79 ---
 .../persistence/jdo/applib/types/Name.java         |  73 ---
 .../persistence/jdo/applib/types/Notes.java        |  81 ---
 .../jdo/applib/types/ObjectIdentifier.java         |  80 ---
 .../persistence/jdo/applib/types/Percentage.java   |  79 ---
 .../persistence/jdo/applib/types/PhoneNumber.java  |  89 ---
 .../persistence/jdo/applib/types/PostalCode.java   |  73 ---
 .../persistence/jdo/applib/types/ProperName.java   |  73 ---
 .../persistence/jdo/applib/types/Reference.java    |  89 ---
 .../persistence/jdo/applib/types/Title.java        |  73 ---
 .../persistence/jdo/applib/types/UrlTemplate.java  |  73 ---
 .../persistence/jdo/applib/types/Username.java     |  73 ---
 persistence/jdo/datanucleus/pom.xml                | 107 ---
 .../CausewayModulePersistenceJdoDatanucleus.java   | 316 ---------
 ...sewayModulePersistenceJdoDatanucleusMixins.java |  50 --
 .../NonEnhancedClassesFailureAnalyzer.java         |  70 --
 .../changetracking/JdoLifecycleListener.adoc       |  66 --
 .../changetracking/JdoLifecycleListener.java       | 234 -------
 .../PreAndPostValueEvaluatorServiceJdo.java        |  99 ---
 .../jdo/datanucleus/changetracking/_Utils.java     |  76 ---
 .../datanucleus/config/DatanucleusSettings.java    | 142 ----
 .../jdo/datanucleus/dialect/DnJdoDialect.java      |  81 ---
 .../entities/DnEntityStateProvider.java            | 105 ---
 .../entities/DnOidStoreAndRecoverHelper.java       |  62 --
 .../entities/DnStateManagerForCauseway.java        | 314 ---------
 .../entities/DnStateManagerForHollow.java          | 285 --------
 .../exrecog/JdoObjectNotFoundRecognizer.java       |  53 --
 .../jdosupport/JdoSupportServiceDefault.java       | 220 -------
 .../metamodel/facets/entity/JdoEntityFacet.java    | 435 ------------
 .../metamodel/facets/entity/_MetadataUtil.java     | 113 ----
 .../mixins/Persistable_datanucleusVersionLong.java |  73 ---
 .../Persistable_datanucleusVersionTimestamp.java   |  73 ---
 .../mixins/Persistable_downloadJdoMetadata.java    |  95 ---
 .../applib/CausewayBookmarkConverter.java          |  50 --
 .../applib/CausewayLocalResourcePathConverter.java |  46 --
 .../applib/CausewayMarkupConverter.java            |  46 --
 .../applib/CausewayPasswordConverter.java          |  46 --
 .../JavaAwtBufferedImageByteArrayConverter.java    |  61 --
 .../schema/v2/CausewayChangesDtoConverter.java     |  43 --
 .../schema/v2/CausewayCommandDtoConverter.java     |  43 --
 .../schema/v2/CausewayInteractionDtoConverter.java |  43 --
 .../schema/v2/CausewayOidDtoConverter.java         |  49 --
 .../time/OffsetDateTimeConverterForJdo.java        |  44 --
 .../time/OffsetTimeConverterForJdo.java            |  44 --
 .../time/ZonedDateTimeConverterForJdo.java         |  44 --
 .../valuemappings/ByteArrayBlobRdbmsMapping.java   |  51 --
 .../valuemappings/CausewayBlobMapping.java         | 132 ----
 .../valuemappings/CausewayClobMapping.java         | 120 ----
 .../valuetypes/DnByteIdValueSemantics.java         |  70 --
 .../valuetypes/DnCharIdValueSemantics.java         |  92 ---
 .../DnDatastoreIdImplValueSemantics.java           |  85 ---
 .../DnDatastoreUniqueLongIdValueSemantics.java     |  49 --
 .../valuetypes/DnIntIdValueSemantics.java          |  71 --
 .../valuetypes/DnLongIdValueSemantics.java         |  71 --
 .../valuetypes/DnObjectIdValueSemantics.java       | 113 ----
 .../valuetypes/DnScoidValueSemantics.java          |  58 --
 .../valuetypes/DnShortIdValueSemantics.java        |  71 --
 .../valuetypes/DnStringIdValueSemantics.java       |  91 ---
 .../valuetypes/JdoByteIdentityValueSemantics.java  |  69 --
 .../valuetypes/JdoCharIdentityValueSemantics.java  |  91 ---
 .../valuetypes/JdoDatastoreIdValueSemantics.java   |  95 ---
 .../valuetypes/JdoIntIdentityValueSemantics.java   |  70 --
 .../valuetypes/JdoLongIdentityValueSemantics.java  |  70 --
 .../JdoObjectIdentityValueSemantics.java           | 112 ----
 .../valuetypes/JdoShortIdentityValueSemantics.java |  70 --
 .../JdoStringIdentityValueSemantics.java           |  90 ---
 .../src/main/resources/META-INF/MANIFEST.MF        |   6 -
 .../src/main/resources/META-INF/spring.factories   |   2 -
 .../jdo/datanucleus/src/main/resources/plugin.xml  | 247 -------
 .../oid/IdStringifierForByteIdentity_Test.java     |  70 --
 .../oid/IdStringifierForCharIdentity_Test.java     |  83 ---
 ...erForDatastoreId_DatastoreIdImpl_long_Test.java |  71 --
 ...atastoreId_DatastoreUniqueLongId_long_Test.java |  70 --
 ...DatastoreId_DatastoreUniqueLongId_str_Test.java |  70 --
 .../oid/IdStringifierForIntId_Test.java            |  68 --
 .../oid/IdStringifierForIntIdentity_Test.java      |  69 --
 .../oid/IdStringifierForLongId_Test.java           |  68 --
 .../oid/IdStringifierForLongIdentity_Test.java     |  69 --
 .../oid/IdStringifierForObjectIdentity_Test.java   |  69 --
 .../oid/IdStringifierForShortIdentity_Test.java    |  69 --
 .../oid/IdStringifierForStringIdentity_Test.java   |  76 ---
 .../datanucleus/test/ConfigurationExample1.java    |  49 --
 .../datanucleus/test/ConfigurationExample2.java    |  58 --
 .../datanucleus/test/ConfigurationExample3.java    |  93 ---
 .../jdo/datanucleus/test/ConfigurationTest1.java   |  52 --
 .../jdo/datanucleus/test/ConfigurationTest2.java   |  43 --
 .../jdo/datanucleus/test/ConfigurationTest3.java   |  63 --
 .../jdo/datanucleus/test/JdoSettingsBean.java      |  66 --
 persistence/jdo/integration/pom.xml                |  90 ---
 .../jdo/integration/src/main/java/module-info.java |  34 -
 .../CausewayModulePersistenceJdoIntegration.java   |  40 --
 .../metamodel/JdoPrimaryKeyPropertyPredicate.java  |  47 --
 .../integration/metamodel/JdoPropertyUtils.java    |  79 ---
 persistence/jdo/metamodel/pom.xml                  |  75 ---
 .../jdo/metamodel/src/main/java/module-info.java   |  36 -
 .../CausewayModulePersistenceJdoMetamodel.java     |  45 --
 .../jdo/metamodel/JdoProgrammingModel.java         | 144 ----
 ...JdoDatastoreIdentityAnnotationFacetFactory.java |  61 --
 .../JdoDatastoreIdentityFacetAbstract.java         |  57 --
 .../JdoDatastoreIdentityFacetAnnotation.java       |  47 --
 .../object/datastoreidentity/package-info.java     |  17 -
 .../JdoPersistenceCapableFacetFactory.java         | 117 ----
 .../JdoPersistenceCapableFacetFromAnnotation.java  | 147 -----
 .../object/query/JdoQueriesFacetAnnotation.java    |  36 -
 .../query/JdoQueryAnnotationFacetFactory.java      | 107 ---
 .../facets/object/query/JdoQueryFacetAbstract.java |  63 --
 .../object/query/JdoQueryFacetAnnotation.java      |  37 --
 .../query/MetaModelValidatorForJdoqlAbstract.java  |  98 ---
 .../MetaModelValidatorForJdoqlFromClause.java      |  91 ---
 .../MetaModelValidatorForJdoqlVariablesClause.java |  73 ---
 .../version/JdoVersionAnnotationFacetFactory.java  |  90 ---
 .../version/JdoVersionFacetFromAnnotation.java     |  45 --
 .../facets/object/version/package-info.java        |  17 -
 ...DecimalFromJdoColumnAnnotationFacetFactory.java |  91 ---
 ...atoryFacetFromAbsenceOfJdoColumnAnnotation.java |  35 -
 .../MandatoryFacetFromJdoColumnAnnotation.java     |  35 -
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java | 143 ----
 ...actionalDigitsFacetFromJdoColumnAnnotation.java |  46 --
 .../MaxLengthFacetFromJdoColumnAnnotation.java     |  48 --
 ...xLengthFromJdoColumnAnnotationFacetFactory.java |  87 ---
 ...MaxTotalDigitsFacetFromJdoColumnAnnotation.java |  47 --
 ...actionalDigitsFacetFromJdoColumnAnnotation.java |  46 --
 .../JdoNotPersistentAnnotationFacetFactory.java    |  90 ---
 .../JdoNotPersistentFacetAbstract.java             |  37 --
 .../JdoNotPersistentFacetFromAnnotation.java       |  29 -
 .../DisabledFacetFromJdoPrimaryKeyAnnotation.java  |  36 -
 .../JdoPrimaryKeyAnnotationFacetFactory.java       |  66 --
 .../primarykey/JdoPrimaryKeyFacetAbstract.java     |  37 --
 .../primarykey/JdoPrimaryKeyFacetAnnotation.java   |  29 -
 .../prop/primarykey/JdoPrimaryKeyFacetImpl.java    |  29 -
 .../MandatoryFacetFromJdoPrimaryKeyAnnotation.java |  43 --
 .../facets/prop/primarykey/package-info.java       |  22 -
 .../jdo/metamodel/menu/JdoMetamodelMenu.java       | 112 ----
 ...atastoreIdentityAnnotationFacetFactoryTest.java | 123 ----
 ...GivenJdoPersistenceCapableFacetFactoryTest.java | 156 -----
 .../query/JdoQueryAnnotationFacetFactoryTest.java  | 101 ---
 .../JdoVersionAnnotationFacetFactoryTest.java      |  96 ---
 ...VersionAnnotationFacetFactoryTest_validate.java | 152 -----
 .../object/version/TypeIdentifierTestFactory.java  |  31 -
 ...malFromJdoColumnAnnotationFacetFactoryTest.java | 123 ----
 ...oryFromJdoColumnAnnotationFacetFactoryTest.java | 149 -----
 ...impleObjectWithBigDecimalColumnAnnotations.java |  89 ---
 ...impleObjectWithColumnAllowsNullAnnotations.java |  95 ---
 ...JdoNotPersistentAnnotationFacetFactoryTest.java | 120 ----
 .../SimpleObjectWithNotPersistentColumn.java       |  35 -
 ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java | 145 ----
 .../primarykey/SimpleObjectWithPrimaryKey.java     |  35 -
 .../ObjectReflectorDefaultTest_object.java         |  85 ---
 .../SpecificationLoaderTestAbstract.java           | 100 ---
 .../testing/AbstractFacetFactoryTest.java          | 151 -----
 .../persistence/jdo/metamodel/testing/Utils.java   |  54 --
 persistence/jdo/pom.xml                            |  44 --
 persistence/jdo/provider/pom.xml                   |  54 --
 .../jdo/provider/src/main/java/module-info.java    |  37 --
 .../config/JdoEntityDiscoveryListener.java         |  53 --
 .../jdo/provider/entities/JdoFacetContext.java     |  38 --
 .../JdoDatastoreIdentityFacet.java                 |  32 -
 .../JdoPersistenceCapableFacet.java                |  43 --
 .../facets/object/query/JdoNamedQuery.java         |  65 --
 .../facets/object/query/JdoQueryFacet.java         |  57 --
 .../facets/object/version/JdoVersionFacet.java     |  25 -
 .../prop/notpersistent/JdoNotPersistentFacet.java  |  34 -
 .../facets/prop/primarykey/JdoPrimaryKeyFacet.java |  34 -
 .../persistence/HasPersistenceManager.java         |  98 ---
 persistence/jdo/spring/README.adoc                 | 501 --------------
 persistence/jdo/spring/pom.xml                     | 113 ----
 .../jdo/spring/src/main/java/module-info.java      |  42 --
 .../spring/CausewayModulePersistenceJdoSpring.java |  48 --
 .../JdoObjectRetrievalFailureException.java        |  42 --
 .../JdoOptimisticLockingFailureException.java      |  42 --
 .../exceptions/JdoResourceFailureException.java    |  45 --
 .../jdo/spring/exceptions/JdoSystemException.java  |  41 --
 .../jdo/spring/exceptions/JdoUsageException.java   |  45 --
 .../ObjectOptimisticLockingFailureException.java   | 152 -----
 .../ObjectRetrievalFailureException.java           | 127 ----
 .../jdo/spring/exceptions/package-info.java        |  23 -
 .../jdo/spring/integration/DefaultJdoDialect.java  | 269 --------
 .../jdo/spring/integration/JdoDialect.java         | 169 -----
 .../spring/integration/JdoTransactionManager.java  | 620 ------------------
 .../LocalPersistenceManagerFactoryBean.java        | 324 ---------
 .../PersistenceManagerFactoryUtils.java            | 338 ----------
 .../integration/PersistenceManagerHolder.java      |  65 --
 ...sactionAwarePersistenceManagerFactoryProxy.java | 229 -------
 .../jdo/spring/integration/package-info.java       |  24 -
 .../OpenPersistenceManagerInViewFilter.java        | 162 -----
 .../OpenPersistenceManagerInViewInterceptor.java   | 141 ----
 .../support/SpringPersistenceManagerProxyBean.java | 229 -------
 .../StandardPersistenceManagerProxyBean.java       |  71 --
 .../jdo/spring/support/package-info.java           |  23 -
 .../java/javax/transaction/Synchronization.java    |  27 -
 .../integration/JdoTransactionManagerTests.java    | 729 ---------------------
 .../LocalPersistenceManagerFactoryTests.java       | 164 -----
 .../test/integration/MockJtaTransaction.java       |  66 --
 .../support/OpenPersistenceManagerInViewTests.java | 153 -----
 .../jdo/spring/src/test/resources/test.properties  |  19 -
 .../jpa/applib/services/JpaSupportService.java     |   2 +
 .../services/JpaSupportServiceUsingSpring.java     |   7 +
 persistence/querydsl/applib/pom.xml                |   6 -
 persistence/querydsl/jdo/pom.xml                   |  96 ---
 .../querydsl/jdo/src/main/java/module-info.java    |  30 -
 .../jdo/CausewayModulePersistenceQueryDslJdo.java  |  43 --
 .../querydsl/jdo/query/DslQueryJdo.java            | 328 ---------
 .../services/support/DetachedQueryFactoryJdo.java  |  47 --
 .../jdo/services/support/QueryDslSupportJdo.java   | 122 ----
 persistence/querydsl/pom.xml                       |   1 -
 regressiontests/base/logging-dn-enhance.properties |  41 --
 regressiontests/base/pom.xml                       |  35 -
 .../testdomain/conf/Configuration_usingJdo.java    |  55 --
 .../testdomain/jdo/HasPersistenceStandardJdo.java  |  32 -
 .../causeway/testdomain/jdo/JdoBookView.java       |  61 --
 .../causeway/testdomain/jdo/JdoInventoryDao.java   |  53 --
 .../testdomain/jdo/JdoInventoryJaxbVm.java         | 193 ------
 .../testdomain/jdo/JdoInventoryJaxbVm.layout.xml   |  78 ---
 .../jdo/JdoInventoryJaxbVm_selectBooksForSale.java |  60 --
 .../testdomain/jdo/JdoInventoryManager.java        |  64 --
 .../testdomain/jdo/JdoInventoryResource.java       | 173 -----
 .../testdomain/jdo/JdoTestApplication.java         |  27 -
 .../testdomain/jdo/JdoTestDomainModule.java        |  31 -
 .../testdomain/jdo/JdoTestDomainPersona.java       | 120 ----
 .../causeway/testdomain/jdo/JdoTestFixtures.java   |  95 ---
 .../jdo/RegressionTestWithJdoFixtures.java         |  47 --
 .../jdo/annotation/EntityWithIdAndVersion.java     |  51 --
 .../causeway/testdomain/jdo/entities/JdoBook.java  | 177 -----
 .../testdomain/jdo/entities/JdoBook_delete.java    |  53 --
 .../jdo/entities/JdoEntityMetaAnnotated.java       |  26 -
 .../testdomain/jdo/entities/JdoInventory.java      |  75 ---
 .../testdomain/jdo/entities/JdoProduct.java        | 105 ---
 .../testdomain/jdo/entities/JdoProductComment.java |  57 --
 .../causeway/testdomain/jpa/JpaBookView.java       |   2 +-
 .../publishing/PublishingTestFactoryJdo.java       | 407 ------------
 .../stubs/ExecutionPublishingTestAbstract.java     |   3 -
 .../LifecycleEventPublishingTestAbstract.java      |  30 +-
 .../LifecycleEventSubscriberJdoForTesting.java     | 104 ---
 .../testdomain/util/rest/RestEndpointService.java  |  38 +-
 .../testdomain/wrapperfactory/Counter.java         |  31 +-
 .../wrapperfactory/WrapperTestFixtures.java        |   9 +-
 .../persistence-jdo/log4j2-test.xml                |  78 ---
 .../persistence-jdo/logging-dn-enhance.properties  |  48 --
 .../cmdexecauditsess/persistence-jdo/pom.xml       |  94 ---
 .../integtests/CmdExecAuditSessLog_IntegTest.java  |  86 ---
 .../jdo/integtests/model/Counter.java              |  65 --
 .../jdo/integtests/model/CounterRepository.java    |  32 -
 .../src/test/resources/application-test.yml        |  31 -
 .../integtests/CmdExecAuditSessLog_IntegTest.java  |   6 +-
 regressiontests/cmdexecauditsess/pom.xml           |   1 -
 regressiontests/core-wrapperfactory/pom.xml        |   2 +-
 .../CoreWrapperFactory_IntegTestAbstract.java      |  12 +-
 .../integtests/WrapperFactory_async_IntegTest.java |   6 +-
 .../persistence-jdo/log4j2-debug-persistence.xml   |  75 ---
 regressiontests/persistence-jdo/log4j2-test.xml    |  78 ---
 regressiontests/persistence-jdo/pom.xml            |  65 --
 .../domainmodel/jdo/DomainModelTest.java           | 114 ----
 .../injecting/jdo/JdoEntityInjectingTest.java      | 151 -----
 .../persistence/jdo/JdoBootstrappingTest.java      | 113 ----
 .../jdo/JdoExceptionTranslationTest.java           | 102 ---
 ...xceptionTranslationTest_usingTransactional.java | 144 ----
 .../testdomain/persistence/jdo/JdoJaxbTest.java    |  68 --
 .../testdomain/persistence/jdo/JdoQueryTest.java   | 162 -----
 .../persistence/jdo/_JdoExceptionTranslator.java   |  70 --
 .../timestamping/jdo/JdoTimestampingTest.java      |  78 ---
 ...actionRollbackTest_usingTransactionService.java | 107 ---
 ...TransactionRollbackTest_usingTransactional.java | 121 ----
 .../testdomain/wrapper/jdo/JdoWrapperSyncTest.java |  92 ---
 .../datanucleus/enhancer/EnhancementHelper.java    | 311 ---------
 .../resources/application-config-test.properties   |  25 -
 .../src/test/resources/junit-platform.properties   |  37 --
 .../persistence/jpa/JpaBootstrappingTest.java      |   3 +-
 regressiontests/pom.xml                            |  20 -
 regressiontests/rest/pom.xml                       |   2 +-
 .../testdomain/rest/RestServiceStressTest.java     |   4 +-
 .../causeway/testdomain/rest/RestServiceTest.java  |  33 +-
 regressiontests/viewers-jdo/log4j2-test.xml        |  56 --
 regressiontests/viewers-jdo/pom.xml                |  71 --
 .../testdomain/viewers/jdo/wkt/TestAppJdoWkt.java  | 107 ---
 .../viewers/jdo/wkt/InteractionTestJdoWkt.java     | 338 ----------
 .../src/test/resources/junit-platform.properties   |  37 --
 .../extensions/secman/delegated-shiro/pom.xml      |  63 --
 .../CausewayModuleExtSecmanDelegatedShiro.java     |  36 -
 .../shiro/realm/AuthInfoForApplicationUser.java    |  86 ---
 .../realm/AuthenticationStrategyForSecMan.java     |  57 --
 .../realm/CausewayModuleExtSecmanShiroRealm.java   | 303 ---------
 .../delegated/shiro/realm/PermissionForMember.java |  80 ---
 ...rmissionResolverForCausewayShiroAuthorizor.java |  34 -
 ...lCollectionForApplicationUserOnSingleRealm.java | 100 ---
 ...inglePrincipalForApplicationUserInAnyRealm.java |  55 --
 .../shiro/realm/PrincipalForApplicationUser.java   | 138 ----
 .../secman/delegated/shiro/util/ShiroUtils.java    |  70 --
 retired/shiro/security/shiro/pom.xml               | 107 ---
 .../shiro/security/shiro/src/main/adoc/antora.yml  |  19 -
 .../ini/configure-shiro-to-use-ini-realm.png       | Bin 37054 -> 0 bytes
 .../shiro/images/ini/shiro-ini-realm.drawio.svg    |   1 -
 .../modules/shiro/images/shiro-design.drawio.svg   |   1 -
 .../shiro/src/main/adoc/modules/shiro/nav.adoc     |   4 -
 .../src/main/adoc/modules/shiro/pages/about.adoc   | 370 -----------
 .../adoc/modules/shiro/partials/module-nav.adoc    |   4 -
 .../shiro/CausewayModuleSecurityShiro.java         |  47 --
 .../shiro/authentication/AuthenticatorShiro.java   | 229 -------
 .../shiro/authorization/AuthorizorShiro.java       | 100 ---
 .../shiro/authorization/CausewayPermission.java    | 127 ----
 .../authorization/CausewayPermissionResolver.java  |  37 --
 .../shiro/context/ShiroSecurityContext.java        |  51 --
 .../permrolemapper/PermissionToRoleMapper.java     |  26 -
 .../PermissionToRoleMapperFromIni.java             |  52 --
 .../PermissionToRoleMapperFromString.java          |  37 --
 .../security/shiro/permrolemapper/Util.java        |  61 --
 .../security/shiro/webmodule/WebModuleShiro.java   | 203 ------
 .../shiro/CausewayPermissionTest_setParts.java     |  57 --
 .../shiro/CausewayPermissionTest_typicalUsage.java | 146 -----
 ...AuthenticatorOrAuthorizorTest_authenticate.java | 107 ---
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 100 ---
 .../security/shiro/TypeIdentifierTestFactory.java  |  36 -
 .../CausewayPermissionTest_equals.java             |  35 -
 .../PermissionToRoleMapperFromIniTest.java         |  45 --
 .../PermissionToRoleMapperFromStringTest.java      |  45 --
 .../shiro/permrolemapper/UtilTest_parse.java       |  57 --
 .../causeway/security/shiro/permrolemapper/my.ini  |  26 -
 .../security/shiro/src/test/resources/shiro.ini    |  68 --
 starters/pom.xml                                   |  72 --
 testing/archtestsupport/applib/pom.xml             |  13 -
 .../applib/classrules/ArchitectureJdoRules.java    | 276 --------
 .../applib/domain/dom/ChamberOfCommerceCode.java   |   2 +-
 .../applib/entity/jdo/JdoEntityArchTests.java      |  76 ---
 .../applib/entity/jdo/dom/JdoDomModule.java        |  22 -
 .../applib/entity/jdo/dom/JdoEntity.java           |  55 --
 .../applib/entity/jdo/dom/JdoEntity2.java          |  54 --
 .../applib/entity/jdo/dom/JdoEntitySubtype.java    |  40 --
 .../applib/entity/jdo/dom/JdoService.java          |  22 -
 testing/fakedata/fixtures/pom.xml                  |   5 -
 .../demomodule/dom/FakeDataDemoObjectWithAll.java  | 108 ++-
 .../FakeDataDemoObjectWithAll_tearDown.java        |   4 +-
 testing/fakedata/integtests/pom.xml                |   2 +-
 .../FakeDataModuleIntegTestAbstract.java           |   4 +-
 testing/fixtures/applib/pom.xml                    |   6 -
 .../teardown/jdo/TeardownFixtureJdoAbstract.java   | 181 -----
 .../teardown/jpa/TeardownFixtureJpaAbstract.java   | 105 +++
 testing/unittestsupport/applib/pom.xml             |  11 -
 .../unittestsupport/applib/util/InjectUtils.java   |  17 -
 .../applib/dom/sortedsets/SomeDomainObject.java    |   4 +-
 valuetypes/asciidoc/persistence-jdo/pom.xml        |  58 --
 .../persistence-jdo/src/main/java/module-info.java |  27 -
 .../CausewayModuleValAsciidocPersistenceJdo.java   |  34 -
 .../jdo/converters/CausewayAsciiDocConverter.java  |  46 --
 .../src/main/resources/META-INF/MANIFEST.MF        |   6 -
 .../persistence-jdo/src/main/resources/plugin.xml  |  49 --
 valuetypes/asciidoc/pom.xml                        |   1 -
 valuetypes/markdown/persistence-jdo/pom.xml        |  59 --
 .../persistence-jdo/src/main/java/module-info.java |  27 -
 .../CausewayModuleValMarkdownPersistenceJdo.java   |  34 -
 .../jdo/converters/CausewayMarkdownConverter.java  |  46 --
 .../src/main/resources/META-INF/MANIFEST.MF        |   6 -
 .../persistence-jdo/src/main/resources/plugin.xml  |  48 --
 valuetypes/markdown/pom.xml                        |   1 -
 valuetypes/vega/persistence-jdo/pom.xml            |  58 --
 .../persistence-jdo/src/main/java/module-info.java |  27 -
 .../dn/CausewayModuleValVegaPersistenceJdo.java    |  34 -
 .../jdo/dn/converters/CausewayVegaConverter.java   |  43 --
 .../src/main/resources/META-INF/MANIFEST.MF        |   6 -
 .../persistence-jdo/src/main/resources/plugin.xml  |  49 --
 valuetypes/vega/pom.xml                            |   1 -
 viewers/restfulobjects/jaxrs-resteasy/pom.xml      |  10 -
 viewers/wicket/ui/pom.xml                          |  11 -
 viewers/wicket/ui/src/main/java/module-info.java   |   2 +-
 491 files changed, 354 insertions(+), 36530 deletions(-)

diff --git a/antora/pom.xml b/antora/pom.xml
index c0ba28d1255..f1ba856fc1a 100644
--- a/antora/pom.xml
+++ b/antora/pom.xml
@@ -100,8 +100,6 @@
                         <exclude>**/*.ucls</exclude>
                         <exclude>**/*.puml</exclude>
 
-                        <exclude>**/datanucleus.log</exclude>
-
                         <exclude>**/bootstrap-datetimepicker.min.css</exclude>
                         <exclude>**/bootstrap-datetimepicker.css</exclude>
 
diff --git a/bom/pom.xml b/bom/pom.xml
index 2b58679bc51..db5e42ea86e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -78,12 +78,6 @@ identified
 
         <!-- PLUGINS -->
 
-        <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
-        <datanucleus-maven-plugin.log4jConfiguration>
-            ${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration>
-        <datanucleus-maven-plugin.verbose>false</datanucleus-maven-plugin.verbose>
-        <datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
-
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -108,14 +102,6 @@ identified
 
         <cucumber.version>7.21.1</cucumber.version>
 
-        <datanucleus-api-jdo.version>6.0.4</datanucleus-api-jdo.version>
-        <datanucleus-api-jpa.version>6.0.1</datanucleus-api-jpa.version>
-        <datanucleus-core.version>6.0.10</datanucleus-core.version>
-        <datanucleus-jdo-api.version>3.2.1</datanucleus-jdo-api.version>
-        <datanucleus-jdo-query.version>6.0.1</datanucleus-jdo-query.version>
-        <datanucleus-jodatime.version>6.0.1</datanucleus-jodatime.version>
-        <datanucleus-rdbms.version>6.0.9</datanucleus-rdbms.version>
-
         <datasource-proxy-spring-boot-starter.version>1.10.0</datasource-proxy-spring-boot-starter.version>
 
         <datatables.version>1.13.5</datatables.version> <!-- keep in sync with
@@ -365,56 +351,6 @@ identified
                 <scope>compile</scope>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-jdo-applib</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-jdo-provider</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-jdo-integration</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-jdo-metamodel</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-jdo-datanucleus</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-jdo-spring</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.causeway.persistence</groupId>
                 <artifactId>causeway-persistence-jpa</artifactId>
@@ -478,13 +414,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.persistence</groupId>
-                <artifactId>causeway-persistence-querydsl-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.persistence</groupId>
                 <artifactId>causeway-persistence-querydsl-jpa</artifactId>
@@ -878,13 +807,6 @@ identified
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-commandlog-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.extensions</groupId>
                 <artifactId>causeway-extensions-commandlog-persistence-jpa</artifactId>
@@ -968,13 +890,6 @@ identified
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-executionlog-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.extensions</groupId>
                 <artifactId>causeway-extensions-executionlog-persistence-jpa</artifactId>
@@ -998,13 +913,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-executionoutbox-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.extensions</groupId>
                 <artifactId>causeway-extensions-executionoutbox-persistence-jpa</artifactId>
@@ -1120,13 +1028,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-audittrail-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
 
             <!-- org.apache.causeway.extensions (secman) -->
             <dependency>
@@ -1185,13 +1086,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-secman-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.extensions</groupId>
                 <artifactId>causeway-extensions-secman-persistence-jpa</artifactId>
@@ -1229,13 +1123,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-sessionlog-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
 
             <!-- org.apache.causeway.extensions (spring security) -->
             <dependency>
@@ -1463,13 +1350,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.valuetypes</groupId>
-                <artifactId>causeway-valuetypes-asciidoc-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.valuetypes</groupId>
                 <artifactId>causeway-valuetypes-asciidoc-persistence-jpa</artifactId>
@@ -1506,13 +1386,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.valuetypes</groupId>
-                <artifactId>causeway-valuetypes-markdown-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.valuetypes</groupId>
                 <artifactId>causeway-valuetypes-markdown-persistence-jpa</artifactId>
@@ -1556,13 +1429,6 @@ identified
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.valuetypes</groupId>
-                <artifactId>causeway-valuetypes-vega-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.valuetypes</groupId>
                 <artifactId>causeway-valuetypes-vega-persistence-jpa</artifactId>
@@ -1771,11 +1637,6 @@ identified
                 <version>${querydsl.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>com.querydsl</groupId>
-                <artifactId>querydsl-jdo</artifactId>
-                <version>${querydsl.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.querydsl</groupId>
                 <artifactId>querydsl-jpa</artifactId>
@@ -1854,14 +1715,6 @@ identified
                 <version>${jakarta.servlet-api.version}</version>
             </dependency>
 
-            <!-- 3.2 not available yet, instead use org.datanucleus:javax.jdo
-			<dependency>
-				<groupId>javax.jdo</groupId>
-				<artifactId>jdo-api</artifactId>
-				<version>${jdo-api.version}</version>
-			</dependency>
-			-->
-
             <!-- TODO: when used, move exclusions down -->
             <dependency>
                 <groupId>ognl</groupId>
@@ -2023,42 +1876,6 @@ identified
                 <version>${assertj-guava.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-api-jdo</artifactId>
-                <version>${datanucleus-api-jdo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-api-jpa</artifactId>
-                <version>${datanucleus-api-jpa.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-core</artifactId>
-                <version>${datanucleus-core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-jdo-query</artifactId>
-                <version>${datanucleus-jdo-query.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-jodatime</artifactId>
-                <version>${datanucleus-jodatime.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-rdbms</artifactId>
-                <version>${datanucleus-rdbms.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>javax.jdo</artifactId>
-                <version>${datanucleus-jdo-api.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.docx4j</groupId>
                 <artifactId>docx4j-JAXB-internal</artifactId>
@@ -2266,13 +2083,6 @@ identified
         </repository>
     </repositories>
     <pluginRepositories>
-        <pluginRepository>
-            <id>DataNucleus_2</id>
-            <url>https://www.datanucleus.org/downloads/maven2/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
         <pluginRepository>
             <snapshots>
                 <enabled>false</enabled>
@@ -2645,7 +2455,6 @@ identified
                             <exclude>**/partials/component-nav.adoc</exclude>
                             <exclude>**/_nav.adoc</exclude>
                             <exclude>**/_overview/nav.adoc</exclude>
-                            <exclude>**/datanucleus.log</exclude>
 
                             <exclude>**/application.js</exclude>
                             <exclude>**/bootstrap-datetimepicker.min.css</exclude>
@@ -2667,9 +2476,8 @@ identified
 
                             <exclude>**/wicket-xhtml1.4-strict.dtd</exclude>
 
-                            <exclude>
-                                **/src/main/resources/supplemental-models.xml</exclude>
-                            <exclude>**/datanucleus.log</exclude>
+                            <exclude>**/src/main/resources/supplemental-models.xml</exclude>
+                            
                             <exclude>**/gradle/wrapper/gradle-wrapper.properties</exclude>
                             <exclude>**/gradlew</exclude>
                             <exclude>**/gradlew.bat</exclude>
@@ -2842,54 +2650,6 @@ identified
                     <artifactId>clirr-maven-plugin</artifactId>
                     <version>2.8</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-maven-plugin</artifactId>
-                    <version>${datanucleus-maven-plugin.version}</version>
-                    <configuration>
-                        <fork>${datanucleus-maven-plugin.fork}</fork>
-                        <log4jConfiguration>
-                            ${datanucleus-maven-plugin.log4jConfiguration}</log4jConfiguration>
-                        <verbose>${datanucleus-maven-plugin.verbose}</verbose>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>process-classes</id>
-                            <phase>process-classes</phase>
-                            <goals>
-                                <goal>enhance</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>process-test-classes</id>
-                            <phase>process-test-classes</phase>
-                            <goals>
-                                <goal>test-enhance</goal>
-                            </goals>
-                            <configuration>
-                                <metadataDirectory>
-                                    ${project.build.testOutputDirectory}</metadataDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.datanucleus</groupId>
-                            <artifactId>datanucleus-core</artifactId>
-                            <version>${datanucleus-core.version}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.datanucleus</groupId>
-                            <artifactId>datanucleus-api-jdo</artifactId>
-                            <version>${datanucleus-api-jdo.version}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.datanucleus</groupId>
-                            <artifactId>datanucleus-jodatime</artifactId>
-                            <version>${datanucleus-jodatime.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -3206,23 +2966,6 @@ identified
             </modules>
         </profile>
         <!--  END SNIPPET: release-profile  -->
-        <profile>
-            <id>causeway-app-starter-datanucleusenhance</id>
-            <activation>
-                <file>
-                    <exists>${basedir}/logging-dn-enhance.properties</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <inherited>true</inherited>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>causeway-lombok-workaround</id>
             <activation>
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
index 54da4c83252..68357da9c88 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
@@ -488,8 +488,7 @@ public static enum MessageTemplate {
                 + "Defaulting the object type from the package/class/package name can lead "
                 + "to data migration issues for apps deployed to production (if the class is "
                 + "subsequently refactored). "
-                + "Use @Discriminator, @Named or "
-                + "@PersistenceCapable(schema=...) to specify explicitly."),
+                + "Use @Discriminator or @Named to specify explicitly."),
         NON_UNIQUE_LOGICAL_TYPE_NAME_OR_ALIAS("Logical type name (or alias) ${logicalTypeName} "
                 + "mapped to multiple non-abstract classes:\n"
                 + "${csv}"),
diff --git a/core/internaltestsupport/pom.xml b/core/internaltestsupport/pom.xml
index 0a2724471ab..164c7e0f2f2 100644
--- a/core/internaltestsupport/pom.xml
+++ b/core/internaltestsupport/pom.xml
@@ -84,17 +84,6 @@
 			<artifactId>byte-buddy-agent</artifactId>
 		</dependency>
 
-		<!-- JDO API (non transient, provided by plugin) -->
-		<dependency>
-			<!-- v3.2 not available yet, use datanucleus staging for now -->
-			<!-- <groupId>javax.jdo</groupId> -->
-			<!-- <artifactId>jdo-api</artifactId> -->
-			<groupId>org.datanucleus</groupId>
-			<artifactId>javax.jdo</artifactId>
-			<!-- provided by plugins -->
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- SPRING -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 0a4d31f8d94..28439afc33a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -255,27 +255,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>datanucleusenhance</id>
-            <activation>
-                <property>
-                    <name>causeway-app-starter-datanucleusenhance</name>
-                    <value>true</value>
-                </property>
-                <!-- <file> <exists>${basedir}/logging-dn-enhance.properties</exists>
-                    </file> -->
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <inherited>true</inherited>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
     </profiles>
 
     <modules>
@@ -310,13 +289,9 @@
 
         <module>../persistence/commons</module>
         <module>../persistence/jdbc</module>
-        <module>../persistence/jdo</module>
         <module>../persistence/jpa</module>
         <module>../persistence/querydsl</module>
 
-        <module>../retired/shiro/security/shiro</module>
-        <module>../retired/shiro/extensions/secman/delegated-shiro</module>
-
     </modules>
 
 </project>
diff --git a/extensions/core/commandlog/persistence-jdo/log4j2-test.xml b/extensions/core/commandlog/persistence-jdo/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/core/commandlog/persistence-jdo/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Configuration status="WARN">
-	<Properties>
-		<Property name="PID">????</Property>
-		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
-		<Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-		<Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-	</Properties>
-	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-		</Console>
-	</Appenders>
-	<Loggers>
-		<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-		<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-		<logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-		<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-		<logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-		
-		<logger name="org.apache.directory" level="warn"/>
-		<logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-		
-		<logger name="DataNucleus.Persistence" level="info"/>
-		<logger name="DataNucleus.Transaction" level="info"/>
-		<logger name="DataNucleus.Datastore.Schema" level="info"/>
-		<logger name="DataNucleus.Datastore.Native" level="info"/>
-		
-		<Root level="info">
-			<AppenderRef ref="Console" />
-		</Root>
-	</Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/core/commandlog/persistence-jdo/logging-dn-enhance.properties b/extensions/core/commandlog/persistence-jdo/logging-dn-enhance.properties
deleted file mode 100644
index 515c2a29662..00000000000
--- a/extensions/core/commandlog/persistence-jdo/logging-dn-enhance.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-
-
-# overriding all those below... 
-log4j.category.DataNucleus=ERROR
-
-log4j.category.DataNucleus.Persistence=INFO, A1
-log4j.category.DataNucleus.Transaction=INFO, A1
-log4j.category.DataNucleus.Connection=INFO, A1
-log4j.category.DataNucleus.Query=INFO, A1
-log4j.category.DataNucleus.Cache=INFO, A1
-log4j.category.DataNucleus.MetaData=INFO, A1
-log4j.category.DataNucleus.Datastore=INFO, A1
-log4j.category.DataNucleus.Datastore.Schema=INFO, A1
-log4j.category.DataNucleus.Datastore.Persist=INFO, A1
-log4j.category.DataNucleus.Datastore.Retrieve=INFO, A1
-#Log of all 'native' statements sent to the datastore
-log4j.category.DataNucleus.Datastore.Native=INFO, A1 
-log4j.category.DataNucleus.General=INFO, A1
-#All messages relating to object lifecycle changes
-log4j.category.DataNucleus.Lifecycle=INFO, A1
-log4j.category.DataNucleus.ValueGeneration=INFO, A1
-log4j.category.DataNucleus.Enhancer=INFO, A1
-log4j.category.DataNucleus.SchemaTool=INFO, A1
-log4j.category.DataNucleus.JDO=INFO, A1
- 
\ No newline at end of file
diff --git a/extensions/core/commandlog/persistence-jdo/pom.xml b/extensions/core/commandlog/persistence-jdo/pom.xml
deleted file mode 100644
index 115419a3faf..00000000000
--- a/extensions/core/commandlog/persistence-jdo/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.causeway.extensions</groupId>
-        <artifactId>causeway-extensions-commandlog</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>causeway-extensions-commandlog-persistence-jdo</artifactId>
-    <name>Apache Causeway Ext - Command Log Implementation (JDO)</name>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.causeway.extensions.commandlog.persistence.jdo</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/causeway/extensions/commandlog/persistence-jdo</git-plugin.propertiesDir>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-
-    <dependencies>
-
-	    <dependency>
-	        <groupId>org.apache.causeway.extensions</groupId>
-	        <artifactId>causeway-extensions-commandlog-applib</artifactId>
-	    </dependency>
-
-        <!-- PERSISTENCE -->
-
-		<dependency>
-            <groupId>org.apache.causeway.persistence</groupId>
-			<artifactId>causeway-persistence-jdo-datanucleus</artifactId>
-        </dependency>
-
-        <!-- TESTING -->
-
-        <dependency>
-            <groupId>org.apache.causeway.extensions</groupId>
-            <artifactId>causeway-extensions-commandlog-applib</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-unittestsupport-applib</artifactId>
-            <scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-integtestsupport-applib</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-    </dependencies>
-
-</project>
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/CausewayModuleExtCommandLogPersistenceJdo.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/CausewayModuleExtCommandLogPersistenceJdo.java
deleted file mode 100644
index 5d0ce7f1fd2..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/CausewayModuleExtCommandLogPersistenceJdo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.commandlog.jdo;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
-import org.apache.causeway.extensions.commandlog.jdo.dom.CommandLogEntry;
-import org.apache.causeway.extensions.commandlog.jdo.dom.CommandLogEntryRepository;
-import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
-        // modules
-        CausewayModuleExtCommandLogApplib.class,
-        CausewayModulePersistenceJdoDatanucleus.class,
-
-        // @Service's
-        CommandLogEntryRepository.class,
-
-        // entities
-        CommandLogEntry.class
-})
-public class CausewayModuleExtCommandLogPersistenceJdo {
-
-    public static final String NAMESPACE = CausewayModuleExtCommandLogApplib.NAMESPACE;
-    public static final String SCHEMA = CausewayModuleExtCommandLogApplib.SCHEMA;
-
-    /**
-     * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
-     * but is provided to allow manual teardown if required.
-     */
-    public FixtureScript teardownFixture() {
-        return new TeardownFixtureJdoAbstract() {
-            @Override
-            protected void execute(final ExecutionContext executionContext) {
-                deleteFrom(CommandLogEntry.class);
-            }
-        };
-    }
-
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
deleted file mode 100644
index f21d38c2ed2..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.commandlog.jdo.dom;
-
-import java.util.UUID;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Index;
-import javax.jdo.annotations.Indices;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.PrimaryKey;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.Domain;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
-import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry.Nq;
-import org.apache.causeway.schema.cmd.v2.CommandDto;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType = IdentityType.APPLICATION,
-        schema = CommandLogEntry.SCHEMA,
-        table = CommandLogEntry.TABLE)
-@Indices({
-        @Index(name = "CommandLogEntry__startedAt_timestamp__IDX", members = { "startedAt", "timestamp" }),
-        @Index(name = "CommandLogEntry__timestamp__IDX", members = { "timestamp" }),
-})
-@Queries( {
-    @Query(
-            name  = Nq.FIND_BY_INTERACTION_ID,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE interactionId == :interactionId "),
-    @Query(
-            name  = Nq.FIND_RECENT_BY_TARGET,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + " ORDER BY timestamp DESC "
-                  + " RANGE 0,30"),
-    @Query(
-            name  = Nq.FIND_RECENT_BY_TARGET_OR_RESULT,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE target == :targetOrResult "
-                  + "    || result == :targetOrResult "
-                  + " ORDER BY timestamp DESC "
-                  + " RANGE 0,30"),
-    @Query(
-            name  = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp >= :from "
-                  + "    && timestamp <= :to "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TARGET_AND_TIMESTAMP_AFTER,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp >= :from "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp <= :to "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TARGET,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE timestamp >= :from "
-                  + "    && timestamp <= :to "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TIMESTAMP_AFTER,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE timestamp >= :from "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE timestamp <= :to "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_MOST_RECENT,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " ORDER BY timestamp DESC, interactionId DESC"
-                  + " RANGE 0,100"),
-    @Query(
-            name  = Nq.FIND_RECENT_BY_USERNAME,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE username == :username "
-                  + " ORDER BY timestamp DESC "
-                  + " RANGE 0,30"),
-    @Query(
-            name  = Nq.FIND_BY_PARENT_INTERACTION_ID,
-            value = "SELECT "
-                    + "  FROM " + CommandLogEntry.FQCN + " "
-                    + " WHERE parentInteractionId == :parentInteractionId "),
-    @Query(
-            name  = Nq.FIND_CURRENT,
-            value = "SELECT "
-                    + "  FROM " + CommandLogEntry.FQCN + " "
-                    + " WHERE completedAt == null "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_COMPLETED,
-            value = "SELECT "
-                    + "  FROM " + CommandLogEntry.FQCN + " "
-                    + " WHERE completedAt != null "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_FIRST,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE startedAt   != null "
-                  + "    && completedAt != null "
-                  + " ORDER BY timestamp ASC "
-                  + " RANGE 0,2"), // this should be RANGE 0,1 but results in DataNucleus submitting "FETCH NEXT ROW ONLY"
-                                   // which SQL Server doesn't understand.  However, as workaround, SQL Server *does* understand FETCH NEXT 2 ROWS ONLY
-    @Query(
-            name  = Nq.FIND_SINCE,
-            value = "SELECT "
-                  + "FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE timestamp > :timestamp "
-                  + "   && startedAt != null "
-                  + "   && completedAt != null "
-                  + "ORDER BY timestamp ASC"),
-    @Query(
-            name  = Nq.FIND_BACKGROUND_AND_NOT_YET_STARTED,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE executeIn == 'BACKGROUND' "
-                  + "    && startedAt == null "
-                  + " ORDER BY timestamp ASC "),
-    @Query(
-            name  = Nq.FIND_RECENT_BACKGROUND_BY_TARGET,
-            value = "SELECT "
-                    + "  FROM " + CommandLogEntry.FQCN + " "
-                    + " WHERE executeIn == 'BACKGROUND' "
-                    + "    && target    == :target "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_MOST_RECENT_REPLAYED,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE (replayState == 'OK' || replayState == 'FAILED') "
-                  + " ORDER BY timestamp DESC "
-                  + " RANGE 0,2"), // this should be RANGE 0,1 but results in DataNucleus submitting "FETCH NEXT ROW ONLY"
-                                   // which SQL Server doesn't understand.  However, as workaround, SQL Server *does* understand FETCH NEXT 2 ROWS ONLY
-
-    @Query(
-            name  = Nq.FIND_MOST_RECENT_COMPLETED,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE startedAt   != null "
-                  + "    && completedAt != null "
-                  + " ORDER BY timestamp DESC "
-                  + " RANGE 0,2"), // this should be RANGE 0,1 but results in DataNucleus submitting "FETCH NEXT ROW ONLY"
-                                   // which SQL Server doesn't understand.  However, as workaround, SQL Server *does* understand FETCH NEXT 2 ROWS ONLY
-    @Query(
-            name  = Nq.FIND_BY_REPLAY_STATE,
-            value = "SELECT "
-                  + "  FROM " + CommandLogEntry.FQCN + " "
-                  + " WHERE replayState == :replayState "
-                  + " ORDER BY timestamp ASC "
-                  + " RANGE 0,10"),    // same as batch size
-})
-@Named(CommandLogEntry.LOGICAL_TYPE_NAME)
-@DomainObject(
-        editing = Editing.DISABLED,
-        entityChangePublishing = Publishing.DISABLED
-)
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@NoArgsConstructor
-public class CommandLogEntry
-extends org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry {
-
-    protected final static String FQCN = "org.apache.causeway.extensions.commandlog.jdo.dom.CommandLogEntry";
-
-    /**
-     * Intended for use on secondary (replay) system.
-     *
-     * @param commandDto - obtained from the primary system as a representation of a command invocation
-     * @param replayState - controls whether this is to be replayed
-     * @param targetIndex - if the command represents a bulk action, then it is flattened out when replayed; this indicates which target to execute against.
-     */
-    public CommandLogEntry(
-            final CommandDto commandDto,
-            final org.apache.causeway.extensions.commandlog.applib.dom.ReplayState replayState,
-            final int targetIndex) {
-        super(commandDto, replayState, targetIndex);
-    }
-
-    @PrimaryKey
-    @Column(allowsNull = InteractionId.ALLOWS_NULL, length = InteractionId.MAX_LENGTH)
-    @InteractionId
-    @Getter @Setter
-    private UUID interactionId;
-
-    @Column(allowsNull = Username.ALLOWS_NULL, length = Username.MAX_LENGTH)
-    @Username
-    @Getter @Setter
-    private String username;
-
-    @Column(allowsNull = Timestamp.ALLOWS_NULL)
-    @Timestamp
-    @Getter @Setter
-    private java.sql.Timestamp timestamp;
-
-    @Persistent
-    @Column(allowsNull = Target.ALLOWS_NULL, length = Target.MAX_LENGTH)
-    @Target
-    @Getter @Setter
-    private Bookmark target;
-
-    @Column(allowsNull = ExecuteIn.ALLOWS_NULL, length = ExecuteIn.MAX_LENGTH)
-    @ExecuteIn
-    @Getter @Setter
-    private org.apache.causeway.extensions.commandlog.applib.dom.ExecuteIn executeIn;
-
-    @Column(allowsNull = Parent.ALLOWS_NULL, length = InteractionId.MAX_LENGTH)
-    @Domain.Exclude
-    @Getter @Setter
-    private UUID parentInteractionId;
-
-    @Column(allowsNull = LogicalMemberIdentifier.ALLOWS_NULL, length = LogicalMemberIdentifier.MAX_LENGTH)
-    @LogicalMemberIdentifier
-    @Getter @Setter
-    private String logicalMemberIdentifier;
-
-    @Persistent
-    @Column(allowsNull = CommandDtoAnnot.ALLOWS_NULL, jdbcType = "CLOB")
-    @CommandDtoAnnot
-    @Getter @Setter
-    private CommandDto commandDto;
-
-    @Column(allowsNull = StartedAt.ALLOWS_NULL)
-    @StartedAt
-    @Getter @Setter
-    private java.sql.Timestamp startedAt;
-
-    @Column(allowsNull = CompletedAt.ALLOWS_NULL)
-    @CompletedAt
-    @Getter @Setter
-    private java.sql.Timestamp completedAt;
-
-    @Persistent
-    @Column(allowsNull = Result.ALLOWS_NULL, length = Result.MAX_LENGTH)
-    @Result
-    @Getter @Setter
-    private Bookmark result;
-
-    @Persistent
-    @Column(allowsNull = Exception.ALLOWS_NULL, jdbcType = "CLOB")
-    @Exception
-    @Getter @Setter
-    private String exception;
-
-    @Column(allowsNull = ReplayState.ALLOWS_NULL, length = ReplayState.MAX_LENGTH)
-    @ReplayState
-    @Getter @Setter
-    private org.apache.causeway.extensions.commandlog.applib.dom.ReplayState replayState;
-
-    @Column(allowsNull = ReplayStateFailureReason.ALLOWS_NULL, length = ReplayStateFailureReason.MAX_LENGTH)
-    @ReplayStateFailureReason
-    @Getter @Setter
-    private String replayStateFailureReason;
-
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntryRepository.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntryRepository.java
deleted file mode 100644
index dd842dd714c..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntryRepository.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.commandlog.jdo.dom;
-
-import jakarta.inject.Named;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepositoryAbstract;
-import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
-
-/**
- * Provides supporting functionality for querying and persisting
- * {@link CommandLogEntry command} entities.
- */
-@Service
-@Named(CommandLogEntryRepository.LOGICAL_TYPE_NAME)
-@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
-@Qualifier("Jdo")
-public class CommandLogEntryRepository
-extends CommandLogEntryRepositoryAbstract<CommandLogEntry> {
-
-    public static final String LOGICAL_TYPE_NAME = CausewayModuleExtCommandLogPersistenceJdo.NAMESPACE + ".CommandLogEntryRepository";
-
-    public CommandLogEntryRepository() {
-        super(CommandLogEntry.class);
-    }
-
-    /**
-     * The DN annotation processor (from artifact {@literal org.datanucleus:datanucleus-jdo-query})
-     * should  generate Q classes under 'target/generated-sources/annotations'.
-     * @see "https://www.datanucleus.org/products/accessplatform_6_0/jdo/query.html#jdoql"
-     */
-    @SuppressWarnings("unused")
-    private void ensureWeHaveQClasses() {
-        // ensures at compile time, that Q classes are generated
-        org.apache.causeway.extensions.commandlog.jdo.dom.QCommandLogEntry q;
-    }
-
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/AppManifest.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/AppManifest.java
deleted file mode 100644
index 3019c84c193..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/AppManifest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.commandlog.jdo.integtests;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
-import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
-import org.apache.causeway.extensions.commandlog.jdo.integtests.model.CounterRepository;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-
-@SpringBootConfiguration
-@EnableAutoConfiguration
-@Import({
-        CausewayModuleCoreRuntimeServices.class,
-        CausewayModuleSecurityBypass.class,
-        CausewayModuleExtCommandLogPersistenceJdo.class,
-})
-@PropertySources({
-        @PropertySource(CausewayPresets.UseLog4j2Test)
-})
-@ComponentScan(basePackageClasses = {AppManifest.class, CommandLogTestDomainModel.class, CounterRepository.class})
-public class AppManifest {
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/BackgroundService_IntegTest.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/BackgroundService_IntegTest.java
deleted file mode 100644
index 3a67bff0859..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/BackgroundService_IntegTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.commandlog.jdo.integtests;
-
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-
-import org.apache.causeway.extensions.commandlog.applib.integtest.BackgroundService_IntegTestAbstract;
-import org.apache.causeway.extensions.commandlog.jdo.integtests.model.Counter;
-
-@SpringBootTest(
-        classes = AppManifest.class
-)
-@ActiveProfiles("test")
-public class BackgroundService_IntegTest extends BackgroundService_IntegTestAbstract {
-
-    @Override
-    protected org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter newCounter(final String name) {
-        return Counter.builder().name(name).build();
-    }
-
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
deleted file mode 100644
index 4d63bcc78e4..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.commandlog.jdo.integtests;
-
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-
-import org.apache.causeway.extensions.commandlog.applib.integtest.CommandLog_IntegTestAbstract;
-import org.apache.causeway.extensions.commandlog.jdo.integtests.model.Counter;
-
-@SpringBootTest(
-        classes = AppManifest.class
-)
-@ActiveProfiles("test")
-public class CommandLog_IntegTest extends CommandLog_IntegTestAbstract {
-
-    protected org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter newCounter(String name) {
-        return Counter.builder().name(name).build();
-    }
-
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/model/Counter.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/model/Counter.java
deleted file mode 100644
index 46ff2b64ad1..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/model/Counter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.commandlog.jdo.integtests.model;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-
-import jakarta.inject.Named;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Nature;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@PersistenceCapable(
-        schema = "public",
-        table = "Counter"
-)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("commandlog.test.Counter")
-@DomainObject(nature = Nature.ENTITY)
-@NoArgsConstructor
-@Builder
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class Counter extends org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter {
-
-    @Column(allowsNull = "false")
-    @Getter @Setter
-    private String name;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num2;
-
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/model/CounterRepository.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/model/CounterRepository.java
deleted file mode 100644
index 4120adfefa0..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/model/CounterRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.commandlog.jdo.integtests.model;
-
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class CounterRepository
-        extends org.apache.causeway.extensions.commandlog.applib.integtest.model.CounterRepository<Counter> {
-
-    public CounterRepository() {
-        super(Counter.class);
-    }
-}
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/resources/application-test.yml b/extensions/core/commandlog/persistence-jdo/src/test/resources/application-test.yml
deleted file mode 100644
index 509e02a4aff..00000000000
--- a/extensions/core/commandlog/persistence-jdo/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-causeway:
-  persistence:
-    schema:
-      auto-create-schemas: "CAUSEWAYEXTCOMMANDLOG"
-
-
-datanucleus:
-  schema:
-    generate-database:
-      mode: "create"
diff --git a/extensions/core/commandlog/persistence-jpa/pom.xml b/extensions/core/commandlog/persistence-jpa/pom.xml
index ff4d4afcf22..69e5b3220dd 100644
--- a/extensions/core/commandlog/persistence-jpa/pom.xml
+++ b/extensions/core/commandlog/persistence-jpa/pom.xml
@@ -92,12 +92,6 @@
         <dependency>
             <groupId>org.apache.causeway.testing</groupId>
             <artifactId>causeway-testing-fixtures-applib</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.causeway.persistence</groupId>
-                    <artifactId>causeway-persistence-jdo-applib</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
     </dependencies>
diff --git a/extensions/core/commandlog/pom.xml b/extensions/core/commandlog/pom.xml
index 559f863c192..23ea3babde9 100644
--- a/extensions/core/commandlog/pom.xml
+++ b/extensions/core/commandlog/pom.xml
@@ -56,11 +56,6 @@
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.causeway.extensions</groupId>
-				<artifactId>causeway-extensions-commandlog-persistence-jdo</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.causeway.extensions</groupId>
 				<artifactId>causeway-extensions-commandlog-persistence-jpa</artifactId>
@@ -86,7 +81,6 @@
 
 	<modules>
 		<module>applib</module>
-		<module>persistence-jdo</module>
 		<module>persistence-jpa</module>
 	</modules>
 
diff --git a/extensions/core/excel/applib/pom.xml b/extensions/core/excel/applib/pom.xml
index 2c0d0224512..723f08ef199 100644
--- a/extensions/core/excel/applib/pom.xml
+++ b/extensions/core/excel/applib/pom.xml
@@ -41,11 +41,6 @@
             <artifactId>causeway-applib</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.causeway.persistence</groupId>
-            <artifactId>causeway-persistence-jdo-applib</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.causeway.core</groupId>
             <artifactId>causeway-core-runtime</artifactId>
diff --git a/extensions/core/excel/fixture/logging-dn-enhance.properties b/extensions/core/excel/fixture/logging-dn-enhance.properties
deleted file mode 100644
index dc4d31c11d9..00000000000
--- a/extensions/core/excel/fixture/logging-dn-enhance.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/extensions/core/excel/fixture/pom.xml b/extensions/core/excel/fixture/pom.xml
index 2a5bd0fad18..2b6e8436a8a 100644
--- a/extensions/core/excel/fixture/pom.xml
+++ b/extensions/core/excel/fixture/pom.xml
@@ -94,7 +94,7 @@ under the License.
 
 		<dependency>
             <groupId>org.apache.causeway.persistence</groupId>
-			<artifactId>causeway-persistence-jdo-datanucleus</artifactId>
+			<artifactId>causeway-persistence-jpa-eclipselink</artifactId>
         </dependency>
 
     </dependencies>
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index 2c3954a3d7f..b07e0a07815 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -21,10 +21,9 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
-import javax.jdo.annotations.Column;
-
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
+import jakarta.persistence.Column;
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index 15d08a14724..a6a45039e44 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
@@ -28,9 +28,6 @@
 import java.util.TreeSet;
 import java.util.function.Predicate;
 
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.VersionStrategy;
-
 import jakarta.inject.Inject;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
@@ -58,58 +55,58 @@
 import lombok.Setter;
 import lombok.ToString;
 
-@javax.jdo.annotations.PersistenceCapable(
-        identityType=IdentityType.DATASTORE,
-        schema = "libExcelFixture"
-)
-@javax.jdo.annotations.DatastoreIdentity(
-        strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY,
-         column="id")
-@javax.jdo.annotations.Version(
-        strategy=VersionStrategy.VERSION_NUMBER,
-        column="version")
-@javax.jdo.annotations.Uniques({
-    @javax.jdo.annotations.Unique(
-            name="ToDoItem_description_must_be_unique",
-            members={"ownedBy","description"})
-})
-@javax.jdo.annotations.Queries( {
-    @javax.jdo.annotations.Query(
-            name = "todo_all", language = "JDOQL",
-            value = "SELECT "
-                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
-                    + "WHERE ownedBy == :ownedBy"),
-    @javax.jdo.annotations.Query(
-            name = "todo_notYetComplete", language = "JDOQL",
-            value = "SELECT "
-                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
-                    + "WHERE ownedBy == :ownedBy "
-                    + "   && complete == false"),
-    @javax.jdo.annotations.Query(
-            name = "findByDescription", language = "JDOQL",
-            value = "SELECT "
-                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
-                    + "WHERE ownedBy == :ownedBy "
-                    + "   && description == :description"),
-    @javax.jdo.annotations.Query(
-            name = "todo_complete", language = "JDOQL",
-            value = "SELECT "
-                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
-                    + "WHERE ownedBy == :ownedBy "
-                    + "&& complete == true"),
-    @javax.jdo.annotations.Query(
-            name = "todo_similarTo", language = "JDOQL",
-            value = "SELECT "
-                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
-                    + "WHERE ownedBy == :ownedBy "
-                    + "&& category == :category"),
-    @javax.jdo.annotations.Query(
-            name = "todo_autoComplete", language = "JDOQL",
-            value = "SELECT "
-                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
-                    + "WHERE ownedBy == :ownedBy && "
-                    + "description.indexOf(:description) >= 0")
-})
+//@javax.jdo.annotations.PersistenceCapable(
+//        identityType=IdentityType.DATASTORE,
+//        schema = "libExcelFixture"
+//)
+//@javax.jdo.annotations.DatastoreIdentity(
+//        strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY,
+//         column="id")
+//@javax.jdo.annotations.Version(
+//        strategy=VersionStrategy.VERSION_NUMBER,
+//        column="version")
+//@javax.jdo.annotations.Uniques({
+//    @javax.jdo.annotations.Unique(
+//            name="ToDoItem_description_must_be_unique",
+//            members={"ownedBy","description"})
+//})
+//@javax.jdo.annotations.Queries( {
+//    @javax.jdo.annotations.Query(
+//            name = "todo_all", language = "JDOQL",
+//            value = "SELECT "
+//                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
+//                    + "WHERE ownedBy == :ownedBy"),
+//    @javax.jdo.annotations.Query(
+//            name = "todo_notYetComplete", language = "JDOQL",
+//            value = "SELECT "
+//                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
+//                    + "WHERE ownedBy == :ownedBy "
+//                    + "   && complete == false"),
+//    @javax.jdo.annotations.Query(
+//            name = "findByDescription", language = "JDOQL",
+//            value = "SELECT "
+//                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
+//                    + "WHERE ownedBy == :ownedBy "
+//                    + "   && description == :description"),
+//    @javax.jdo.annotations.Query(
+//            name = "todo_complete", language = "JDOQL",
+//            value = "SELECT "
+//                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
+//                    + "WHERE ownedBy == :ownedBy "
+//                    + "&& complete == true"),
+//    @javax.jdo.annotations.Query(
+//            name = "todo_similarTo", language = "JDOQL",
+//            value = "SELECT "
+//                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
+//                    + "WHERE ownedBy == :ownedBy "
+//                    + "&& category == :category"),
+//    @javax.jdo.annotations.Query(
+//            name = "todo_autoComplete", language = "JDOQL",
+//            value = "SELECT "
+//                    + "FROM " + ExcelDemoToDoItem.FQCN + " "
+//                    + "WHERE ownedBy == :ownedBy && "
+//                    + "description.indexOf(:description) >= 0")
+//})
 @DomainObject(
         autoCompleteRepository = ExcelDemoToDoItemMenu.class
 )
@@ -155,25 +152,25 @@ public class ExcelDemoToDoItem implements Comparable<ExcelDemoToDoItem> /*, Cale
 
     //endregion
 
-    @javax.jdo.annotations.Column(allowsNull="false", length=100)
+    //@javax.jdo.annotations.Column(nullable=false, length=100)
     @Property(regexPattern = "\\w[@&:\\-\\,\\.\\+ \\w]*")
     @Getter @Setter
     private String description;
 
-    @javax.jdo.annotations.Persistent(defaultFetchGroup="true")
-    @javax.jdo.annotations.Column(allowsNull="true")
+    //@javax.jdo.annotations.Persistent(defaultFetchGroup="true")
+    //@javax.jdo.annotations.Column(allowsNull="true")
     @Getter @Setter
     private LocalDate dueBy;
 
-    @javax.jdo.annotations.Column(allowsNull="true")
+    //@javax.jdo.annotations.Column(allowsNull="true")
     @Getter @Setter
     private Category category;
 
-    @javax.jdo.annotations.Column(allowsNull="true")
+    //@javax.jdo.annotations.Column(allowsNull="true")
     @Getter @Setter
     private Subcategory subcategory;
 
-    @javax.jdo.annotations.Column(allowsNull="false")
+    //@javax.jdo.annotations.Column(nullable=false)
     @Getter @Setter
     private String ownedBy;
 
@@ -181,14 +178,14 @@ public class ExcelDemoToDoItem implements Comparable<ExcelDemoToDoItem> /*, Cale
     @Getter @Setter
     private boolean complete;
 
-    @javax.jdo.annotations.Column(allowsNull="true", scale=2)
+    //@javax.jdo.annotations.Column(allowsNull="true", scale=2)
     //XXX breaks build, as of JDOQueryProcessor generated source, that cannot be compiled
     //@jakarta.validation.constraints.Digits(integer=10, fraction=2)
     @Property(editing = Editing.DISABLED, editingDisabledReason = "Update using action")
     @Getter @Setter
     private BigDecimal cost;
 
-    @javax.jdo.annotations.Column(allowsNull="true", scale=2)
+    //@javax.jdo.annotations.Column(allowsNull="true", scale=2)
     //XXX breaks build, as of JDOQueryProcessor generated source, that cannot be compiled
     //@jakarta.validation.constraints.Digits(integer=10, fraction=2)
     @Property(
@@ -199,20 +196,20 @@ public class ExcelDemoToDoItem implements Comparable<ExcelDemoToDoItem> /*, Cale
     private BigDecimal previousCost;
 
     @Getter @Setter
-    @javax.jdo.annotations.Column(allowsNull="true", length=400)
+    //@javax.jdo.annotations.Column(allowsNull="true", length=400)
     @Property(editing = Editing.ENABLED)
     // @SummernoteEditor(height = 100, maxHeight = 300)
     private String notes;
 
     @Getter @Setter
-    @javax.jdo.annotations.Persistent(defaultFetchGroup="false")
-    @javax.jdo.annotations.Column(allowsNull="true", jdbcType="BLOB", sqlType="LONGBINARY")
+    //@javax.jdo.annotations.Persistent(defaultFetchGroup="false")
+    //@javax.jdo.annotations.Column(allowsNull="true", jdbcType="BLOB", sqlType="LONGBINARY")
     private Blob attachment;
 
     @Getter @Setter
-    @javax.jdo.annotations.Persistent(table="ExcelDemoToDoItemDependencies")
-    @javax.jdo.annotations.Join(column="dependingId")
-    @javax.jdo.annotations.Element(column="dependentId")
+    //@javax.jdo.annotations.Persistent(table="ExcelDemoToDoItemDependencies")
+    //@javax.jdo.annotations.Join(column="dependingId")
+    //@javax.jdo.annotations.Element(column="dependentId")
     @CollectionLayout(sortedBy = DependenciesComparator.class)
     private SortedSet<ExcelDemoToDoItem> dependencies = new TreeSet<>();
 
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index 7a8652311ca..c0c0d3827c2 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -19,9 +19,9 @@
 package org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
 
 import org.apache.causeway.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
+import org.apache.causeway.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAbstract;
 
-public class ExcelDemoToDoItem_tearDown extends TeardownFixtureJdoAbstract {
+public class ExcelDemoToDoItem_tearDown extends TeardownFixtureJpaAbstract {
 
     @Override
     protected void execute(final ExecutionContext executionContext) {
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
index 08414d614e4..cbfed428211 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
@@ -20,11 +20,13 @@
 
 import jakarta.inject.Inject;
 
-import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
+import org.apache.causeway.persistence.jpa.applib.services.JpaSupportService;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
 
 public class ExcelDemoToDoItem_tearDown2 extends FixtureScript {
 
+    @Inject JpaSupportService jpaSupport;
+    
     private final String user;
 
     public ExcelDemoToDoItem_tearDown2() {
@@ -40,18 +42,16 @@ public void execute(ExecutionContext executionContext) {
 
         final String ownedBy = this.user != null ? this.user : userService.currentUserNameElseNobody();
 
-        jdoSupport.executeUpdate(String.format(
+        jpaSupport.executeUpdate(String.format(
                 "delete "
                         + "from \"excelFixture\".\"ExcelDemoToDoItemDependencies\" "
                         + "where \"dependingId\" IN "
                         + "(select \"id\" from \"excelFixture\".\"ExcelDemoToDoItem\" where \"ownedBy\" = '%s') ",
                 ownedBy));
 
-        jdoSupport.executeUpdate(String.format(
+        jpaSupport.executeUpdate(String.format(
                 "delete from \"excelFixture\".\"ExcelDemoToDoItem\" "
                         + "where \"ownedBy\" = '%s'", ownedBy));
     }
 
-    @Inject JdoSupportService jdoSupport;
-
 }
diff --git a/extensions/core/excel/integtests/pom.xml b/extensions/core/excel/integtests/pom.xml
index a079b44fdb3..605f039ecb0 100644
--- a/extensions/core/excel/integtests/pom.xml
+++ b/extensions/core/excel/integtests/pom.xml
@@ -107,13 +107,13 @@ under the License.
 			<scope>test</scope>
 		</dependency>
 		
-		<!-- PERSISTENCE -->
-
-        <dependency>
-            <groupId>org.apache.causeway.persistence</groupId>
-			<artifactId>causeway-persistence-jdo-datanucleus</artifactId>
+		<dependency>
+            <groupId>org.apache.causeway.commons</groupId>
+            <artifactId>causeway-commons</artifactId>
             <scope>test</scope>
         </dependency>
+		
+		<!-- PERSISTENCE -->
 
         <dependency>
             <groupId>org.hsqldb</groupId>
diff --git a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index 87e982459ef..8fb67eb5b51 100644
--- a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -31,7 +31,7 @@
 import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
 import org.apache.causeway.extensions.excel.fixtures.CausewayModuleExtExcelFixtures;
 import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
-import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
+import org.apache.causeway.persistence.jpa.applib.CausewayModulePersistenceJpaApplib;
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
 import org.apache.causeway.testing.fixtures.applib.CausewayIntegrationTestAbstractWithFixtures;
 import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
@@ -49,13 +49,12 @@ public abstract class ExcelModuleIntegTestAbstract extends CausewayIntegrationTe
     @Configuration
     @PropertySources({
             @PropertySource(CausewayPresets.NoTranslations),
-            @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
     })
     @Import({
             CausewayModuleCoreRuntimeServices.class,
             CausewayModulePersistenceCommons.class,
             CausewayModuleSecurityBypass.class,
-            CausewayModulePersistenceJdoApplib.class,
+            CausewayModulePersistenceJpaApplib.class,
             CausewayModuleTestingFixturesApplib.class,
 
             CausewayModuleExtExcelFixtures.class,
diff --git a/extensions/core/executionlog/persistence-jdo/logging-dn-enhance.properties b/extensions/core/executionlog/persistence-jdo/logging-dn-enhance.properties
deleted file mode 100644
index 515c2a29662..00000000000
--- a/extensions/core/executionlog/persistence-jdo/logging-dn-enhance.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-
-
-# overriding all those below... 
-log4j.category.DataNucleus=ERROR
-
-log4j.category.DataNucleus.Persistence=INFO, A1
-log4j.category.DataNucleus.Transaction=INFO, A1
-log4j.category.DataNucleus.Connection=INFO, A1
-log4j.category.DataNucleus.Query=INFO, A1
-log4j.category.DataNucleus.Cache=INFO, A1
-log4j.category.DataNucleus.MetaData=INFO, A1
-log4j.category.DataNucleus.Datastore=INFO, A1
-log4j.category.DataNucleus.Datastore.Schema=INFO, A1
-log4j.category.DataNucleus.Datastore.Persist=INFO, A1
-log4j.category.DataNucleus.Datastore.Retrieve=INFO, A1
-#Log of all 'native' statements sent to the datastore
-log4j.category.DataNucleus.Datastore.Native=INFO, A1 
-log4j.category.DataNucleus.General=INFO, A1
-#All messages relating to object lifecycle changes
-log4j.category.DataNucleus.Lifecycle=INFO, A1
-log4j.category.DataNucleus.ValueGeneration=INFO, A1
-log4j.category.DataNucleus.Enhancer=INFO, A1
-log4j.category.DataNucleus.SchemaTool=INFO, A1
-log4j.category.DataNucleus.JDO=INFO, A1
- 
\ No newline at end of file
diff --git a/extensions/core/executionlog/persistence-jdo/pom.xml b/extensions/core/executionlog/persistence-jdo/pom.xml
deleted file mode 100644
index 7331d267a8b..00000000000
--- a/extensions/core/executionlog/persistence-jdo/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.causeway.extensions</groupId>
-        <artifactId>causeway-extensions-executionlog</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>causeway-extensions-executionlog-persistence-jdo</artifactId>
-    <name>Apache Causeway Ext - Execution Log Implementation (JDO)</name>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.causeway.extensions.executionlog.persistence.jdo</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/causeway/extensions/executionlog/persistence-jdo</git-plugin.propertiesDir>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-
-    <dependencies>
-
-	    <dependency>
-	        <groupId>org.apache.causeway.extensions</groupId>
-	        <artifactId>causeway-extensions-executionlog-applib</artifactId>
-	    </dependency>
-
-        <!-- PERSISTENCE -->
-
-		<dependency>
-            <groupId>org.apache.causeway.persistence</groupId>
-			<artifactId>causeway-persistence-jdo-datanucleus</artifactId>
-        </dependency>
-
-        <!-- TESTING -->
-
-        <dependency>
-            <groupId>org.apache.causeway.extensions</groupId>
-            <artifactId>causeway-extensions-executionlog-applib</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-unittestsupport-applib</artifactId>
-            <scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-integtestsupport-applib</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-
-    </dependencies>
-
-</project>
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/CausewayModuleExtExecutionLogPersistenceJdo.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/CausewayModuleExtExecutionLogPersistenceJdo.java
deleted file mode 100644
index 09ca41bc449..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/CausewayModuleExtExecutionLogPersistenceJdo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionlog.jdo;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.causeway.extensions.executionlog.applib.CausewayModuleExtExecutionLogApplib;
-import org.apache.causeway.extensions.executionlog.jdo.dom.ExecutionLogEntry;
-import org.apache.causeway.extensions.executionlog.jdo.dom.ExecutionLogEntryPK;
-import org.apache.causeway.extensions.executionlog.jdo.dom.ExecutionLogEntryRepository;
-import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
-        // modules
-        CausewayModuleExtExecutionLogApplib.class,
-        CausewayModulePersistenceJdoDatanucleus.class,
-
-        // @Service's
-        ExecutionLogEntryRepository.class,
-        ExecutionLogEntryPK.Semantics.class,
-
-        // entities
-        ExecutionLogEntry.class
-})
-public class CausewayModuleExtExecutionLogPersistenceJdo {
-
-    public static final String NAMESPACE = CausewayModuleExtExecutionLogApplib.NAMESPACE;
-    public static final String SCHEMA = CausewayModuleExtExecutionLogApplib.SCHEMA;
-
-    /**
-     * For tests that need to delete the command table first.
-     * Should be run in the @BeforeEach of the test.
-     */
-    public FixtureScript getTeardownFixtureWillDelete() {
-        return new TeardownFixtureJdoAbstract() {
-            @Override
-            protected void execute(final ExecutionContext executionContext) {
-                deleteFrom(ExecutionLogEntry.class);
-            }
-        };
-    }
-
-}
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntry.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
deleted file mode 100644
index 5d403af0075..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionlog.jdo.dom;
-
-import java.util.UUID;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Index;
-import javax.jdo.annotations.Indices;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.PrimaryKey;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
-import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry.Nq;
-import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryType;
-import org.apache.causeway.schema.ixn.v2.InteractionDto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType= IdentityType.APPLICATION,
-        schema = ExecutionLogEntry.SCHEMA,
-        table = ExecutionLogEntry.TABLE,
-        objectIdClass= ExecutionLogEntryPK.class)
-@Indices({
-        @Index(name = "ExecutionLogEntry__timestamp__IDX", members = { "timestamp" }),
-        @Index(name = "ExecutionLogEntry__target_timestamp__IDX", members = { "target", "timestamp" }),
-        @Index(name = "ExecutionLogEntry__username_timestamp__IDX", members = { "username", "timestamp" }),
-})
-@Queries( {
-    @Query(
-            name = Nq.FIND_BY_INTERACTION_ID,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE interactionId == :interactionId "
-                  + " ORDER BY timestamp DESC, sequence DESC"),
-    @Query(
-            name = Nq.FIND_BY_INTERACTION_ID_AND_SEQUENCE,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE interactionId == :interactionId "
-                  + "    && sequence      == :sequence "),
-    @Query(
-            name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp >= :timestampFrom "
-                  + "    && timestamp <= :timestampTo "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
-    @Query(
-            name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_AFTER,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp >= :timestamp "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
-    @Query(
-            name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp <= :timestamp "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
-    @Query(
-            name = Nq.FIND_BY_TARGET,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
-    @Query(
-            name = Nq.FIND_BY_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE timestamp >= :from "
-                  + "    && timestamp <= :to "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
-    @Query(
-            name = Nq.FIND_BY_TIMESTAMP_AFTER,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE timestamp >= :from "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
-    @Query(
-            name = Nq.FIND_BY_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE timestamp <= :to "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
-    @Query(
-            name  = Nq.FIND,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_MOST_RECENT,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"
-                  + " RANGE 0,100"),
-    @Query(
-            name = Nq.FIND_RECENT_BY_USERNAME,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE username == :username "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC "
-                  + " RANGE 0,30"),
-    @Query(
-            name = Nq.FIND_RECENT_BY_TARGET,
-            value = "SELECT "
-                  + "  FROM " + ExecutionLogEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC "
-                  + " RANGE 0,30")
-})
-@Named(ExecutionLogEntry.LOGICAL_TYPE_NAME)
-@DomainObject(
-        editing = Editing.DISABLED,
-        entityChangePublishing = Publishing.DISABLED
-)
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-public class ExecutionLogEntry extends org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry {
-
-    public static final String FQCN = "org.apache.causeway.extensions.executionlog.jdo.dom.ExecutionLogEntry";
-    @PrimaryKey
-    @InteractionId
-    @Column(allowsNull = InteractionId.ALLOWS_NULL, length=InteractionId.MAX_LENGTH)
-    @Getter @Setter
-    private UUID interactionId;
-
-    @PrimaryKey
-    @Sequence
-    @Column(allowsNull = Sequence.ALLOWS_NULL)
-    @Getter @Setter
-    private int sequence;
-
-    @Column(allowsNull = ExecutionType.ALLOWS_NULL, length = ExecutionType.MAX_LENGTH)
-    @ExecutionType
-    @Getter @Setter
-    private ExecutionLogEntryType executionType;
-
-    @Column(allowsNull = Username.ALLOWS_NULL, length = Username.MAX_LENGTH)
-    @Username
-    @Getter @Setter
-    private String username;
-
-    @Persistent
-    @Column(allowsNull = Timestamp.ALLOWS_NULL)
-    @Timestamp
-    @Getter @Setter
-    private java.sql.Timestamp timestamp;
-
-    @Persistent
-    @Column(allowsNull = Target.ALLOWS_NULL, length = Target.MAX_LENGTH)
-    @Target
-    @Getter @Setter
-    private Bookmark target;
-
-    @Column(allowsNull = LogicalMemberIdentifier.ALLOWS_NULL, length= LogicalMemberIdentifier.MAX_LENGTH)
-    @LogicalMemberIdentifier
-    @Getter
-    private String logicalMemberIdentifier;
-    public void setLogicalMemberIdentifier(final String logicalMemberIdentifier) {
-        this.logicalMemberIdentifier = Util.abbreviated(logicalMemberIdentifier, LogicalMemberIdentifier.MAX_LENGTH);
-    }
-
-    @Persistent
-    @Column(allowsNull = InteractionDtoAnnot.ALLOWS_NULL, jdbcType = "CLOB", sqlType = "LONGVARCHAR")
-    @InteractionDtoAnnot
-    @Getter @Setter
-    private InteractionDto interactionDto;
-
-    @Persistent
-    @Column(allowsNull = StartedAt.ALLOWS_NULL)
-    @StartedAt
-    @Getter @Setter
-    private java.sql.Timestamp startedAt;
-
-    @Persistent
-    @Column(allowsNull = CompletedAt.ALLOWS_NULL)
-    @CompletedAt
-    @Getter @Setter
-    private java.sql.Timestamp completedAt;
-
-}
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
deleted file mode 100644
index c914588ee84..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionlog.jdo.dom;
-
-import java.io.Serializable;
-import java.util.StringTokenizer;
-import java.util.UUID;
-
-import jakarta.annotation.Priority;
-
-import org.springframework.stereotype.Component;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.jspecify.annotations.NonNull;
-import lombok.Setter;
-
-@EqualsAndHashCode(of = {"interactionId", "sequence"})
-@NoArgsConstructor
-public class ExecutionLogEntryPK implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private static final String SEPARATOR = "_";
-
-    @Getter @Setter
-    public UUID interactionId;
-    @Getter @Setter
-    public int sequence;
-
-    public ExecutionLogEntryPK(final String value) {
-        var token = new StringTokenizer (value, SEPARATOR);
-        this.interactionId = UUID.fromString(token.nextToken());
-        this.sequence = Integer.parseInt(token.nextToken());
-    }
-
-    @Override
-    public String toString() {
-        return interactionId + SEPARATOR + sequence;
-    }
-
-    @Component
-    @Priority(PriorityPrecedence.MIDPOINT)
-    public static class Semantics
-    extends ValueSemanticsBasedOnIdStringifierEntityAgnostic<ExecutionLogEntryPK> {
-
-        public Semantics() {
-            super(ExecutionLogEntryPK.class);
-        }
-
-        @Override
-        public ExecutionLogEntryPK destring(
-                final @NonNull String stringified) {
-            return new ExecutionLogEntryPK(stringified);
-        }
-
-    }
-}
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryRepository.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryRepository.java
deleted file mode 100644
index 917f504082d..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryRepository.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionlog.jdo.dom;
-
-import jakarta.inject.Named;
-import jakarta.inject.Provider;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryRepositoryAbstract;
-import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
-
-import lombok.Builder;
-
-@Service
-@Named(ExecutionLogEntryRepository.LOGICAL_TYPE_NAME)
-@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
-@Qualifier("Jdo")
-public class ExecutionLogEntryRepository
-extends ExecutionLogEntryRepositoryAbstract<ExecutionLogEntry> {
-
-    public static final String LOGICAL_TYPE_NAME = CausewayModuleExtExecutionLogPersistenceJdo.NAMESPACE + ".ExecutionLogEntryRepository";
-
-    public ExecutionLogEntryRepository() {
-        super(ExecutionLogEntry.class);
-    }
-
-    /**
-     * for testing only
-     */
-    @Builder
-    ExecutionLogEntryRepository(
-            Class<ExecutionLogEntry> executionLogEntryClass,
-            Provider<RepositoryService> repositoryServiceProvider,
-            FactoryService factoryService) {
-        super(executionLogEntryClass, repositoryServiceProvider, factoryService);
-    }
-
-}
diff --git a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
deleted file mode 100644
index a40693fe715..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionlog.jdo.integtests;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-import org.springframework.test.context.ActiveProfiles;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.executionlog.applib.integtest.ExecutionLog_IntegTestAbstract;
-import org.apache.causeway.extensions.executionlog.applib.integtest.model.ExecutionLogTestDomainModel;
-import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
-import org.apache.causeway.extensions.executionlog.jdo.integtests.model.Counter;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-
-@SpringBootTest(
-        classes = ExecutionLog_IntegTest.AppManifest.class
-)
-@ActiveProfiles("test")
-public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract {
-
-    @SpringBootConfiguration
-    @EnableAutoConfiguration
-    @Import({
-            CausewayModuleCoreRuntimeServices.class,
-            CausewayModuleSecurityBypass.class,
-            CausewayModuleExtExecutionLogPersistenceJdo.class,
-    })
-    @PropertySources({
-            @PropertySource(CausewayPresets.UseLog4j2Test)
-    })
-    @ComponentScan(basePackageClasses = {AppManifest.class, ExecutionLogTestDomainModel.class})
-    public static class AppManifest {
-    }
-
-    @Override
-    protected org.apache.causeway.extensions.executionlog.applib.integtest.model.Counter newCounter(final String name) {
-        return Counter.builder().name(name).build();
-    }
-
-}
diff --git a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/model/Counter.java b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/model/Counter.java
deleted file mode 100644
index 9b101792999..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/model/Counter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.executionlog.jdo.integtests.model;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-
-import jakarta.inject.Named;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Nature;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@PersistenceCapable(
-        schema = "public",
-        table = "Counter"
-)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("executionlog.test.Counter")
-@DomainObject(nature = Nature.ENTITY)
-@NoArgsConstructor
-@Builder
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class Counter extends org.apache.causeway.extensions.executionlog.applib.integtest.model.Counter {
-
-    @Column(allowsNull = "false")
-    @Getter @Setter
-    private String name;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num2;
-
-}
diff --git a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/model/CounterRepository.java b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/model/CounterRepository.java
deleted file mode 100644
index 45abc6f4273..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/model/CounterRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.executionlog.jdo.integtests.model;
-
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class CounterRepository
-        extends org.apache.causeway.extensions.executionlog.applib.integtest.model.CounterRepository<Counter> {
-
-    public CounterRepository() {
-        super(Counter.class);
-    }
-}
diff --git a/extensions/core/executionlog/persistence-jdo/src/test/resources/application-test.yml b/extensions/core/executionlog/persistence-jdo/src/test/resources/application-test.yml
deleted file mode 100644
index 5ef6c5da861..00000000000
--- a/extensions/core/executionlog/persistence-jdo/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-causeway:
-  persistence:
-    schema:
-      auto-create-schemas: "CAUSEWAYEXTEXECUTIONLOG"
-
-
-datanucleus:
-  schema:
-    generate-database:
-      mode: "create"
diff --git a/extensions/core/executionlog/pom.xml b/extensions/core/executionlog/pom.xml
index 1f9bd494844..a77304f300b 100644
--- a/extensions/core/executionlog/pom.xml
+++ b/extensions/core/executionlog/pom.xml
@@ -49,11 +49,6 @@
 				<type>test-jar</type>
 				<version>3.0.0-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.causeway.extensions</groupId>
-				<artifactId>causeway-extensions-executionlog-persistence-jdo</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.causeway.extensions</groupId>
 				<artifactId>causeway-extensions-executionlog-persistence-jpa</artifactId>
@@ -64,7 +59,6 @@
 
 	<modules>
 		<module>applib</module>
-		<module>persistence-jdo</module>
 		<module>persistence-jpa</module>
 	</modules>
 
diff --git a/extensions/core/executionoutbox/persistence-jdo/logging-dn-enhance.properties b/extensions/core/executionoutbox/persistence-jdo/logging-dn-enhance.properties
deleted file mode 100644
index 515c2a29662..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/logging-dn-enhance.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-
-
-# overriding all those below... 
-log4j.category.DataNucleus=ERROR
-
-log4j.category.DataNucleus.Persistence=INFO, A1
-log4j.category.DataNucleus.Transaction=INFO, A1
-log4j.category.DataNucleus.Connection=INFO, A1
-log4j.category.DataNucleus.Query=INFO, A1
-log4j.category.DataNucleus.Cache=INFO, A1
-log4j.category.DataNucleus.MetaData=INFO, A1
-log4j.category.DataNucleus.Datastore=INFO, A1
-log4j.category.DataNucleus.Datastore.Schema=INFO, A1
-log4j.category.DataNucleus.Datastore.Persist=INFO, A1
-log4j.category.DataNucleus.Datastore.Retrieve=INFO, A1
-#Log of all 'native' statements sent to the datastore
-log4j.category.DataNucleus.Datastore.Native=INFO, A1 
-log4j.category.DataNucleus.General=INFO, A1
-#All messages relating to object lifecycle changes
-log4j.category.DataNucleus.Lifecycle=INFO, A1
-log4j.category.DataNucleus.ValueGeneration=INFO, A1
-log4j.category.DataNucleus.Enhancer=INFO, A1
-log4j.category.DataNucleus.SchemaTool=INFO, A1
-log4j.category.DataNucleus.JDO=INFO, A1
- 
\ No newline at end of file
diff --git a/extensions/core/executionoutbox/persistence-jdo/pom.xml b/extensions/core/executionoutbox/persistence-jdo/pom.xml
deleted file mode 100644
index d147544636d..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.causeway.extensions</groupId>
-        <artifactId>causeway-extensions-executionoutbox</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>causeway-extensions-executionoutbox-persistence-jdo</artifactId>
-    <name>Apache Causeway Ext - Execution Outbox Implementation (JDO)</name>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.causeway.extensions.executionoutbox.persistence.jdo</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/causeway/extensions/executionoutbox/persistence-jdo</git-plugin.propertiesDir>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-
-    <dependencies>
-
-	    <dependency>
-	        <groupId>org.apache.causeway.extensions</groupId>
-	        <artifactId>causeway-extensions-executionoutbox-applib</artifactId>
-	    </dependency>
-
-        <!-- PERSISTENCE -->
-
-		<dependency>
-            <groupId>org.apache.causeway.persistence</groupId>
-			<artifactId>causeway-persistence-jdo-datanucleus</artifactId>
-        </dependency>
-
-        <!-- TESTING -->
-
-        <dependency>
-            <groupId>org.apache.causeway.extensions</groupId>
-            <artifactId>causeway-extensions-executionoutbox-applib</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-unittestsupport-applib</artifactId>
-            <scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-integtestsupport-applib</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-
-    </dependencies>
-
-</project>
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/CausewayModuleExtExecutionOutboxPersistenceJdo.java b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/CausewayModuleExtExecutionOutboxPersistenceJdo.java
deleted file mode 100644
index 2ef7deeac5a..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/CausewayModuleExtExecutionOutboxPersistenceJdo.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionoutbox.jdo;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.causeway.extensions.executionoutbox.applib.CausewayModuleExtExecutionOutboxApplib;
-import org.apache.causeway.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntry;
-import org.apache.causeway.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntryPK;
-import org.apache.causeway.extensions.executionoutbox.jdo.dom.ExecutionOutboxEntryRepository;
-import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
-        // modules
-        CausewayModuleExtExecutionOutboxApplib.class,
-        CausewayModulePersistenceJdoDatanucleus.class,
-
-        // @Service's
-        ExecutionOutboxEntryRepository.class,
-        ExecutionOutboxEntryPK.Semantics.class,
-
-        // entities
-        ExecutionOutboxEntry.class
-})
-public class CausewayModuleExtExecutionOutboxPersistenceJdo {
-
-    public static final String NAMESPACE = CausewayModuleExtExecutionOutboxApplib.NAMESPACE;
-    public static final String SCHEMA = CausewayModuleExtExecutionOutboxApplib.SCHEMA;
-
-    /**
-     * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
-     * but is provided to allow manual teardown if required.
-     */
-    public FixtureScript teardownFixture() {
-        return new TeardownFixtureJdoAbstract() {
-            @Override
-            protected void execute(final ExecutionContext executionContext) {
-                deleteFrom(ExecutionOutboxEntry.class);
-            }
-        };
-    }
-
-}
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
deleted file mode 100644
index 42ee7655082..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntry.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionoutbox.jdo.dom;
-
-import java.util.UUID;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Index;
-import javax.jdo.annotations.Indices;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.PrimaryKey;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
-import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry.Nq;
-import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryType;
-import org.apache.causeway.schema.ixn.v2.InteractionDto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType= IdentityType.APPLICATION,
-        schema = ExecutionOutboxEntry.SCHEMA,
-        table = ExecutionOutboxEntry.TABLE,
-        objectIdClass= ExecutionOutboxEntryPK.class)
-@Indices({
-        @Index(name = "ExecutionOutboxEntry__timestamp__IDX", members = { "timestamp" }),
-        @Index(name = "ExecutionOutboxEntry__target__timestamp__IDX", members = { "target", "timestamp" }),
-        @Index(name = "ExecutionOutboxEntry__username__timestamp__IDX", members = { "username", "timestamp" }),
-})
-@Queries( {
-    @Query(
-            name = Nq.FIND_BY_INTERACTION_ID_AND_SEQUENCE,
-            value = "SELECT "
-                  + "  FROM " + ExecutionOutboxEntry.FQCN + " "
-                  + " WHERE interactionId == :interactionId "
-                  + "    && sequence      == :sequence "),
-    @Query(
-            name = Nq.FIND_OLDEST,
-            value = "SELECT "
-                  + "  FROM " + ExecutionOutboxEntry.FQCN + " "
-                  + " ORDER BY timestamp ASC, interactionId ASC, sequence DESC"
-                    + " RANGE 0,100"),
-})
-@Named(ExecutionOutboxEntry.LOGICAL_TYPE_NAME)
-@DomainObject(
-        editing = Editing.DISABLED,
-        entityChangePublishing = Publishing.DISABLED
-)
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-public class ExecutionOutboxEntry extends org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry {
-
-    public static final String FQCN = "org.apache.causeway.extensions.executionlog.jdo.dom.ExecutionLogEntry";
-    @PrimaryKey
-    @InteractionId
-    @Column(allowsNull = InteractionId.ALLOWS_NULL, length=InteractionId.MAX_LENGTH)
-    @Getter @Setter
-    private UUID interactionId;
-
-    @PrimaryKey
-    @Sequence
-    @Column(allowsNull = Sequence.ALLOWS_NULL)
-    @Getter @Setter
-    private int sequence;
-
-    @Column(allowsNull = ExecutionType.ALLOWS_NULL, length = ExecutionType.MAX_LENGTH)
-    @ExecutionType
-    @Getter @Setter
-    private ExecutionOutboxEntryType executionType;
-
-    @Column(allowsNull = Username.ALLOWS_NULL, length = Username.MAX_LENGTH)
-    @Username
-    @Getter @Setter
-    private String username;
-
-    @Persistent
-    @Column(allowsNull = Timestamp.ALLOWS_NULL)
-    @Timestamp
-    @Getter @Setter
-    private java.sql.Timestamp timestamp;
-
-    @Persistent
-    @Column(allowsNull = Target.ALLOWS_NULL, length = Target.MAX_LENGTH)
-    @Target
-    @Getter @Setter
-    private Bookmark target;
-
-    @Column(allowsNull = LogicalMemberIdentifier.ALLOWS_NULL, length= LogicalMemberIdentifier.MAX_LENGTH)
-    @LogicalMemberIdentifier
-    @Getter
-    private String logicalMemberIdentifier;
-    public void setLogicalMemberIdentifier(final String logicalMemberIdentifier) {
-        this.logicalMemberIdentifier = Util.abbreviated(logicalMemberIdentifier, LogicalMemberIdentifier.MAX_LENGTH);
-    }
-
-    @Persistent
-    @Column(allowsNull = InteractionDtoAnnot.ALLOWS_NULL, jdbcType = "CLOB", sqlType = "LONGVARCHAR")
-    @InteractionDtoAnnot
-    @Getter @Setter
-    private InteractionDto interactionDto;
-
-    @Persistent
-    @Column(allowsNull = StartedAt.ALLOWS_NULL)
-    @StartedAt
-    @Getter @Setter
-    private java.sql.Timestamp startedAt;
-
-    @Persistent
-    @Column(allowsNull = CompletedAt.ALLOWS_NULL)
-    @CompletedAt
-    @Getter @Setter
-    private java.sql.Timestamp completedAt;
-
-}
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
deleted file mode 100644
index 30b36b71f5a..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionoutbox.jdo.dom;
-
-import java.io.Serializable;
-import java.util.StringTokenizer;
-import java.util.UUID;
-
-import jakarta.annotation.Priority;
-
-import org.springframework.stereotype.Component;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.jspecify.annotations.NonNull;
-import lombok.Setter;
-
-@EqualsAndHashCode(of = {"interactionId", "sequence"})
-@NoArgsConstructor
-public class ExecutionOutboxEntryPK implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private static final String SEPARATOR = "_";
-
-    @Getter @Setter
-    public UUID interactionId;
-    @Getter @Setter
-    public int sequence;
-
-    public ExecutionOutboxEntryPK(final String value) {
-        var token = new StringTokenizer (value, SEPARATOR);
-        this.interactionId = UUID.fromString(token.nextToken());
-        this.sequence = Integer.parseInt(token.nextToken());
-    }
-
-    @Override
-    public String toString() {
-        return interactionId + SEPARATOR + sequence;
-    }
-
-    @Component
-    @Priority(PriorityPrecedence.MIDPOINT)
-    public static class Semantics
-    extends ValueSemanticsBasedOnIdStringifierEntityAgnostic<ExecutionOutboxEntryPK> {
-
-        public Semantics() {
-            super(ExecutionOutboxEntryPK.class);
-        }
-
-        @Override
-        public String enstring(final ExecutionOutboxEntryPK value) {
-            return value.toString();
-        }
-
-        @Override
-        public ExecutionOutboxEntryPK destring(
-                final @NonNull String stringified) {
-            return new ExecutionOutboxEntryPK(stringified);
-        }
-
-        @Override
-        public boolean isValid(final @NonNull ExecutionOutboxEntryPK value) {
-            return value.getInteractionId()!=null;
-        }
-    }
-}
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryRepository.java b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryRepository.java
deleted file mode 100644
index 0622cc210b1..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryRepository.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionoutbox.jdo.dom;
-
-import jakarta.inject.Named;
-import jakarta.inject.Provider;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryRepositoryAbstract;
-
-import lombok.Builder;
-
-@Service
-@Named(ExecutionOutboxEntryRepositoryAbstract.LOGICAL_TYPE_NAME)
-@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
-@Qualifier("Jdo")
-public class ExecutionOutboxEntryRepository
-extends ExecutionOutboxEntryRepositoryAbstract<ExecutionOutboxEntry> {
-
-    public ExecutionOutboxEntryRepository() {
-        super(ExecutionOutboxEntry.class);
-    }
-
-    /**
-     * for testing only
-     */
-    @Builder
-    ExecutionOutboxEntryRepository(
-            Class<ExecutionOutboxEntry> executionLogEntryClass,
-            Provider<RepositoryService> repositoryServiceProvider,
-            FactoryService factoryService) {
-        super(executionLogEntryClass, repositoryServiceProvider, factoryService);
-    }
-
-    @Override
-    protected ExecutionOutboxEntry newExecutionOutboxEntry() {
-        return null;
-    }
-
-}
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java b/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
deleted file mode 100644
index 4bcc08cb4de..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.executionoutbox.jdo.integtests;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-import org.springframework.test.context.ActiveProfiles;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.executionoutbox.applib.integtest.ExecutionOutbox_IntegTestAbstract;
-import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.ExecutionOutboxTestDomainModel;
-import org.apache.causeway.extensions.executionoutbox.jdo.CausewayModuleExtExecutionOutboxPersistenceJdo;
-import org.apache.causeway.extensions.executionoutbox.jdo.integtests.model.Counter;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-
-@SpringBootTest(
-        classes = ExecutionOutbox_IntegTest.AppManifest.class
-)
-@ActiveProfiles("test")
-public class ExecutionOutbox_IntegTest extends ExecutionOutbox_IntegTestAbstract {
-
-    @SpringBootConfiguration
-    @EnableAutoConfiguration
-    @Import({
-            CausewayModuleCoreRuntimeServices.class,
-            CausewayModuleSecurityBypass.class,
-            CausewayModuleExtExecutionOutboxPersistenceJdo.class,
-    })
-    @PropertySources({
-            @PropertySource(CausewayPresets.UseLog4j2Test)
-    })
-    @ComponentScan(basePackageClasses = {AppManifest.class, ExecutionOutboxTestDomainModel.class})
-    public static class AppManifest {
-    }
-
-    protected org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter newCounter(String name) {
-        return Counter.builder().name(name).build();
-    }
-
-}
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/model/Counter.java b/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/model/Counter.java
deleted file mode 100644
index baf56271a91..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/model/Counter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.executionoutbox.jdo.integtests.model;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-
-import jakarta.inject.Named;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Nature;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@PersistenceCapable(
-        schema = "public",
-        table = "Counter"
-)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("executionoutbox.test.Counter")
-@DomainObject(nature = Nature.ENTITY)
-@NoArgsConstructor
-@Builder
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class Counter extends org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter {
-
-    @Column(allowsNull = "false")
-    @Getter @Setter
-    private String name;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num2;
-
-}
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/model/CounterRepository.java b/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/model/CounterRepository.java
deleted file mode 100644
index 799a8a81d17..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/model/CounterRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.executionoutbox.jdo.integtests.model;
-
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class CounterRepository
-        extends org.apache.causeway.extensions.executionoutbox.applib.integtest.model.CounterRepository<Counter> {
-
-    public CounterRepository() {
-        super(Counter.class);
-    }
-}
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/test/resources/application-test.yml b/extensions/core/executionoutbox/persistence-jdo/src/test/resources/application-test.yml
deleted file mode 100644
index 9bfaa9a4f7f..00000000000
--- a/extensions/core/executionoutbox/persistence-jdo/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-causeway:
-  persistence:
-    schema:
-      auto-create-schemas: "CAUSEWAYEXTEXECUTIONOUTBOX"
-
-
-datanucleus:
-  schema:
-    generate-database:
-      mode: "create"
diff --git a/extensions/core/executionoutbox/pom.xml b/extensions/core/executionoutbox/pom.xml
index b13c8613cf8..ecf1d3612f8 100644
--- a/extensions/core/executionoutbox/pom.xml
+++ b/extensions/core/executionoutbox/pom.xml
@@ -49,18 +49,6 @@
 				<scope>test</scope>
 				<version>3.0.0-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.causeway.extensions</groupId>
-				<artifactId>causeway-extensions-executionoutbox-persistence-jdo</artifactId>
-				<version>3.0.0-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.causeway.extensions</groupId>
-				<artifactId>causeway-extensions-executionoutbox-persistence-jdo</artifactId>
-				<type>test-jar</type>
-				<scope>test</scope>
-				<version>3.0.0-SNAPSHOT</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.causeway.extensions</groupId>
 				<artifactId>causeway-extensions-executionoutbox-persistence-jpa</artifactId>
@@ -83,7 +71,6 @@
 
 	<modules>
 		<module>applib</module>
-		<module>persistence-jdo</module>
 		<module>persistence-jpa</module>
 		<module>restclient</module>
 	</modules>
diff --git a/extensions/security/audittrail/persistence-jdo/log4j2-test.xml b/extensions/security/audittrail/persistence-jdo/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/security/audittrail/persistence-jdo/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Configuration status="WARN">
-	<Properties>
-		<Property name="PID">????</Property>
-		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
-		<Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-		<Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-	</Properties>
-	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-		</Console>
-	</Appenders>
-	<Loggers>
-		<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-		<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-		<logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-		<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-		<logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-		
-		<logger name="org.apache.directory" level="warn"/>
-		<logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-		
-		<logger name="DataNucleus.Persistence" level="info"/>
-		<logger name="DataNucleus.Transaction" level="info"/>
-		<logger name="DataNucleus.Datastore.Schema" level="info"/>
-		<logger name="DataNucleus.Datastore.Native" level="info"/>
-		
-		<Root level="info">
-			<AppenderRef ref="Console" />
-		</Root>
-	</Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/security/audittrail/persistence-jdo/logging-dn-enhance.properties b/extensions/security/audittrail/persistence-jdo/logging-dn-enhance.properties
deleted file mode 100644
index ca165acc786..00000000000
--- a/extensions/security/audittrail/persistence-jdo/logging-dn-enhance.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#         http://www.apache.org/licenses/LICENSE-2.0
-#         
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/extensions/security/audittrail/persistence-jdo/pom.xml b/extensions/security/audittrail/persistence-jdo/pom.xml
deleted file mode 100644
index 29a461c8e31..00000000000
--- a/extensions/security/audittrail/persistence-jdo/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.causeway.extensions</groupId>
-        <artifactId>causeway-extensions-audittrail</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>causeway-extensions-audittrail-persistence-jdo</artifactId>
-    <name>Apache Causeway Ext - Audit Trail Persistence (using JDO)</name>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.causeway.extensions.audittrail.persistence.jdo</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/causeway/extensions/audittrail/persistence-jdo</git-plugin.propertiesDir>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.causeway.extensions</groupId>
-            <artifactId>causeway-extensions-audittrail-applib</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.persistence</groupId>
-            <artifactId>causeway-persistence-jdo-datanucleus</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.testing</groupId>
-            <artifactId>causeway-testing-fixtures-applib</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.core</groupId>
-            <artifactId>causeway-core-runtime</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- testing -->
-
-        <dependency>
-            <groupId>org.apache.causeway.extensions</groupId>
-            <artifactId>causeway-extensions-audittrail-applib</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.testing</groupId>
-            <artifactId>causeway-testing-integtestsupport-applib</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/CausewayModuleExtAuditTrailPersistenceJdo.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/CausewayModuleExtAuditTrailPersistenceJdo.java
deleted file mode 100644
index be3b8395b0d..00000000000
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/CausewayModuleExtAuditTrailPersistenceJdo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.audittrail.jdo;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.causeway.extensions.audittrail.applib.CausewayModuleExtAuditTrailApplib;
-import org.apache.causeway.extensions.audittrail.jdo.dom.AuditTrailEntry;
-import org.apache.causeway.extensions.audittrail.jdo.dom.AuditTrailEntryRepository;
-import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-
-@Configuration
-@Import({
-        // modules
-        CausewayModuleTestingFixturesApplib.class,
-        CausewayModuleExtAuditTrailApplib.class,
-        CausewayModulePersistenceJdoDatanucleus.class,
-
-        // services
-        AuditTrailEntryRepository.class,
-
-        // entities, eager meta-model introspection
-        AuditTrailEntry.class,
-})
-public class CausewayModuleExtAuditTrailPersistenceJdo {
-
-    /**
-     * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
-     * but is provided to allow manual teardown if required.
-     */
-    public FixtureScript teardownFixture() {
-        return new TeardownFixtureJdoAbstract() {
-            @Override
-            protected void execute(final ExecutionContext executionContext) {
-                deleteFrom(AuditTrailEntry.class);
-            }
-        };
-    }
-
-}
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntry.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntry.java
deleted file mode 100644
index c6cebee7221..00000000000
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntry.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.audittrail.jdo.dom;
-
-import java.util.UUID;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Index;
-import javax.jdo.annotations.Indices;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-import javax.jdo.annotations.Version;
-import javax.jdo.annotations.VersionStrategy;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
-import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry.Nq;
-
-import lombok.Getter;
-import lombok.Setter;
-@PersistenceCapable(
-        identityType = IdentityType.DATASTORE,
-        schema = AuditTrailEntry.SCHEMA,
-        table = AuditTrailEntry.TABLE)
-@Indices({
-        @Index(name = "AuditTrailEntry__target_propertyId_timestamp_IDX", members = { "target", "propertyId", "timestamp" }, unique = "false"),
-        @Index(name = "AuditTrailEntry__target_timestamp_IDX", members = { "target", "timestamp" }, unique = "false"),
-        @Index(name = "AuditTrailEntry__timestamp_IDX", members = { "timestamp" }, unique = "false"),
-        @Index(name = "AuditTrailEntry__interactionId_IDX", members = { "interactionId" }, unique = "false")
-})
-@Queries( {
-    @Query(
-            name = Nq.FIND_BY_INTERACTION_ID,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE interactionId == :interactionId"),
-    @Query(
-            name = Nq.FIND_FIRST_BY_TARGET,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + " ORDER BY timestamp ASC "
-                  + " RANGE 0,2"),
-    @Query(
-            name = Nq.FIND_RECENT_BY_TARGET,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + " ORDER BY timestamp DESC "
-                  + " RANGE 0,100"),
-    @Query(
-            name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp >= :from "
-                  + "    && timestamp <= :to "
-                  + "ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_AFTER,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp >= :from "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && timestamp <= :to "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TARGET,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE timestamp >= :from "
-                  + "    && timestamp <= :to "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TIMESTAMP_AFTER,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE timestamp >= :from "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE timestamp <= :to "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_MOST_RECENT,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"
-                  + " RANGE 0,100"),
-    @Query(
-            name = Nq.FIND_RECENT_BY_TARGET_AND_PROPERTY_ID,
-            value = "SELECT "
-                  + "  FROM " + AuditTrailEntry.FQCN + " "
-                  + " WHERE target == :target "
-                  + "    && propertyId == :propertyId "
-                  + " ORDER BY timestamp DESC "
-                  + " RANGE 0,30"),
-    @Query(
-            name = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + "    && timestamp >= :from "
-                    + "    && timestamp <= :to "
-                    + "ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_AFTER,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + "    && timestamp >= :from "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + "    && timestamp <= :to "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_USERNAME,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_BY_USERNAME_AND_TARGET_AND_TIMESTAMP_BETWEEN,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + "    && target == :target "
-                    + "    && timestamp >= :from "
-                    + "    && timestamp <= :to "
-                    + "ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_BY_USERNAME_AND_TARGET_AND_TIMESTAMP_AFTER,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + "    && target == :target "
-                    + "    && timestamp >= :from "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_USERNAME_AND_TARGET_AND_TIMESTAMP_BEFORE,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + "    && target == :target "
-                    + "    && timestamp <= :to "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name  = Nq.FIND_BY_USERNAME_AND_TARGET,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + "    && target == :target "
-                    + " ORDER BY timestamp DESC"),
-    @Query(
-            name = Nq.FIND_RECENT_BY_USERNAME,
-            value = "SELECT "
-                    + "  FROM " + AuditTrailEntry.FQCN + " "
-                    + " WHERE username == :username "
-                    + " ORDER BY timestamp DESC "
-                    + " RANGE 0,100")
-})
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Version(strategy = VersionStrategy.VERSION_NUMBER, column = "version")
-@Named(AuditTrailEntry.LOGICAL_TYPE_NAME)
-@DomainObject(
-        editing = Editing.DISABLED,
-        entityChangePublishing = Publishing.DISABLED
-)
-public class AuditTrailEntry
-extends org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry {
-
-    static final String FQCN = "org.apache.causeway.extensions.audittrail.jdo.dom.AuditTrailEntry";
-
-    @Column(allowsNull = Username.ALLOWS_NULL, length = Username.MAX_LENGTH)
-    @Username
-    @Getter @Setter
-    private String username;
-
-    @Column(allowsNull = Timestamp.ALLOWS_NULL)
-    @Timestamp
-    @Getter @Setter
-    private java.sql.Timestamp timestamp;
-
-    @Column(allowsNull = InteractionId.ALLOWS_NULL, length = InteractionId.MAX_LENGTH)
-    @InteractionId
-    @Getter @Setter
-    private UUID interactionId;
-
-    @Column(allowsNull = Sequence.ALLOWS_NULL)
-    @Sequence
-    @Getter @Setter
-    private int sequence;
-
-    @Persistent
-    @Column(allowsNull = Target.ALLOWS_NULL, length = Target.MAX_LENGTH)
-    @Target
-    @Getter @Setter
-    private Bookmark target;
-
-    @Column(allowsNull = LogicalMemberIdentifier.ALLOWS_NULL, length = LogicalMemberIdentifier.MAX_LENGTH)
-    @LogicalMemberIdentifier
-    @Getter @Setter
-    private String logicalMemberIdentifier;
-
-    @Column(allowsNull = PropertyId.ALLOWS_NULL, length = PropertyId.MAX_LENGTH)
-    @PropertyId
-    @Getter @Setter
-    private String propertyId;
-
-    @Column(allowsNull = PreValue.ALLOWS_NULL, length = PreValue.MAX_LENGTH)
-    @PreValue
-    @Getter @Setter
-    private String preValue;
-
-    @Column(allowsNull = PostValue.ALLOWS_NULL, length = PostValue.MAX_LENGTH)
-    @PostValue
-    @Getter @Setter
-    private String postValue;
-
-}
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntryRepository.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntryRepository.java
deleted file mode 100644
index 6367f88c245..00000000000
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/causeway/extensions/audittrail/jdo/dom/AuditTrailEntryRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.causeway.extensions.audittrail.jdo.dom;
-
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntryRepositoryAbstract;
-
-@Service
-public class AuditTrailEntryRepository extends AuditTrailEntryRepositoryAbstract<AuditTrailEntry> {
-
-    public AuditTrailEntryRepository() {
-        super(AuditTrailEntry.class);
-    }
-}
diff --git a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
deleted file mode 100644
index 5210e853b07..00000000000
--- a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.audittrail.jdo.integtests;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-import org.springframework.test.context.ActiveProfiles;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
-import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
-import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrailPersistenceJdo;
-import org.apache.causeway.extensions.audittrail.jdo.integtests.model.Counter;
-import org.apache.causeway.extensions.audittrail.jdo.integtests.model.CounterRepository;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-
-@SpringBootTest(
-        classes = AuditTrail_IntegTest.AppManifest.class
-)
-@ActiveProfiles("test")
-public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
-
-    @SpringBootConfiguration
-    @EnableAutoConfiguration
-    @Import({
-            CausewayModuleCoreRuntimeServices.class,
-            CausewayModuleSecurityBypass.class,
-            CausewayModuleExtAuditTrailPersistenceJdo.class,
-    })
-    @PropertySources({
-            @PropertySource(CausewayPresets.UseLog4j2Test),
-    })
-    @ComponentScan(basePackageClasses = {AppManifest.class, AuditTrailTestDomainModel.class, CounterRepository.class})
-    public static class AppManifest {
-    }
-
-    @Override
-    protected org.apache.causeway.extensions.audittrail.applib.integtests.model.Counter newCounter(final String name) {
-        return Counter.builder().name(name).build();
-    }
-
-}
diff --git a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/model/Counter.java b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/model/Counter.java
deleted file mode 100644
index ec804fbed84..00000000000
--- a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/model/Counter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.audittrail.jdo.integtests.model;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-
-import jakarta.inject.Named;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.Publishing;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@PersistenceCapable(
-        schema = "public",
-        table = "Counter"
-)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("audittrail.test.Counter")
-@DomainObject(nature = Nature.ENTITY, entityChangePublishing = Publishing.ENABLED)
-@NoArgsConstructor
-@Builder
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class Counter extends org.apache.causeway.extensions.audittrail.applib.integtests.model.Counter {
-
-    @Column(allowsNull = "false")
-    @Getter @Setter
-    private String name;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num;
-
-    @Column(allowsNull = "true")
-    @Getter @Setter
-    private Long num2;
-
-}
diff --git a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/model/CounterRepository.java b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/model/CounterRepository.java
deleted file mode 100644
index 88bc1ea3d74..00000000000
--- a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/model/CounterRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.audittrail.jdo.integtests.model;
-
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class CounterRepository
-        extends org.apache.causeway.extensions.audittrail.applib.integtests.model.CounterRepository<Counter> {
-
-    public CounterRepository() {
-        super(Counter.class);
-    }
-}
diff --git a/extensions/security/audittrail/persistence-jdo/src/test/resources/application-test.yml b/extensions/security/audittrail/persistence-jdo/src/test/resources/application-test.yml
deleted file mode 100644
index 65c380910fc..00000000000
--- a/extensions/security/audittrail/persistence-jdo/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-causeway:
-  persistence:
-    schema:
-      auto-create-schemas: "CAUSEWAYEXTAUDITTRAIL"
-
-
-datanucleus:
-  schema:
-    generate-database:
-      mode: "create"
diff --git a/extensions/security/audittrail/persistence-jpa/pom.xml b/extensions/security/audittrail/persistence-jpa/pom.xml
index ae10b42a280..86d29f4554b 100644
--- a/extensions/security/audittrail/persistence-jpa/pom.xml
+++ b/extensions/security/audittrail/persistence-jpa/pom.xml
@@ -50,12 +50,6 @@
         <dependency>
             <groupId>org.apache.causeway.testing</groupId>
             <artifactId>causeway-testing-fixtures-applib</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.causeway.persistence</groupId>
-                    <artifactId>causeway-persistence-jdo-applib</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/extensions/security/audittrail/pom.xml b/extensions/security/audittrail/pom.xml
index c85050d61b3..7700d2a894f 100644
--- a/extensions/security/audittrail/pom.xml
+++ b/extensions/security/audittrail/pom.xml
@@ -60,11 +60,6 @@
                 <artifactId>causeway-extensions-audittrail-persistence-jpa</artifactId>
                 <version>3.0.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-audittrail-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.apache.causeway.testing</groupId>
@@ -88,7 +83,6 @@
 
     <modules>
     	<module>applib</module>
-    	<module>persistence-jdo</module>
     	<module>persistence-jpa</module>
     </modules>
 </project>
diff --git a/extensions/security/secman/applib/pom.xml b/extensions/security/secman/applib/pom.xml
index d6baa81f692..7287b62e17d 100644
--- a/extensions/security/secman/applib/pom.xml
+++ b/extensions/security/secman/applib/pom.xml
@@ -40,13 +40,6 @@
         <dependency>
             <groupId>org.apache.causeway.testing</groupId>
             <artifactId>causeway-testing-fixtures-applib</artifactId>
-            <exclusions>
-                <!-- exclusion not strictly required, but helps keep JPA and JDO implementations separated -->
-                <exclusion>
-                    <groupId>org.apache.causeway.persistence</groupId>
-                    <artifactId>causeway-persistence-jdo-applib</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/extensions/security/secman/persistence-jdo/log4j2-test.xml b/extensions/security/secman/persistence-jdo/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/security/secman/persistence-jdo/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Configuration status="WARN">
-	<Properties>
-		<Property name="PID">????</Property>
-		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
-		<Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-		<Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-	</Properties>
-	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-		</Console>
-	</Appenders>
-	<Loggers>
-		<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-		<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-		<logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-		<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-		<logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-		
-		<logger name="org.apache.directory" level="warn"/>
-		<logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-		
-		<logger name="DataNucleus.Persistence" level="info"/>
-		<logger name="DataNucleus.Transaction" level="info"/>
-		<logger name="DataNucleus.Datastore.Schema" level="info"/>
-		<logger name="DataNucleus.Datastore.Native" level="info"/>
-		
-		<Root level="info">
-			<AppenderRef ref="Console" />
-		</Root>
-	</Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/security/secman/persistence-jdo/logging-dn-enhance.properties b/extensions/security/secman/persistence-jdo/logging-dn-enhance.properties
deleted file mode 100644
index ca165acc786..00000000000
--- a/extensions/security/secman/persistence-jdo/logging-dn-enhance.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#         http://www.apache.org/licenses/LICENSE-2.0
-#         
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
deleted file mode 100644
index 38f680af305..00000000000
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.causeway.extensions</groupId>
-        <artifactId>causeway-extensions-secman</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>causeway-extensions-secman-persistence-jdo</artifactId>
-    <name>Apache Causeway Ext - Sec Man Persistence (Using JDO)</name>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.causeway.extensions.secman.persistence.jdo</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/causeway/extensions/secman/persistence-jdo</git-plugin.propertiesDir>
-    </properties>
-
-    <dependencies>
-
-		<dependency>
-			<groupId>org.apache.causeway.extensions</groupId>
-			<artifactId>causeway-extensions-secman-integration</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.persistence</groupId>
-			<artifactId>causeway-persistence-jdo-datanucleus</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-fixtures-applib</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.core</groupId>
-			<artifactId>causeway-core-runtime</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.extensions</groupId>
-			<artifactId>causeway-extensions-secman-applib</artifactId>
-			<scope>test</scope>
-			<type>test-jar</type>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.causeway.testing</groupId>
-			<artifactId>causeway-testing-integtestsupport-applib</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-    </dependencies>
-
-</project>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/CausewayModuleExtSecmanPersistenceJdo.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/CausewayModuleExtSecmanPersistenceJdo.java
deleted file mode 100644
index 4a11044013c..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/CausewayModuleExtSecmanPersistenceJdo.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
-import org.apache.causeway.extensions.secman.jdo.permission.dom.ApplicationPermission;
-import org.apache.causeway.extensions.secman.jdo.permission.dom.ApplicationPermissionRepository;
-import org.apache.causeway.extensions.secman.jdo.role.dom.ApplicationRole;
-import org.apache.causeway.extensions.secman.jdo.role.dom.ApplicationRoleRepository;
-import org.apache.causeway.extensions.secman.jdo.tenancy.dom.ApplicationTenancy;
-import org.apache.causeway.extensions.secman.jdo.tenancy.dom.ApplicationTenancyRepository;
-import org.apache.causeway.extensions.secman.jdo.user.dom.ApplicationUser;
-import org.apache.causeway.extensions.secman.jdo.user.dom.ApplicationUserRepository;
-import org.apache.causeway.extensions.secman.jdo.util.RegexReplacer;
-import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
-        // Modules
-        CausewayModuleExtSecmanIntegration.class,
-        CausewayModulePersistenceJdoDatanucleus.class,
-
-        // services
-        ApplicationPermissionRepository.class,
-        ApplicationRoleRepository.class,
-        ApplicationTenancyRepository.class,
-        ApplicationUserRepository.class,
-        RegexReplacer.class,
-
-        // entities, eager meta-model inspection
-        ApplicationPermission.class,
-        ApplicationRole.class,
-        ApplicationTenancy.class,
-        ApplicationUser.class,
-
-})
-public class CausewayModuleExtSecmanPersistenceJdo {
-
-    /**
-     * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
-     * but is provided to allow manual teardown if required.
-     */
-    public FixtureScript teardownFixture() {
-        return new TeardownFixtureJdoAbstract() {
-            @Override
-            protected void execute(final ExecutionContext executionContext) {
-                deleteFrom(ApplicationPermission.class);
-                deleteFrom(ApplicationUser.class);
-                deleteFrom(ApplicationRole.class);
-                deleteFrom(ApplicationTenancy.class);
-            }
-        };
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/package.jdo~breaks-mvn-build b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/package.jdo~breaks-mvn-build
deleted file mode 100644
index 68e444b2ccb..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/package.jdo~breaks-mvn-build
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-	license agreements. See the NOTICE file distributed with this work for additional
-	information regarding copyright ownership. The ASF licenses this file to
-	you under the Apache License, Version 2.0 (the "License"); you may not use
-	this file except in compliance with the License. You may obtain a copy of
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-	by applicable law or agreed to in writing, software distributed under the
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-	OF ANY KIND, either express or implied. See the License for the specific
-	language governing permissions and limitations under the License. -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo http://xmlns.jcp.org/xml/ns/jdo/jdo_3_1.xsd"
-	version="3.1">
-
-	<!-- usually this file helps the DN Eclipse plugin finding the entities, that need enhancing -->
-	
-	<package name="org.apache.isis.extensions.secman.jdo.dom.permission">
-		<class name="ApplicationPermission"/>
-	</package>
-	
-	<package name="org.apache.isis.extensions.secman.jdo.dom.role">
-		<class name="ApplicationRole"/>
-	</package>
-	
-	<package name="org.apache.isis.extensions.secman.jdo.dom.tenancy">
-		<class name="ApplicationTenancy"/>
-	</package>
-	
-	<package name="org.apache.isis.extensions.secman.jdo.dom.user">
-		<class name="ApplicationUser"/>
-	</package>
-	
-
-</jdo>
-
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermission.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermission.java
deleted file mode 100644
index b1ea10d2aca..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermission.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.permission.dom;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-import javax.jdo.annotations.Unique;
-import javax.jdo.annotations.Uniques;
-import javax.jdo.annotations.Version;
-import javax.jdo.annotations.VersionStrategy;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.BookmarkPolicy;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.DomainObjectLayout;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission.Nq;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType = IdentityType.DATASTORE,
-        schema = ApplicationPermission.SCHEMA,
-        table = ApplicationPermission.TABLE)
-@Uniques({
-        @Unique(name = "ApplicationPermission__role_feature_rule__UNQ", members = { "role", "featureSort", "featureFqn", "rule" })
-})
-@Queries( {
-    @Query(
-            name = Nq.FIND_BY_ROLE,
-            value = "SELECT "
-                  + "  FROM " + ApplicationPermission.FQCN
-                  + " WHERE role == :role"),
-    @Query(
-            name = Nq.FIND_BY_USER,
-            value = "SELECT "
-                  + "  FROM " + ApplicationPermission.FQCN
-                  + " WHERE (u.roles.contains(role) && u.username == :username) "
-                  + " VARIABLES org.apache.causeway.extensions.secman.jdo.user.dom.ApplicationUser u"),
-    @Query(
-            name = Nq.FIND_BY_ROLE_NAMES,
-            value = "SELECT "
-                  + "  FROM " + ApplicationPermission.FQCN
-                  + " WHERE :roleNames.contains(role.name) "),
-    @Query(
-            name = Nq.FIND_BY_FEATURE,
-            value = "SELECT "
-                  + "  FROM " + ApplicationPermission.FQCN
-                  + " WHERE featureSort == :featureSort "
-                  + "    && featureFqn == :featureFqn"),
-    @Query(
-            name = Nq.FIND_BY_ROLE_RULE_FEATURE_FQN,
-            value = "SELECT "
-                  + "  FROM " + ApplicationPermission.FQCN
-                  + " WHERE role == :role "
-                  + "    && rule == :rule "
-                  + "    && featureSort == :featureSort "
-                  + "    && featureFqn == :featureFqn "),
-    @Query(
-            name = Nq.FIND_BY_ROLE_RULE_FEATURE,
-            value = "SELECT "
-                  + "  FROM " + ApplicationPermission.FQCN
-                  + " WHERE role == :role "
-                  + "    && rule == :rule "
-                  + "    && featureSort == :featureSort "),
-})
-@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.NATIVE, column = "id")
-@Version(strategy = VersionStrategy.VERSION_NUMBER, column = "version")
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@Named(ApplicationPermission.LOGICAL_TYPE_NAME)
-@DomainObject()
-@DomainObjectLayout(
-        bookmarking = BookmarkPolicy.AS_CHILD
-)
-public class ApplicationPermission
-    extends org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission {
-
-    protected final static String FQCN = "org.apache.causeway.extensions.secman.jdo.permission.dom.ApplicationPermission";
-
-    @Column(name = Role.NAME, allowsNull = Role.ALLOWS_NULL)
-    @Role
-    @Getter
-    private org.apache.causeway.extensions.secman.jdo.role.dom.ApplicationRole role;
-    @Override
-    public void setRole(final ApplicationRole role) {
-        this.role = _Casts.uncheckedCast(role);
-    }
-
-    @Column(allowsNull = Rule.ALLOWS_NULL)
-    @Rule
-    @Getter @Setter
-    private ApplicationPermissionRule rule;
-
-    @Column(allowsNull = Mode.ALLOWS_NULL)
-    @Mode
-    @Getter @Setter
-    private ApplicationPermissionMode mode;
-
-    @Column(allowsNull = FeatureSort.ALLOWS_NULL)
-    @FeatureSort
-    @Getter @Setter
-    private ApplicationFeatureSort featureSort;
-
-    @Column(allowsNull = FeatureFqn.ALLOWS_NULL)
-    @FeatureFqn
-    @Getter @Setter
-    private String featureFqn;
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java
deleted file mode 100644
index d804505236e..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.permission.dom;
-
-import jakarta.inject.Named;
-
-import org.springframework.stereotype.Repository;
-
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepositoryAbstract;
-
-@Repository
-@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationPermissionRepository")
-public class ApplicationPermissionRepository
-extends ApplicationPermissionRepositoryAbstract<ApplicationPermission> {
-
-    public ApplicationPermissionRepository() {
-        super(ApplicationPermission.class);
-    }
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRole.java
deleted file mode 100644
index 769b6991c1e..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRole.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.role.dom;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-import javax.jdo.annotations.Unique;
-import javax.jdo.annotations.Uniques;
-import javax.jdo.annotations.Version;
-import javax.jdo.annotations.VersionStrategy;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.BookmarkPolicy;
-import org.apache.causeway.applib.annotation.Bounding;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.DomainObjectLayout;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole.Nq;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType = IdentityType.DATASTORE,
-        schema = ApplicationRole.SCHEMA,
-        table = ApplicationRole.TABLE)
-@Uniques({
-    @Unique(name = "ApplicationRole__name__UNQ", members = { "name" })
-})
-@Queries({
-    @Query(
-            name = Nq.FIND_BY_NAME,
-            value = "SELECT "
-                  + "  FROM " + ApplicationRole.FQCN
-                  + " WHERE name == :name"),
-    @Query(
-            name = Nq.FIND_BY_NAME_CONTAINING,
-            value = "SELECT "
-                  + "  FROM " + ApplicationRole.FQCN
-                  + " WHERE name.matches(:regex) ")
-})
-@Inheritance(
-        strategy = InheritanceStrategy.NEW_TABLE)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.NATIVE, column = "id")
-@Version(strategy = VersionStrategy.VERSION_NUMBER, column = "version")
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@Named(ApplicationRole.LOGICAL_TYPE_NAME)
-@DomainObject(
-        bounding = Bounding.BOUNDED,
-        autoCompleteRepository = ApplicationRoleRepository.class,
-        autoCompleteMethod = "findMatching"
-        )
-@DomainObjectLayout(
-        bookmarking = BookmarkPolicy.AS_ROOT
-        )
-public class ApplicationRole
-    extends org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole {
-
-    protected final static String FQCN = "org.apache.causeway.extensions.secman.jdo.role.dom.ApplicationRole";
-
-    @Column(allowsNull = Name.ALLOWS_NULL, length = Name.MAX_LENGTH)
-    @Name
-    @Getter @Setter
-    private String name;
-
-    @Column(allowsNull = Description.ALLOWS_NULL, length = Description.MAX_LENGTH)
-    @Description
-    @Getter @Setter
-    private String description;
-
-    @Persistent(mappedBy = Users.MAPPED_BY)
-    @Users
-    private SortedSet<org.apache.causeway.extensions.secman.jdo.user.dom.ApplicationUser> users = new TreeSet<>();
-    @Override
-    public SortedSet<org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser> getUsers() {
-        return _Casts.uncheckedCast(users);
-    }
-    // necessary for integration tests
-    public void addToUsers(final org.apache.causeway.extensions.secman.jdo.user.dom.ApplicationUser applicationUser) {
-        getUsers().add(applicationUser);
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRoleRepository.java
deleted file mode 100644
index 42236a1fda0..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/role/dom/ApplicationRoleRepository.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.role.dom;
-
-import jakarta.inject.Named;
-
-import org.springframework.stereotype.Repository;
-
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepositoryAbstract;
-
-@Repository
-@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationRoleRepository")
-public class ApplicationRoleRepository
-extends ApplicationRoleRepositoryAbstract<ApplicationRole> {
-
-    public ApplicationRoleRepository() {
-        super(ApplicationRole.class);
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
deleted file mode 100644
index 5e457475968..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.tenancy.dom;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.PrimaryKey;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-import javax.jdo.annotations.Unique;
-import javax.jdo.annotations.Uniques;
-import javax.jdo.annotations.Version;
-import javax.jdo.annotations.VersionStrategy;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.BookmarkPolicy;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.DomainObjectLayout;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy.Nq;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType = IdentityType.APPLICATION,
-        schema = ApplicationTenancy.SCHEMA,
-        table = ApplicationTenancy.TABLE)
-@Uniques({
-    @Unique(name = "ApplicationTenancy__name__UNQ", members = { "name" })
-})
-@Queries( {
-    @Query(
-            name = Nq.FIND_BY_PATH,
-            value = "SELECT "
-                  + "  FROM " + ApplicationTenancy.FQCN
-                  + " WHERE path == :path"),
-    @Query(
-            name = Nq.FIND_BY_NAME,
-            value = "SELECT "
-                  + "  FROM " + ApplicationTenancy.FQCN
-                  + " WHERE name == :name"),
-    @Query(
-            name = Nq.FIND_BY_NAME_OR_PATH_MATCHING,
-            value = "SELECT "
-                  + "  FROM " + ApplicationTenancy.FQCN
-                  + " WHERE name.matches(:regex) "
-                  + "    || path.matches(:regex) ")
-})
-@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.NATIVE, column = "id")
-@Version(strategy = VersionStrategy.VERSION_NUMBER, column = "version")
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@Named(ApplicationTenancy.LOGICAL_TYPE_NAME)
-@DomainObject(
-        autoCompleteRepository = ApplicationTenancyRepository.class,
-        autoCompleteMethod = "findMatching"
-)
-@DomainObjectLayout(
-        bookmarking = BookmarkPolicy.AS_ROOT
-        )
-public class ApplicationTenancy
-    extends org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy {
-
-    protected final static String FQCN = "org.apache.causeway.extensions.secman.jdo.tenancy.dom.ApplicationTenancy";
-
-    @Column(allowsNull = Name.ALLOWS_NULL, length = Name.MAX_LENGTH)
-    @Name
-    @Getter @Setter
-    private String name;
-
-    @PrimaryKey
-    @Column(allowsNull = Path.ALLOWS_NULL, length = Path.MAX_LENGTH)
-    @Path
-    @Getter @Setter
-    private String path;
-
-    @Column(name = Parent.NAME, allowsNull = Parent.ALLOWS_NULL)
-    @Parent
-    @Getter
-    private ApplicationTenancy parent;
-    @Override
-    public void setParent(org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy parent) {
-        this.parent = _Casts.uncheckedCast(parent);
-    }
-
-    @Persistent(mappedBy = Children.MAPPED_BY)
-    @Children
-    private SortedSet<ApplicationTenancy> children = new TreeSet<>();
-    @Override
-    public SortedSet<org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy> getChildren() {
-        return _Casts.uncheckedCast(children);
-    }
-    public void setChildren(final SortedSet<org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy> children) {
-        this.children = _Casts.uncheckedCast(children);
-    }
-    // necessary for integration tests
-    public void removeFromChildren(final org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy applicationTenancy) {
-        getChildren().remove(applicationTenancy);
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java
deleted file mode 100644
index 329c2f05e8e..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.tenancy.dom;
-
-import jakarta.inject.Named;
-
-import org.springframework.stereotype.Repository;
-
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancyRepositoryAbstract;
-
-@Repository
-@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationTenancyRepository")
-public class ApplicationTenancyRepository
-extends ApplicationTenancyRepositoryAbstract<ApplicationTenancy> {
-
-    public ApplicationTenancyRepository() {
-        super(ApplicationTenancy.class);
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUser.java
deleted file mode 100644
index 80b2d4211f0..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUser.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.user.dom;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.Element;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-import javax.jdo.annotations.Join;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-import javax.jdo.annotations.Unique;
-import javax.jdo.annotations.Uniques;
-import javax.jdo.annotations.Version;
-import javax.jdo.annotations.VersionStrategy;
-
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.causeway.applib.annotation.BookmarkPolicy;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.DomainObjectLayout;
-import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.commons.internal.base._Casts;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser.Nq;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType = IdentityType.DATASTORE,
-        schema = ApplicationUser.SCHEMA,
-        table = ApplicationUser.TABLE)
-@Uniques({
-    @Unique(name = "ApplicationUser__username__UNQ", members = { "username" })})
-@Queries( {
-    @Query(
-            name = Nq.FIND_BY_USERNAME,
-            value = "SELECT "
-                  + "  FROM " + ApplicationUser.FQCN
-                  + " WHERE username == :username"),
-    @Query(
-            name = Nq.FIND_BY_EMAIL_ADDRESS,
-            value = "SELECT "
-                  + "  FROM " + ApplicationUser.FQCN
-                  + " WHERE emailAddress == :emailAddress"),
-    @Query(
-            name = Nq.FIND_BY_ATPATH,
-            value = "SELECT "
-                  + "  FROM " + ApplicationUser.FQCN
-                  + " WHERE atPath == :atPath"),
-    @Query(
-            name = Nq.FIND,
-            value = "SELECT "
-                  + "  FROM " + ApplicationUser.FQCN
-                  + " WHERE username.matches(:regex)"
-                  + "    || familyName.matches(:regex)"
-                  + "    || givenName.matches(:regex)"
-                  + "    || knownAs.matches(:regex)"
-                  + "    || emailAddress.matches(:regex)")
-})
-@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-@DatastoreIdentity(strategy = IdGeneratorStrategy.NATIVE, column = "id")
-@Version(strategy = VersionStrategy.VERSION_NUMBER, column = "version")
-@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@Named(ApplicationUser.LOGICAL_TYPE_NAME)
-@DomainObject(
-        autoCompleteRepository = ApplicationUserRepository.class,
-        autoCompleteMethod = "findMatching"
-        )
-@DomainObjectLayout(
-        bookmarking = BookmarkPolicy.AS_ROOT
-        )
-public class ApplicationUser
-    extends org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser {
-
-    protected final static String FQCN = "org.apache.causeway.extensions.secman.jdo.user.dom.ApplicationUser";
-
-    @Column(allowsNull = Username.ALLOWS_NULL, length = Username.MAX_LENGTH)
-    @Username
-    @Getter @Setter
-    private String username;
-
-    @Column(allowsNull = FamilyName.ALLOWS_NULL, length = FamilyName.MAX_LENGTH)
-    @FamilyName
-    @Getter @Setter
-    private String familyName;
-
-    @Column(allowsNull = GivenName.ALLOWS_NULL, length = GivenName.MAX_LENGTH)
-    @GivenName
-    @Getter @Setter
-    private String givenName;
-
-    @Column(allowsNull = KnownAs.ALLOWS_NULL, length = KnownAs.MAX_LENGTH)
-    @KnownAs
-    @Getter @Setter
-    private String knownAs;
-
-    @Column(allowsNull = EmailAddress.ALLOWS_NULL, length = EmailAddress.MAX_LENGTH)
-    @EmailAddress
-    @Getter @Setter
-    private String emailAddress;
-
-    @Column(allowsNull = PhoneNumber.ALLOWS_NULL, length = PhoneNumber.MAX_LENGTH)
-    @PhoneNumber
-    @Getter @Setter
-    private String phoneNumber;
-
-    @Column(allowsNull = FaxNumber.ALLOWS_NULL, length = FaxNumber.MAX_LENGTH)
-    @FaxNumber
-    @Getter @Setter
-    private String faxNumber;
-
-    @Column(allowsNull = Language.ALLOWS_NULL)
-    @Language
-    @Getter @Setter
-    private java.util.Locale language;
-
-    @Column(allowsNull = NumberFormat.ALLOWS_NULL)
-    @NumberFormat
-    @Getter @Setter
-    private java.util.Locale numberFormat;
-
-    @Column(allowsNull = TimeFormat.ALLOWS_NULL)
-    @TimeFormat
-    @Getter @Setter
-    private java.util.Locale timeFormat;
-
-    @Column(allowsNull = AtPath.ALLOWS_NULL, length = AtPath.MAX_LENGTH)
-    @AtPath
-    @Getter @Setter
-    private String atPath;
-
-    @Column(allowsNull = AccountType.ALLOWS_NULL)
-    @AccountType
-    @Getter
-    private org.apache.causeway.extensions.secman.applib.user.dom.AccountType accountType;
-    @Override
-    public void setAccountType(final org.apache.causeway.extensions.secman.applib.user.dom.AccountType accountType) {
-        this.accountType = accountType;
-    }
-
-    @Column(allowsNull = Status.ALLOWS_NULL)
-    @Status
-    @Getter @Setter
-    private ApplicationUserStatus status;
-
-    @Column(allowsNull = EncryptedPassword.ALLOWS_NULL, length = EncryptedPassword.MAX_LENGTH)
-    @EncryptedPassword
-    @Getter @Setter
-    private String encryptedPassword;
-
-    // ROLES
-
-    @Persistent(table = Roles.Persistence.TABLE)
-    @Join(column = Roles.Persistence.JOIN_COLUMN)
-    @Element(column = Roles.Persistence.INVERSE_JOIN_COLUMN)
-    @Roles
-    private SortedSet<org.apache.causeway.extensions.secman.jdo.role.dom.ApplicationRole> roles = new TreeSet<>();
-    @Override
-    public SortedSet<org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole> getRoles() {
-        return _Casts.uncheckedCast(roles);
-    }
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUserRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUserRepository.java
deleted file mode 100644
index f60380ae9aa..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/user/dom/ApplicationUserRepository.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.user.dom;
-
-import jakarta.inject.Named;
-
-import org.springframework.stereotype.Repository;
-
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepositoryAbstract;
-
-@Repository
-@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationUserRepository")
-public class ApplicationUserRepository
-extends ApplicationUserRepositoryAbstract<ApplicationUser> {
-
-    public ApplicationUserRepository() {
-        super(ApplicationUser.class);
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/util/RegexReplacer.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/util/RegexReplacer.java
deleted file mode 100644
index b871aa38552..00000000000
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/causeway/extensions/secman/jdo/util/RegexReplacer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.util;
-
-import jakarta.inject.Named;
-
-import org.springframework.stereotype.Component;
-
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
-
-@Component
-@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".RegexReplacer")
-public class RegexReplacer implements org.apache.causeway.extensions.secman.applib.util.RegexReplacer {
-
-    @Override
-    public String asRegex(String str) {
-        var search = _Strings.nullToEmpty(str).replace("*", ".*").replace("?", ".");
-        return String.format("(?i).*%s.*", search);
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
deleted file mode 100644
index 6e006bbfa5d..00000000000
--- a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.secman.jdo.permission.dom;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-import org.springframework.test.context.ActiveProfiles;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.secman.applib.ApplicationPermissionRepositoryIntegTestAbstract;
-import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
-import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-
-@SpringBootTest(
-        classes = ApplicationPermissionRepository_IntegTest.AppManifest.class
-)
-@ActiveProfiles("test")
-class ApplicationPermissionRepository_IntegTest extends ApplicationPermissionRepositoryIntegTestAbstract {
-
-    @SpringBootConfiguration
-    @EnableAutoConfiguration
-    @Import({
-            CausewayModuleCoreRuntimeServices.class,
-            CausewayModuleSecurityBypass.class,
-            CausewayModuleExtSecmanPersistenceJdo.class,
-
-            MmmModule.class,
-    })
-    @PropertySources({
-            @PropertySource(CausewayPresets.UseLog4j2Test),
-    })
-    public static class AppManifest {
-    }
-
-}
diff --git a/extensions/security/secman/persistence-jdo/src/test/resources/application-test.yml b/extensions/security/secman/persistence-jdo/src/test/resources/application-test.yml
deleted file mode 100644
index 4f8150ef96a..00000000000
--- a/extensions/security/secman/persistence-jdo/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-causeway:
-  extensions:
-    secman:
-      seed:
-        admin:
-          user-name: "sven"
-          password: "pass"
-          role-name: "causeway-ext-secman-admin"
-          namespace-permissions:
-            sticky: "causeway"
-            additional: "mmm"
-        regular-user:
-          role-name: "causeway-ext-secman-user"
-      permissionsEvaluationPolicy: "ALLOW_BEATS_VETO"
-
-
-  persistence:
-    schema:
-      auto-create-schemas: "CAUSEWAYEXTSECMAN"
-
-
-spring:
-  jpa:
-    show-sql: true
-
-
-datanucleus:
-  schema:
-    autoCreateTables: true
diff --git a/extensions/security/secman/persistence-jpa/pom.xml b/extensions/security/secman/persistence-jpa/pom.xml
index 1a52f73f310..23c4a845096 100644
--- a/extensions/security/secman/persistence-jpa/pom.xml
+++ b/extensions/security/secman/persistence-jpa/pom.xml
@@ -58,13 +58,6 @@
 		<dependency>
 			<groupId>org.apache.causeway.testing</groupId>
 			<artifactId>causeway-testing-fixtures-applib</artifactId>
-			<exclusions>
-				<!-- exclusion not strictly required, but helps keep JPA and JDO implementations separated -->
-				<exclusion>
-					<groupId>org.apache.causeway.persistence</groupId>
-					<artifactId>causeway-persistence-jdo-applib</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/extensions/security/secman/pom.xml b/extensions/security/secman/pom.xml
index 84153afa8ee..659e5514596 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -67,11 +67,6 @@
                 <artifactId>causeway-extensions-secman-encryption-spring</artifactId>
                 <version>3.0.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-secman-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.causeway.extensions</groupId>
                 <artifactId>causeway-extensions-secman-persistence-jpa</artifactId>
@@ -118,7 +113,6 @@
     	<module>integration</module>
     	<module>encryption-jbcrypt</module>
     	<module>encryption-spring</module>
-    	<module>persistence-jdo</module>
     	<module>persistence-jpa</module>
     	<module>delegated-springoauth2</module>
     </modules>
diff --git a/extensions/security/sessionlog/persistence-jdo/log4j2-test.xml b/extensions/security/sessionlog/persistence-jdo/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Configuration status="WARN">
-	<Properties>
-		<Property name="PID">????</Property>
-		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
-		<Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-		<Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-		<Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-	</Properties>
-	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-		</Console>
-	</Appenders>
-	<Loggers>
-		<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-		<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-		<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-		<logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-		<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-		<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-		<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-		<logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-		
-		<logger name="org.apache.directory" level="warn"/>
-		<logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-		
-		<logger name="DataNucleus.Persistence" level="info"/>
-		<logger name="DataNucleus.Transaction" level="info"/>
-		<logger name="DataNucleus.Datastore.Schema" level="info"/>
-		<logger name="DataNucleus.Datastore.Native" level="info"/>
-		
-		<Root level="info">
-			<AppenderRef ref="Console" />
-		</Root>
-	</Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/security/sessionlog/persistence-jdo/logging-dn-enhance.properties b/extensions/security/sessionlog/persistence-jdo/logging-dn-enhance.properties
deleted file mode 100644
index ca165acc786..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/logging-dn-enhance.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#         http://www.apache.org/licenses/LICENSE-2.0
-#         
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/extensions/security/sessionlog/persistence-jdo/pom.xml b/extensions/security/sessionlog/persistence-jdo/pom.xml
deleted file mode 100644
index c5a4c1a48fb..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.causeway.extensions</groupId>
-        <artifactId>causeway-extensions-sessionlog</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>causeway-extensions-sessionlog-persistence-jdo</artifactId>
-    <name>Apache Causeway Ext - Session Log Persistence (using JDO)</name>
-
-    <properties>
-        <jar-plugin.automaticModuleName>org.apache.causeway.extensions.sessionlog.persistence.jdo</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/causeway/extensions/sessionlog/persistence-jdo</git-plugin.propertiesDir>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.causeway.extensions</groupId>
-            <artifactId>causeway-extensions-sessionlog-applib</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.persistence</groupId>
-            <artifactId>causeway-persistence-jdo-datanucleus</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.testing</groupId>
-            <artifactId>causeway-testing-fixtures-applib</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.core</groupId>
-            <artifactId>causeway-core-runtime</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.extensions</groupId>
-            <artifactId>causeway-extensions-sessionlog-applib</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.causeway.testing</groupId>
-            <artifactId>causeway-testing-integtestsupport-applib</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/CausewayModuleExtSessionLogPersistenceJdo.java b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/CausewayModuleExtSessionLogPersistenceJdo.java
deleted file mode 100644
index 1032072c472..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/CausewayModuleExtSessionLogPersistenceJdo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.sessionlog.jdo;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.causeway.extensions.sessionlog.applib.CausewayModuleExtSessionLogApplib;
-import org.apache.causeway.extensions.sessionlog.jdo.dom.SessionLogEntry;
-import org.apache.causeway.extensions.sessionlog.jdo.dom.SessionLogEntryRepository;
-import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
-import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
-import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
-
-@Configuration
-@Import({
-        // modules
-        CausewayModuleTestingFixturesApplib.class,
-        CausewayModuleExtSessionLogApplib.class,
-        CausewayModulePersistenceJdoDatanucleus.class,
-
-        // services
-        SessionLogEntryRepository.class,
-
-        // entities, eager meta-model introspection
-        SessionLogEntry.class,
-})
-public class CausewayModuleExtSessionLogPersistenceJdo {
-
-    /**
-     * Note that this is <i>NOT</i> an implementation of the {@link ModuleWithFixtures#getTeardownFixture()} API;
-     * but is provided to allow manual teardown if required.
-     */
-    public FixtureScript teardownFixture() {
-        return new TeardownFixtureJdoAbstract() {
-            @Override
-            protected void execute(final ExecutionContext executionContext) {
-                deleteFrom(SessionLogEntry.class);
-            }
-        };
-    }
-
-}
diff --git a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/dom/SessionLogEntry.java b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/dom/SessionLogEntry.java
deleted file mode 100644
index 4916523b142..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/dom/SessionLogEntry.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.sessionlog.jdo.dom;
-
-import java.sql.Timestamp;
-import java.util.UUID;
-
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.PrimaryKey;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-
-import jakarta.inject.Named;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
-import org.apache.causeway.applib.services.session.SessionSubscriber;
-import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntry.Nq;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@PersistenceCapable(
-        identityType=IdentityType.APPLICATION,
-        schema = SessionLogEntry.SCHEMA,
-        table = SessionLogEntry.TABLE)
-@Queries( {
-        @Query(
-                name  = Nq.FIND_BY_SESSION_GUID,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE sessionGuid == :sessionGuid"),
-        @Query(
-                name  = Nq.FIND_BY_HTTP_SESSION_ID,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE httpSessionId == :httpSessionId"),
-        @Query(
-                name  = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_BETWEEN,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + "WHERE username == :username "
-                      + "&& loginTimestamp >= :from "
-                      + "&& logoutTimestamp <= :to "
-                      + "ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_AFTER,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE username == :username "
-                      + "    && loginTimestamp >= :from "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_BEFORE,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE username == :username "
-                      + "    && loginTimestamp <= :from "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_USERNAME,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE username == :username "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_TIMESTAMP_BETWEEN,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE loginTimestamp >= :from "
-                      + "    && logoutTimestamp <= :to "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_TIMESTAMP_AFTER,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE loginTimestamp >= :from "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_TIMESTAMP_BEFORE,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE loginTimestamp <= :to "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_STRICTLY_BEFORE,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE username == :username "
-                      + "    && loginTimestamp < :from "
-                      + " ORDER BY loginTimestamp DESC"),
-        @Query(
-                name  = Nq.FIND_BY_USERNAME_AND_TIMESTAMP_STRICTLY_AFTER,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE username == :username "
-                      + "    && loginTimestamp > :from "
-                      + " ORDER BY loginTimestamp ASC"),
-        @Query(
-                name  = Nq.FIND_ACTIVE_SESSIONS,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE logoutTimestamp == null "
-                      + " ORDER BY loginTimestamp ASC"),
-        @Query(
-                name  = Nq.FIND_RECENT_BY_USERNAME,
-                value = "SELECT "
-                      + "  FROM " + SessionLogEntry.FQCN + " "
-                      + " WHERE username == :username "
-                      + " ORDER BY loginTimestamp DESC "
-                      + " RANGE 0,10")
-})
-@Named(SessionLogEntry.LOGICAL_TYPE_NAME)
-@DomainObject(
-        editing = Editing.DISABLED
-)
-public class SessionLogEntry extends org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntry {
-
-    public static final String FQCN = "org.apache.causeway.extensions.sessionlog.jdo.dom.SessionLogEntry";
-
-    public SessionLogEntry(
-            final UUID sessionGuid,
-            final String httpSessionId,
-            final String username,
-            final SessionSubscriber.CausedBy causedBy,
-            final Timestamp loginTimestamp) {
-        super(sessionGuid, httpSessionId, username, causedBy, loginTimestamp);
-    }
-
-    public SessionLogEntry() {
-        super(null, null, null, null, null);
-    }
-
-    @PrimaryKey
-    @Column(allowsNull = SessionGuid.ALLOWS_NULL, length = SessionGuid.MAX_LENGTH)
-    @SessionGuid
-    @Getter @Setter
-    private UUID sessionGuid;
-
-    @Column(allowsNull = HttpSessionId.ALLOWS_NULL, length = HttpSessionId.MAX_LENGTH)
-    @HttpSessionId
-    @Getter @Setter
-    private String httpSessionId;
-
-    @Column(allowsNull = Username.ALLOWS_NULL, length = Username.MAX_LENGTH)
-    @Username
-    @Getter @Setter
-    private String username;
-
-    @Column(allowsNull = LoginTimestamp.ALLOWS_NULL)
-    @LoginTimestamp
-    @Getter @Setter
-    private Timestamp loginTimestamp;
-
-    @Column(allowsNull = LogoutTimestamp.ALLOWS_NULL)
-    @LogoutTimestamp
-    @Getter @Setter
-    private Timestamp logoutTimestamp;
-
-    @Column(allowsNull = CausedBy.ALLOWS_NULL)
-    @CausedBy
-    @Getter @Setter
-    private SessionSubscriber.CausedBy causedBy;
-
-}
diff --git a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/dom/SessionLogEntryRepository.java b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/dom/SessionLogEntryRepository.java
deleted file mode 100644
index c6aec5f446e..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/sessionlog/jdo/dom/SessionLogEntryRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.causeway.extensions.sessionlog.jdo.dom;
-
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntryRepositoryAbstract;
-
-@Service
-public class SessionLogEntryRepository extends SessionLogEntryRepositoryAbstract<SessionLogEntry> {
-
-    public SessionLogEntryRepository() {
-        super(SessionLogEntry.class);
-    }
-}
diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
deleted file mode 100644
index 08877a32a74..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.extensions.sessionlog.jdo.integtests;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-import org.springframework.test.context.ActiveProfiles;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
-import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
-import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-
-@SpringBootTest(
-        classes = SessionLog_IntegTest.AppManifest.class
-)
-@ActiveProfiles("test")
-public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
-
-    @SpringBootConfiguration
-    @EnableAutoConfiguration
-    @Import({
-            CausewayModuleCoreRuntimeServices.class,
-            CausewayModuleSecurityBypass.class,
-            CausewayModuleExtSessionLogPersistenceJdo.class,
-    })
-    @PropertySources({
-            @PropertySource(CausewayPresets.UseLog4j2Test),
-    })
-    public static class AppManifest {
-    }
-
-}
diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/resources/application-test.yml b/extensions/security/sessionlog/persistence-jdo/src/test/resources/application-test.yml
deleted file mode 100644
index 6147d87615f..00000000000
--- a/extensions/security/sessionlog/persistence-jdo/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-causeway:
-  persistence:
-    schema:
-      auto-create-schemas: "CAUSEWAYEXTSESSIONLOG"
-
-
-datanucleus:
-  schema:
-    generate-database:
-      mode: "create"
diff --git a/extensions/security/sessionlog/persistence-jpa/pom.xml b/extensions/security/sessionlog/persistence-jpa/pom.xml
index 4e3d4a4acab..d6318cd8723 100644
--- a/extensions/security/sessionlog/persistence-jpa/pom.xml
+++ b/extensions/security/sessionlog/persistence-jpa/pom.xml
@@ -50,12 +50,6 @@
         <dependency>
             <groupId>org.apache.causeway.testing</groupId>
             <artifactId>causeway-testing-fixtures-applib</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.causeway.persistence</groupId>
-                    <artifactId>causeway-persistence-jdo-applib</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/extensions/security/sessionlog/pom.xml b/extensions/security/sessionlog/pom.xml
index 29623323265..6e47f4e655e 100644
--- a/extensions/security/sessionlog/pom.xml
+++ b/extensions/security/sessionlog/pom.xml
@@ -57,11 +57,6 @@
                 <artifactId>causeway-extensions-sessionlog-persistence-jpa</artifactId>
                 <version>3.0.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.causeway.extensions</groupId>
-                <artifactId>causeway-extensions-sessionlog-persistence-jdo</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.apache.causeway.testing</groupId>
@@ -85,7 +80,6 @@
 
     <modules>
     	<module>applib</module>
-    	<module>persistence-jdo</module>
     	<module>persistence-jpa</module>
     </modules>
 </project>
diff --git a/extensions/vw/pdfjs/fixtures/logging-dn-enhance.properties b/extensions/vw/pdfjs/fixtures/logging-dn-enhance.properties
deleted file mode 100644
index dc4d31c11d9..00000000000
--- a/extensions/vw/pdfjs/fixtures/logging-dn-enhance.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/extensions/vw/pdfjs/fixtures/pom.xml b/extensions/vw/pdfjs/fixtures/pom.xml
index f0e2119021f..c83a32b8fdd 100644
--- a/extensions/vw/pdfjs/fixtures/pom.xml
+++ b/extensions/vw/pdfjs/fixtures/pom.xml
@@ -41,7 +41,6 @@ under the License.
             <artifactId>hsqldb</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>org.togglz</groupId>
             <artifactId>togglz-core</artifactId>
diff --git a/extensions/vw/pdfjs/fixtures/src/main/java/org/causewayaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/causewayaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
index 8c612a3a4d3..a5fc5b857f3 100644
--- a/extensions/vw/pdfjs/fixtures/src/main/java/org/causewayaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
+++ b/extensions/vw/pdfjs/fixtures/src/main/java/org/causewayaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
@@ -63,7 +63,7 @@ public class PdfJsDemoObjectWithBlob implements Comparable<PdfJsDemoObjectWithBl
     public static class CssClassUiEvent
             extends org.apache.causeway.applib.services.eventbus.CssClassUiEvent<PdfJsDemoObjectWithBlob> {}
 
-    @javax.jdo.annotations.Column(allowsNull="false")
+    @javax.jdo.annotations.Column(nullable=false)
     @Title(sequence="1")
     @Property(editing = Editing.ENABLED)
     @Getter @Setter
diff --git a/persistence/jdo/adoc/antora.yml b/persistence/jdo/adoc/antora.yml
deleted file mode 100644
index f58f7ffb16b..00000000000
--- a/persistence/jdo/adoc/antora.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-name: pjdo
-title: "JDO/DataNucleus"
-version: latest
-start_page: ROOT:about.adoc
-nav:
-  - modules/ROOT/nav.adoc
diff --git a/persistence/jdo/adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png b/persistence/jdo/adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
deleted file mode 100644
index b30741fcbab..00000000000
Binary files a/persistence/jdo/adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png and /dev/null differ
diff --git a/persistence/jdo/adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png b/persistence/jdo/adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
deleted file mode 100644
index 67744c9ab38..00000000000
Binary files a/persistence/jdo/adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png and /dev/null differ
diff --git a/persistence/jdo/adoc/modules/ROOT/nav.adoc b/persistence/jdo/adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index 4c4e42b8f76..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-include::pjdo:ROOT:partial$component-nav.adoc[]
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/about.adoc b/persistence/jdo/adoc/modules/ROOT/pages/about.adoc
deleted file mode 100644
index c4bc1127866..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/about.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= JDO (DataNucleus)
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-The JDO/DataNucleus object store enables domain objects to be persisted to relational as well as NoSQL databases.
-The object store is implemented using link:http://datanucleus.org[DataNucleus] ORM using the link:https://www.jcp.org/en/jsr/detail?id=243[JDO] API.
-DataNucleus is the reference implementation for JDO.
-
-This component guide discuss how to setup the framework to use the JDO/DataNucleus object store, how to configure the ORM, and also provides some examples on common use cases.
-
-
-
-
-
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc b/persistence/jdo/adoc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
deleted file mode 100644
index c07f6e61b8d..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
+++ /dev/null
@@ -1,91 +0,0 @@
-[[disabling-persistence-by-reachability]]
-= Persistence by Reachability
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-By default, JDO/DataNucleus supports the concept of link:http://www.datanucleus.org/products/datanucleus/jdo/persistence.html#persistence_by_reachability[persistence-by-reachability].
-That is, if a non-persistent entity is associated with an already-persistent entity, then DataNucleus will detect this and will automatically persist the associated object.
-Put another way: there is no need to call Apache Causeway' `RepositoryService#persist(.)` or `RepositoryService#persistAndFlush(.)` methods.
-
-However, convenient though this feature is, you may find that it causes performance issues.
-
-[WARNING]
-====
-DataNucleus' persistence-by-reachability may cause performance issues.
-We strongly recommend that you disable it.
-====
-
-One scenario in particular where this performance issues can arise is if your entities implement the `java.lang.Comparable` interface, and you have used Apache Causeway' xref:refguide:applib:index/util/ObjectContracts.adoc[ObjectContracts] utility class.
-The issue here is that `ObjectContracts` implementation can cause DataNucleus to recursively rehydrate a larger number of associated entities.
-(More detail below).
-
-We therefore recommend that you disable persistence-by-reachability by adding the following to `application.properties`:
-
-[source,ini]
-----
-datanucleus.persistenceByReachabilityAtCommit=false
-----
-
-This change has been made to both the xref:docs:starters:helloworld.adoc[HelloWorld] and xref:docs:starters:simpleapp.adoc[SimpleApp] starter apps.
-
-If you do disable this feature, then you will (of course) need to ensure that you explicitly persist all entities using the `RepositoryService#persist(.)` or `RepositoryService#persistAndFlush(.)` methods.
-
-
-== The issue in more detail
-
-Consider these entities (http://yuml.me/edit/b8681268[yuml.me/b8681268]):
-
-image::runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png[width="750px"]
-
-
-
-In the course of a transaction, the `Agreement` entity is loaded into memory (not necessarily modified), and then new ``AgreementRole``s are associated to it.
-
-All these entities implement `Comparable` using `ObjectContracts`, and the implementation of ``AgreementRole``'s (simplified) is:
-
-[source,java]
-----
-public class AgreementRole {
-    ...
-    public int compareTo(AgreementRole other) {
-        return ObjectContracts.compareTo(this, other, "agreement","startDate","party");
-    }
-}
-----
-
-while ``Agreement``'s is implemented as:
-
-[source,java]
-----
-public class Agreement {
-    ...
-    public int compareTo(Agreement other) {
-        return ObjectContracts.compareTo(this, other, "reference");
-    }
-}
-----
-
-and ``Party``'s is similarly implemented as:
-
-[source,java]
-----
-public class Party {
-    ...
-    public int compareTo(Party other) {
-        return ObjectContracts.compareTo(this, other, "reference");
-    }
-}
-----
-
-DataNucleus's persistence-by-reachability algorithm adds the `AgreementRole` instances into a `SortedSet`, which causes `AgreementRole#compareTo()` to fire:
-
-* the evaluation of the "agreement" property delegates back to the `Agreement`, whose own `Agreement#compareTo()` uses the scalar `reference` property.
-As the `Agreement` is already in-memory, this does not trigger any further database queries
-
-* the evaluation of the "startDate" property is just a scalar property of the `AgreementRole`, so will already in-memory
-
-* the evaluation of the "party" property delegates back to the `Party`, whose own `Party#compareTo()` requires the uses the scalar `reference` property.
-However, since the `Party` is not yet in-memory, using the `reference` property triggers a database query to "rehydrate" the `Party` instance.
-
-In other words, in figuring out whether `AgreementRole` requires the persistence-by-reachability algorithm to run, it causes the adjacent associated entity `Party` to also be retrieved.
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
deleted file mode 100644
index 1750d5bf9ed..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
+++ /dev/null
@@ -1,47 +0,0 @@
-[[db-schemas]]
-= Database Schemas
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-In the same way that Java packages act as a namespace for domain objects, it's good practice to map domain entities to their own (database) schemas.
-(For more on database schemas, see for example link:https://crate.io/docs/sql-99/en/latest/chapters/17.html#create-schema-statement[here]).
-
-We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[object type] also follows the same pattern.
-
-For example, xref:security:secman:about.adoc[SecMan]' JDO implementation resides in the `CausewayModuleExtSecmanPersistenceJpa` module.
-Its `ApplicationUser` entity is defined as:
-
-[source,java]
-.ApplicationUser.java
-----
-import javax.jdo.annotations.PersistenceCapable;
-
-@PersistenceCapable(
-        schema = "causewayExtSecman",
-        table = "ApplicationUser",
-        ...
-)
-public class ApplicationUser ... { /* ... */ }
-----
-
-which results in a `CREATE TABLE` statement of:
-
-[source,sql]
-----
-CREATE TABLE causewayExtSecman."ApplicationUser" (
-    ...
-)
-----
-
-
-
-[TIP]
-====
-If for some reason you don't want to use schemas (though we strongly recommend that you do), then note that you can override the `@PersistenceCapable` annotation by providing XML metadata (the `mappings.jdo` file).
-See the section on xref:pjdo:ROOT:setup-and-configuration.adoc[configuring DataNucleus Overriding Annotations] for more details.
-====
-
-
-include::refguide:config:partial$configuring-schemas.adoc[leveloffset=+1]
-
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/dependency-injection.adoc b/persistence/jdo/adoc/modules/ROOT/pages/dependency-injection.adoc
deleted file mode 100644
index a2689eb9ba2..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/dependency-injection.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-= Dependency Injection
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-With Apache Causeway it's common to inject domain services into domain entities; this allows behaviour to be pushed down into those entities.
-
-For JDO, both field injection and setter injection is performed automatically:
-
-[source,java]
-.Customer.java
-----
-import javax.inject.Inject;
-
-// ...
-public class Customer {
-
-    // ...
-    @Import OrderRepository orderRepository;
-}
-----
-
-However, constructor injection is _not_ supported.
-
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/enhancer.adoc b/persistence/jdo/adoc/modules/ROOT/pages/enhancer.adoc
deleted file mode 100644
index dcf2a716a9d..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/enhancer.adoc
+++ /dev/null
@@ -1,36 +0,0 @@
-= Enhancer (DataNucleus)
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-A responsibility of all ORMs is lazy loading of related objects (so as not to load all the data in one go), and tracking of objects as they are modified (to flush back to the database).
-
-With JDO, this is accomplished by post-processing -- or _enhancing_ -- the compiled bytecode.
-
-This is typically performed using the `datanucleus:enhance` Maven plugin.
-This is defined as the `causeway-app-starter-datanucleusenhance` profile in the xref:docs:parent-pom:about.adoc[Parent POM], and is activated by the presence of the `logging-dn-enhance.properties` file.
-
-[source,xml]
-.App Starter Parent POM (pom.xml)
-----
-<profile>
-  <id>causeway-app-starter-datanucleusenhance</id>
-  <activation>
-    <file>
-	  <exists>${basedir}/logging-dn-enhance.properties</exists>
-    </file>
-  </activation>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.datanucleus</groupId>
-        <artifactId>datanucleus-maven-plugin</artifactId>
-        ..
-      </plugin>
-    </plugins>
-  </build>
-<profile>
-----
-
-Some IDEs (notably Eclipse) provide plugins to run the enhancer as part of their compile process.
-See xref:setupguide:ROOT:about.adoc[setup guides] for more details.
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips.adoc b/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips.adoc
deleted file mode 100644
index 545423e4f1f..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-[[hints-and-tips]]
-= Hints and Tips
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-This page provides some solutions for problems we've encountered ourselves or have been raised on the Apache Causeway mailing lists.
-
-include::partial$hints-and-tips/tracing-sql-statements.adoc[leveloffset=+1]
-include::partial$hints-and-tips/overriding-jdo-annotations.adoc[leveloffset=+1]
-include::partial$hints-and-tips/subtype-entity-not-fully-populated.adoc[leveloffset=+1]
-include::partial$hints-and-tips/diagnosing-n-plus-1.adoc[leveloffset=+1]
-include::partial$hints-and-tips/typesafe-queries-and-fetchgroups.adoc[leveloffset=+1]
-include::partial$hints-and-tips/jdoql-and-timestamps.adoc[leveloffset=+1]
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/mapping-guide.adoc b/persistence/jdo/adoc/modules/ROOT/pages/mapping-guide.adoc
deleted file mode 100644
index 780cc35d26e..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/mapping-guide.adoc
+++ /dev/null
@@ -1,18 +0,0 @@
-= Mapping Guide
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-The best resource for learning how to map JDO entities is the DataNucleus website.
-Take a look at:
-
-* link:https://www.datanucleus.org/products/accessplatform/jdo/mapping.html[JDO Mapping Guide]
-* link:https://www.datanucleus.org/products/accessplatform/jdo/annotations.html[JDO Annotations]
-
-The remainder of this page provides guidance on several specific mapping use cases.
-
-include::partial$mapping-guide/one-to-m-bidirectional-relationships.adoc[leveloffset=+1]
-include::partial$mapping-guide/mandatory-properties-in-subtypes.adoc[leveloffset=+1]
-include::partial$mapping-guide/mapping-to-a-view.adoc[leveloffset=+1]
-include::partial$mapping-guide/custom-value-types.adoc[leveloffset=+1]
-
-
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc b/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
deleted file mode 100644
index a79b883f5d2..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
+++ /dev/null
@@ -1,185 +0,0 @@
-= Setup and Configuration
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-This section describes how to include the JDO module and set its configuration properties.
-
-include::docs:mavendeps:partial$setup-and-configure-mavendeps-jdo.adoc[leveloffset=+1]
-
-
-== Update AppManifest
-
-In your application's `AppManifest` (top-level Spring `@Configuration` used to bootstrap the app), import the
-
-[source,java]
-.AppManifest.java
-----
-@Configuration
-@Import({
-        ...
-        CausewayModulePersistenceJdoDatanucleus.class,
-        ...
-})
-public class AppManifest {
-}
-----
-
-== DataSource
-
-The JPA object store uses Spring to provide a `javax.sql.DataSource`.
-Normally this is done by setting the `spring.datasource` configuration properties, as described in the
-link:https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-connect-to-production-database-configuration[Spring Boot] documentation.
-
-For example, the xref:docs:starters:simpleapp.adoc[SimpleApp] starter app defines these:
-
-* for H2 (in-memory):
-+
-[source,properties]
-.app.properties
-----
-spring.sql.init.platform=h2
-spring.datasource.url=jdbc:h2:mem:simple
-spring.datasource.driver-class-name=org.h2.Driver
-----
-
-* for SQL Server:
-+
-[source,properties]
-.app.properties
-----
-spring.sql.init.platform=sqlserver
-spring.datasource.url=jdbc:sqlserver://localhost;databaseName=simpleapp
-spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.datasource.username=simpleapp
-spring.datasource.password=simpleapp
-----
-
-It is also possible to programmatically define a `DataSource`; see the link:https://docs.spring.io/spring-boot/docs/current/reference/html/howto.html#howto-data-access[Spring docs] for details.
-
-
-== Create Schema
-
-It's good practice to use link:https://crate.io/docs/sql-99/en/latest/chapters/17.html#create-schema-statement[SQL schemas] as a way to organise database tables into groups.
-We recommend all the entities within a module use the same schema, and moreover that the logical type name (as defined using `@Named`) also follows the same pattern.
-
-For example:
-
-[source,java]
-----
-@PersistenceCapable(
-    schema="SIMPLE",                        // <.>
-    ...
-)
-@Named("simple.SimpleObject")               // <.>
-...
-public class SimpleObject ... {
-
-}
-----
-<.> specifies the database schema.
-The table name will be based on the entity
-<.> corresponding two-part object type.
-
-When prototyping we rely on the ORM to automatically create the entire database tables, which includes the owning schemas.
-As EclipseLink does not do this automatically, the framework will do this if requested.
-The xref:refguide:config:sections/causeway.persistence.schema.adoc#causeway.persistence.schema.auto-create-schemas[causeway.persistence.schema.auto-create-schemas] controls if this is done or not.
-
-Different database vendors have different syntaxes to do this, and so this can be configured using the xref:refguide:config:sections/causeway.persistence.schema.adoc#causeway.persistence.schema.create-schema-sql-template[causeway.persistence.schema.create-schema-sql-template].
-The default value is to use SQL-99 syntax ("CREATE SCHEMA IF NOT EXISTS %S"), passed through to `String.format()`.
-
-
-
-
-== Auto-create tables during prototyping/tests
-
-When running against the h2 in-memory database (eg for prototype mode or integration tests), you'll probably want DataNucleus to automatically create the tables.
-This can be done either eagerly or lazily:
-
-* to create all tables eagerly, set xref:refguide:config:sections/datanucleus.adoc#datanucleus.schema.generate-database.mode[datanucleus.schema.generate-database.mode] to `create`.
-
-* to create all tables lazily (only as objects are read from/written to them), set the xref:refguide:config:sections/datanucleus.adoc#datanucleus.schema.auto-create-all[datanucleus.schema.auto-create-all] to `true`.
-
-Generally we recommend eager creation; there are certain edge cases  -- eg inheritance hierarchies using the superclass (roll-up) table mappging -- where lazy creation can fail.
-
-If running in an integration test, you can use a preset:
-
-[source,java]
-.MyIntegrationTest.java
-----
-@SpringBootTest
-@TestPropertySource({
-    CausewayPresets.UseLog4j2Test,
-    CausewayPresets.DatanucleusEagerlyCreateTables      // <.>
-})
-class MyIntegrationTest extends CausewayIntegrationTestAbstract {
-    //...
-}
-----
-<.> simply sets the `datanucleus.schema.generate-database.mode` to true.
-
-
-== Validating tables in production
-
-When running in production then you may probably want to use xref:userguide:flyway:about.adoc[Flyway] to manage database migrations, rather than have DataNucleus maintain the schema.
-However, it is useful to validate that the database table structure of the target database is in line with what DataNucleus expects.
-
-You can do this using the xref:refguide:config:sections/datanucleus.adoc#datanucleus.schema.validate-all[datanucleus.schema.validate-all] configuration property.
-This will fail-fast if there is a mismatch.
-
-
-== Other Configuration Properties
-
-Additional configuration properties for DataNucleus itself can be specified directly under the `datanucleus.` configuration key.
-
-We recommend that some of these should be configured:
-
-* disable xref:configuring/disabling-persistence-by-reachability.adoc[persistence by reachability]
-
-
-
-See the xref:refguide:config:sections/datanucleus.adoc[datanucleus] section of the xref:refguide:config:about.adoc[Configuration Guide] for further details.
-
-
-Furthermore, DataNucleus will search for various other XML mapping files, eg `mappings.jdo`.
-A full list can be found http://www.datanucleus.org/products/datanucleus/jdo/metadata.html[here].
-
-[IMPORTANT]
-====
-DataNucleus properties must be specified using `camelCase`, not `kebab-case`.
-
-For example, use `datanucleus.schema.autoCreateAll` not `datanucleus.schema.auto-create-all`
-====
-
-
-[[persistence-xml]]
-== persistence.xml
-
-DataNucleus will for itself also read the `META-INF/persistence.xml`.
-In theory this can hold mappings and even connection strings.
-However, with Apache Causeway we tend to use annotations instead and externalize connection strings. so its definition is extremely simply, specifying just the name of the "persistence unit".
-
-Here's the one provided by the xref:docs:starters:simpleapp.adoc[SimpleApp] starter app:
-
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8" ?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
-    <persistence-unit name="simple">
-    </persistence-unit>
-</persistence>
-----
-
-Normally all one needs to do is to change the `persistence-unit` name.
-
-[TIP]
-====
-If you use Eclipse IDE on Windows then
-xref:setupguide:eclipse:about.adoc#workaround-for-path-limits-the-dn-plugin-to-use-the-persistence-xml[note the importance] of the `persistence.xml` file to make DataNucleus enhancer work correctly.
-====
-
-
-See link:http://www.datanucleus.org/products/datanucleus/jdo/persistence.html#persistenceunit[DataNucleus' documentation] on `persistence.xml` to learn more.
-
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/spis.adoc b/persistence/jdo/adoc/modules/ROOT/pages/spis.adoc
deleted file mode 100644
index 28126bebb04..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/pages/spis.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-= SPIs (hooks)
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-This page lists (some of) the hooks available to interact with the JDO persistence mechanism itself.
-
-include::partial$spis/JdoEntityDiscoveryListener.adoc[leveloffset=+1]
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/component-nav.adoc b/persistence/jdo/adoc/modules/ROOT/partials/component-nav.adoc
deleted file mode 100644
index 49c13652adc..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/component-nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-include::pjdo:ROOT:partial$module-nav.adoc[]
-
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/diagnosing-n-plus-1.adoc b/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/diagnosing-n-plus-1.adoc
deleted file mode 100644
index 4b70178806f..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/diagnosing-n-plus-1.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-[[diagnosing-n-plus-1]]
-= Diagnosing n+1 Issues
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-(As of DN 4.1) set a break point in `FetchRequest#execute(...)`:
-
-image::hints-n-tips/diagnosing-n-plus-1.png[width="800px"]
-
-The "Variables" pane will tell you which field(s) are being loaded, and the stack trace should help explain why the field is required.
-
-For example, it may be that an object is being loaded in a table and the initial query did not eagerly load that field.
-In such a case, consider using fetch groups in the initial repository query to bring the required data into memory with just one SQL call.
-See xref:pjdo:ROOT:hints-and-tips.adoc#typesafe-queries-and-fetchgroups[this hint/tip] for further details.
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/jdoql-and-timestamps.adoc b/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/jdoql-and-timestamps.adoc
deleted file mode 100644
index c5e6bed630d..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/jdoql-and-timestamps.adoc
+++ /dev/null
@@ -1,75 +0,0 @@
-[[jdoql-and-timestamps]]
-= JDOQL and Timestamps
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-Beware of entities with a property called "timestamp": you run the risk of "timestamp" being treated as a keyword in certain contexts, probably not as you intended.
-
-By way of example, the xref:userguide:commandlog:about.adoc[Command Log] module has an entity called `CommandJdo`.
-This has a property called "timestamp", of type `java.sql.Timestamp`.
-
-This defines a query using JDOQL:
-
-[source,java]
-----
-SELECT
-FROM org.causewayaddons.module.command.dom.CommandJdo
-WHERE executeIn == 'FOREGROUND'
-   && timestamp > :timestamp
-   && startedAt != null
-   && completedAt != null
-ORDER BY timestamp ASC
-----
-
-This is declared using a JDO `@Query`; no errors are thrown at any stage.
-
-However, running this query against SQL Server 2016 produced a different result first time it was run compared to subsequent times.
-
-Running SQL Profiler showed the underlying SQL as:
-
-[source,sql]
-----
-exec sp_prepexec @p1 output,N'@P0 datetime2',
-N'SELECT ''org.causewayaddons.module.command.dom.CommandJdo'' AS NUCLEUS_TYPE,
-  A0.arguments,
-  ...,
-  A0.target,
-  A0."timestamp",
-  A0.transactionId,
-  A0."user",
-  ''2018-01-24 17:29:18.3'' AS NUCORDER0    // <1>
-FROM causewaycommand.Command A0
-WHERE A0.executeIn = ''FOREGROUND''
-  AND A0."timestamp" > @P0
-  AND A0.startedAt IS NOT NULL
-  AND A0.completedAt IS NOT NULL
-  ORDER BY NUCORDER0
-  OFFSET 0 ROWS FETCH NEXT 2 ROWS ONLY ',   // <2>
-'2018-01-24 17:29:18.3000000'               // <3>
-----
-<1> discussed below ... this is the issue
-<2> because the query is submitted with max rows programmatically set to 2.
-<3> argument for @P0 (the timestamp parametr)
-
-
-To unpick this, the key issue is the `NUCORDER0` column, which is then used in the `ORDER BY`.
-However, because this is a literal value, the effect is no defined ordering.
-
-The problem therefore is that in the JDOQL the "ORDER BY timestamp ASC", the "timestamp" is being evaluated as the current time - a built-in function.
-
-My fix was to change the JDOQL to be:
-
-[source,sql]
-----
-SELECT
-FROM org.causewayaddons.module.command.dom.CommandJdo
-WHERE executeIn == 'FOREGROUND'
-   && timestamp > :timestamp
-   && startedAt != null
-   && completedAt != null
-ORDER BY this.timestamp ASC             // <1>
-----
-<1> Use "this." to qualify the timestamp
-
-It wasn't necessary to qualify the other occurances of "timestamp" (though it would be no harm to do so, either).
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/overriding-jdo-annotations.adoc b/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/overriding-jdo-annotations.adoc
deleted file mode 100644
index 95fa1d1cc61..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/overriding-jdo-annotations.adoc
+++ /dev/null
@@ -1,82 +0,0 @@
-[[overriding-jdo-annotations]]
-= Overriding JDO Annotations
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-JDO/DataNucleus builds its own persistence metamodel by reading both annotations on the class and also by searching for metadata in XML files.
-The metadata in the XML files takes precedence over the annotations, and so can be used to override metadata that is "hard-coded" in annotations.
-
-In fact, JDO/DataNucleus provides two different XML files that have slightly different purposes and capabilities:
-
-* first, a `.jdo` file can be provided which - if found - completely replaces the annotations. +
-+
-The idea here is simply to use XML as the means by which metadata is specified.
-
-* second, an `.orm` file can be provided which - if found - provides individual overrides for a particular database vendor. +
-+
-The idea here is to accommodate for subtle differences in support for SQL between vendors.
-A good example is the default schema for a table: `dbo` for SQL Server, `public` for HSQLDB, `sys` for Oracle, and so on.
-
-If you want to use the first approach (the `.jdo` file), you'll find that you can download the effective XML representation of domain entities using the xref:refguide:persistence:index/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.adoc[downloadJdoMetadata()] mixin action available in prototyping mode.
-This then needs to be renamed and placed in the appropriate location on the classpath; see the link:http://www.datanucleus.org[DataNucleus documentation] for details.
-
-However, using this first approach does create a maintenance effort; if the domain entity's class structure changes over time, then the XML metadata file will need to be updated.
-
-The second approach (using an `.orm` file) is therefore often more useful than the first, because the metadata provided overrides rather than replaces the annotations (and annotations not overridden continue to be honoured).
-
-A typical use case is to change the database schema for an entity.
-For example, various extension modules use schemas for each entity.
-For example, the `AuditEntry` entity in the xref:security:audittrail:about.adoc[audit trail] security module is annotated as:
-
-[source,java]
-----
-@javax.jdo.annotations.PersistenceCapable(
-        identityType=IdentityType.DATASTORE,
-        schema = "causewayAddonsAudit",
-        table="AuditEntry")
-public class AuditEntry {
-    ...
-}
-----
-
-This will map the `AuditEntry` class to a table `&quot;CausewayAddonsAudit&quot;.&quot;AuditEntry&quot;`; that is using a custom schema to own the object.
-
-Suppose though that for whatever reason we didn't want to use a custom schema but would rather use the default.
-Also suppose we are using SQL Server as our target database.
-
-We can override the above annotation using a `AuditEntry-sqlserver.orm` file, placed in the same package as the `AuditEntry` entity.
-For example:
-
-.AuditEntry-sqlserver.orm
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8" ?>
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-        http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd">
-
-    <package name="org.causewayaddons.module.audit.dom">
-        <class name="AuditEntry"
-               schema="causewayaudit"
-               table="AuditEntry">
-        </class>
-    </package>
-</orm>
-
-----
-
-It's also necessary to tell JDO/DataNucleus about which vendor is being used (`sqlserver` in the example above).
-This is done using the pass-thru `datanucleus.Mapping` configuration property:
-
-
-[source,ini]
-.application.properties
-----
-datanucleus.Mapping=sqlserver
-----
-
-
-
-
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/subtype-entity-not-fully-populated.adoc b/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/subtype-entity-not-fully-populated.adoc
deleted file mode 100644
index ed6e58d3903..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/subtype-entity-not-fully-populated.adoc
+++ /dev/null
@@ -1,59 +0,0 @@
-[[subtype-entity-not-fully-populated]]
-= Subtype not fully populated
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-Taken from link:http://markmail.org/message/ovgai56uqgfgnrx7[this thread] on the Apache Causeway users mailing list...
-
-
-If it seems that Apache Causeway (or rather DataNucleus) isn't fully populating domain entities (ie leaving some properties as `null`), then check that your actions are not accessing the fields directly.
-Use getters instead.
-
-
-[WARNING]
-====
-Properties of domain entities should always be accessed using getters.
-The only code that should access to fields should be the getters themselves.
-====
-
-Why so?
-Because DataNucleus will potentially lazy load some properties, but to do this it needs to know that the field is being requested.
-This is the purpose of the enhancement phase: the bytecode of the original getter method is actually wrapped in code that does the lazy loading checking.
-But hitting the field directly means that the lazy loading code does not run.
-
-This error can be subtle: sometimes "incorrect" code that accesses the fields will seem to work.
-But that will be because the field has been populated already, for whatever reason.
-
-One case where you will find the issue highlighted is for subtype tables that have been mapped using an inheritance strategy of `NEW_TABLE`, eg:
-
-[source,java]
-----
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-public class SupertypeEntity {
-    ...
-}
-----
-
-and then:
-
-[source,java]
-----
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
-public class SubtypeEntity extends SupertypeEntity {
-    ...
-}
-----
-
-This will generate two tables in the database, with the primary key of the supertype table propagated as a foreign key (also primary key) of the subtype table (sometimes called "table per type" strategy).
-This means that DataNucleus might retrieve data from only the supertype table, and the lazily load the subtype fields only as required.
-This is preferable to doing a left outer join from the super- to the subtype tables to retrieve data that might not be needed.
-
-On the other hand, if the `SUPERCLASS_TABLE` strategy (aka "table per hierarchy" or roll-up) or the `SUBCLASS_TABLE` strategy (roll-down) was used, then the problem is less likely to occur because DataNucleus would obtain all the data for any given instance from a single table.
-
-Final note: references to other objects (either scalar references or in collections) in particular require that getters rather than fields to be used to obtain them: it's hopefully obvious that DataNucleus (like all ORMs) should not and will not resolve such references (otherwise, where to stop... and the whole database would be loaded into memory).
-
-In summary, there's just one rule: *always use the getters, never the fields*.
-
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/tracing-sql-statements.adoc b/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/tracing-sql-statements.adoc
deleted file mode 100644
index 9e7e6ed5bcc..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/tracing-sql-statements.adoc
+++ /dev/null
@@ -1,74 +0,0 @@
-= Tracing SQL Statements
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-If you want to debug the SQL being sent to the database, one approach is to use the link:https://github.com/p6spy/p6spy[p6spy] JDBC Driver.
-This acts as a decorator, logging the calls and then passing through to the underlying database.
-
-Enabling p6spy is easily done using the https://github.com/gavlyukovskiy/spring-boot-data-source-decorator[gavlyukovskiy/spring-boot-data-source-decorator] package:
-
-* add the `com.github.gavlyukovskiy:p6spy-spring-boot-starter` dependency to your `pom.xml`:
-+
-[source,xml]
-.pom.xml
-----
-<dependency>
-    <groupId>com.github.gavlyukovskiy</groupId>
-    <artifactId>p6spy-spring-boot-starter</artifactId>
-    <version>1.7.1</version>
-    <scope>compile</scope>      <!--.-->
-</dependency>
-----
-<.> change to `test` if only using within integration tests, for example.
-
-* add properties to enable logging:
-+
-[source,properties]
-.application.properties
-----
-# Register P6LogFactory to log JDBC events
-decorator.datasource.p6spy.enable-logging=true
-
-# Use com.p6spy.engine.spy.appender.MultiLineFormat instead of com.p6spy.engine.spy.appender.SingleLineFormat
-decorator.datasource.p6spy.multiline=true
-
-# Use logging for default listeners [slf4j, sysout, file, custom]
-decorator.datasource.p6spy.logging=sysout
-
-## Log file to use (only with logging=file)
-#decorator.datasource.p6spy.log-file=spy.log
-
-## Class file to use (only with logging=custom). The class must implement com.p6spy.engine.spy.appender.FormattedLogger
-#decorator.datasource.p6spy.custom-appender-class=my.custom.LoggerClass
-
-## Custom log format, if specified com.p6spy.engine.spy.appender.CustomLineFormat will be used with this log format
-#decorator.datasource.p6spy.log-format=
-
-## Use regex pattern to filter log messages. If specified only matched messages will be logged.
-#decorator.datasource.p6spy.log-filter.pattern=
-
-## Report the effective sql string (with '?' replaced with real values) to tracing systems.
-## NOTE this setting does not affect the logging message.
-#decorator.datasource.p6spy.tracing.include-parameter-values=true
-----
-
-The link:https://github.com/gavlyukovskiy/spring-boot-data-source-decorator[integration] makes it easy to set the most common configuration properties, but it's also possible to configure other p6spy properties using its various configuration mechanisms; see https://p6spy.readthedocs.io/en/latest/configandusage.html[p6spy docs] for details.
-
-Rather than adding the properties directly to `application.properties`, you might prefer to set up a "p6spy" profile so that the configuration can be enabled/disabled easily:
-
-* create a properties file for a "p6spy" profile, in either the root or `config` package:
-+
-[source,properties]
-.application-p6spy.properties
-----
-...
-----
-* move the configuration properties from `application.properties` into `application-p6spy.properties`
-
-* enable the `p6spy` profile using the `spring.profiles.active` system property:
-+
-[source,bash]
-----
--Dspring.profiles.active=p6spy
-----
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/typesafe-queries-and-fetchgroups.adoc b/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
deleted file mode 100644
index 963af83d44c..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
+++ /dev/null
@@ -1,110 +0,0 @@
-[[typesafe-queries-and-fetchgroups]]
-= Typesafe Queries and Fetch-groups
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-
-Fetch groups provide a means to hint to DataNucleus that it should perform a SQL join when querying.
-A common use case is to avoid the xref:pjdo:ROOT:hints-and-tips.adoc#diagnosing-n-plus-1[n+1] issue.
-
-(So far as I could ascertain) it isn't possible to specify fetch group hints using JDOQL, but it is possible to specify them using the programmatic API or using typesafe queries.
-
-For example, here's a JDOQL query:
-
-[source,java]
-----
-@Query(
-		name = "findCompletedOrLaterWithItemsByReportedDate", language = "JDOQL",
-		value = "SELECT "
-				+ "FROM com.mycompany.invoice.IncomingInvoice "
-				+ "WHERE items.contains(ii) "
-				+ "   && (ii.reportedDate == :reportedDate) "
-				+ "   && (approvalState != 'NEW' && approvalState != 'DISCARDED') "
-				+ "VARIABLES com.mycompany.invoice.IncomingInvoiceItem ii "
-),
-public class IncomingInvoice ... { /* ... */ }
-----
-
-which normally would be used from a repository:
-
-
-[source,java]
-----
-public List<IncomingInvoice> findCompletedOrLaterWithItemsByReportedDate(
-        final LocalDate reportedDate) {
-    return repositoryService.allMatches(
-            Query.named(IncomingInvoice.class,
-                    "findCompletedOrLaterWithItemsByReportedDate")
-               .withParameter("reportedDate", reportedDate));
-}
-----
-
-
-This can be re-written as a type-safe query as follows:
-
-[source,java]
-----
-public List<IncomingInvoice> findCompletedOrLaterWithItemsByReportedDate(final LocalDate reportedDate) {
-
-    final QIncomingInvoice ii = QIncomingInvoice.candidate();
-    final QIncomingInvoiceItem iii = QIncomingInvoiceItem.variable("iii");
-
-    final TypesafeQuery<IncomingInvoice> q =
-        causewayJdoSupport.newTypesafeQuery(IncomingInvoice.class);
-
-    q.filter(
-            ii.items.contains(iii)
-        .and(iii.reportedDate.eq(reportedDate))
-        .and(ii.approvalState.ne(IncomingInvoiceApprovalState.NEW))
-        .and(ii.approvalState.ne(IncomingInvoiceApprovalState.DISCARDED)));
-    final List<IncomingInvoice> incomingInvoices = Lists.newArrayList(q.executeList());
-    q.closeAll();
-    return incomingInvoices;
-}
-----
-
-Now the `IncomingInvoice` has four fields that require eager loading.
-This can be specified by defining a named fetch group:
-
-[source,java]
-----
-@FetchGroup(
-        name="seller_buyer_property_bankAccount",
-        members={
-                @Persistent(name="seller"),
-                @Persistent(name="buyer"),
-                @Persistent(name="property"),
-                @Persistent(name="bankAccount")
-        })
-public class IncomingInvoice ... { /* ... */ }
-----
-
-
-This fetch group can then be used in the query using `q.getFetchPlan().addGroup(...)`.
-Putting this all together, we get:
-
-[source,java]
-----
-public List<IncomingInvoice> findCompletedOrLaterWithItemsByReportedDate(final LocalDate reportedDate) {
-
-    final QIncomingInvoice ii = QIncomingInvoice.candidate();
-    final QIncomingInvoiceItem iii = QIncomingInvoiceItem.variable("iii");
-
-    final TypesafeQuery<IncomingInvoice> q =
-        causewayJdoSupport.newTypesafeQuery(IncomingInvoice.class);
-
-    q.getFetchPlan().addGroup("seller_buyer_property_bankAccount");     // <1>
-
-    q.filter(
-            ii.items.contains(iii)
-        .and(iii.reportedDate.eq(reportedDate))
-        .and(ii.approvalState.ne(IncomingInvoiceApprovalState.NEW))
-        .and(ii.approvalState.ne(IncomingInvoiceApprovalState.DISCARDED)));
-    final List<IncomingInvoice> incomingInvoices = Lists.newArrayList(q.executeList());
-    q.closeAll();
-    return incomingInvoices;
-}
-----
-<1> specify the fetch group to use.
-
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/custom-value-types.adoc b/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/custom-value-types.adoc
deleted file mode 100644
index d36cd42d995..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/custom-value-types.adoc
+++ /dev/null
@@ -1,164 +0,0 @@
-[[custom-value-types]]
-= Custom Value Types
-
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-
-The framework provides a number of custom value types.
-Some of these are wrappers around a single value (eg `AsciiDoc` or `Password`) while others map onto multiple values (eg `Blob`).
-
-This section shows how to map each (and can be adapted for your own custom types or `@Embedded` values).
-
-
-== Mapping AsciiDoc
-
-The xref:refguide:valuetypes:index/asciidoc/applib/value/AsciiDoc.adoc[] value type is used for documentation written using the link:https://asciidoctor.org/[AsciiDoc] syntax:
-
-* In the domain entity, map `AsciiDoc` type using `@Column(jdbcType = "CLOB")`:
-+
-[source,java]
-.MyEntity.java
-----
-public class MyEntity ... {
-
-    @Column(allowsNull = "false", jdbcType = "CLOB")
-    @Property
-    @Getter @Setter
-    private AsciiDoc documentation;
-
-}
-----
-
-* in the webapp module, register the JDO specific converter by:
-
-** adding a dependency to this module:
-+
-[source,xml]
-.pom.xml
-----
-<dependency>
-    <groupId>org.apache.causeway.valuetypes</groupId>
-    <artifactId>causeway-valuetypes-asciidoc-persistence-jdo</artifactId>
-</dependency>
-----
-
-** and adding reference the corresponding module in the `AppManifest`:
-+
-[source,java]
-.AppManifest.java
-----
-@Configuration
-@Import({
-        ...
-        CausewayModuleValAsciidocPersistenceJdo.java
-        ...
-})
-public class AppManifest {
-}
-----
-
-== Mapping Markdown
-
-The xref:refguide:valuetypes:index/markdown/applib/value/Markdown.adoc[] value type is used for documentation written using markdown:
-
-* In the domain entity, map `Markdown` type using `@Column(jdbcType = "CLOB")`:
-+
-[source,java]
-.MyEntity.java
-----
-public class MyEntity ... {
-
-    @Column(allowsNull = "false", jdbcType = "CLOB")
-    @Property
-    @Getter @Setter
-    private Markdown documentation;
-
-}
-----
-
-* in the webapp module, register the JDO specific converter by:
-
-** adding a dependency to this module:
-+
-[source,xml]
-.pom.xml
-----
-<dependency>
-    <groupId>org.apache.causeway.valuetypes</groupId>
-    <artifactId>causeway-valuetypes-markdown-persistence-jdo</artifactId>
-</dependency>
-----
-
-** and adding reference the corresponding module in the `AppManifest`:
-+
-[source,java]
-.AppManifest.java
-----
-@Configuration
-@Import({
-        ...
-        CausewayModuleValMarkdownPersistenceJdo.java
-        ...
-})
-public class AppManifest {
-}
-----
-
-
-== Mapping Blobs and Clobs
-
-The JDO ObjectStore integration of DataNucleus ORM can automatically persist xref:refguide:applib:index/value/Blob.adoc[] and xref:refguide:applib:index/value/Clob.adoc[] values into multiple columns, corresponding to their constituent parts.
-
-=== Blobs
-
-To map a xref:refguide:applib:index/value/Blob.adoc[Blob], use:
-
-[source,java]
-.MyEntity.java
-----
-public class MyEntity ... {
-
-    @Persistent(defaultFetchGroup="false", columns = {
-            @Column(name = "pdf_name"),                 // <.>
-            @Column(name = "pdf_mimetype"),             // <.>
-            @Column(name = "pdf_bytes")                 // <.>
-    })
-    @Getter @Setter
-    private Blob pdf;
-
-}
-----
-<.> string, maps to a varchar in the database
-<.> string, maps to a varchar in the database
-<.> byte array, maps to a Blob or varbinary in the database
-
-
-=== Clobs
-
-To map a xref:refguide:applib:index/value/Clob.adoc[Clob], use:
-
-[source]
-.MyEntity.java
-----
-public class MyEntity ... {
-
-    @Persistent(defaultFetchGroup="false", columns = {
-            @Column(name = "xml_name"),                 // <.>
-            @Column(name = "xml_mimetype"),             // <.>
-            @Column(name = "xml_chars"                  // <.>
-                    , jdbcType = "CLOB"
-            )
-    })
-    @Getter @Setter
-    private Clob xml;
-
-}
-----
-
-<.> string, maps to a varchar in the database
-<.> string, maps to a varchar in the database
-<.> char array, maps to a Clob or varchar in the database
-
-
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/mandatory-properties-in-subtypes.adoc b/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/mandatory-properties-in-subtypes.adoc
deleted file mode 100644
index e768ef9cc77..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/mandatory-properties-in-subtypes.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
-[[mandatory-properties-in-subtypes]]
-= Mandatory Properties in Subtypes
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-
-If you have a hierarchy of classes then you need to decide which inheritance strategy to use.
-
-* "table per hierarchy", or "rollup" (`InheritanceStrategy.SUPERCLASS_TABLE`) +
-+
-whereby a single table corresponds to the superclass, and also holds the properties of the subtype (or subtypes) being rolled up
-
-* "table per class" (`InheritanceStrategy.NEW_TABLE`) +
-+
-whereby there is a table for both superclass and subclass, in 1:1 correspondence
-
-* "rolldown" (`InheritanceStrategy.SUBCLASS_TABLE`) +
-+
-whereby a single table holds the properties of the subtype, and also holds the properties of its supertype
-
-In the first "rollup" case, we can have a situation where - logically speaking - the property is mandatory in the subtype - but it must be mapped as nullable in the database because it is n/a for any other subtypes that are rolled up.
-
-In this situation we must tell JDO that the column is optional, but to Apache Causeway we want to enforce it being mandatory. This can be done using the `@Property(optionality=Optionality.MANDATORY)` annotation.
-
-For example:
-
-[source,java]
-----
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-import lombok.Getter;
-import lombok.Setter;
-
-@Inheritance(strategy = InheritanceStrategy.SUPER_TABLE)
-public class SomeSubtype extends SomeSuperType {
-    @Column(allowsNull="true")
-    @Property(optionality=Optionality.MANDATORY)
-    @Getter @Setter
-    private LocalDate date;
-}
-----
-
-
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/mapping-to-a-view.adoc b/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/mapping-to-a-view.adoc
deleted file mode 100644
index 33d8d955757..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/mapping-to-a-view.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-[[mapping-to-a-view]]
-= Mapping to a View
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-JDO/DataNucleus supports the ability to map the entity that is mapped to a view rather than a database table.
-Moreover, DataNucleus itself can create/maintain this view.
-
-One use case for this is to support use cases which act upon aggregate information.
-An link:https://github.com/estatio/estatio/blob/b77d0b03ec86463227ba90f8341299066ddba69f/estatioapp/module/lease/dom/src/main/java/org/estatio/dom/lease/invoicing/viewmodel/InvoiceSummaryForPropertyDueDateStatus.java#L57[example] is in the (non-ASF) http://github.com/estatio/estatio[Estatio] application, which uses a view to define an "invoice run": a representatoin of all pending invoices to be sent out for a particular shopping centre.
-(Note that example also shows the entity as being "non-durable", but if the view is read/write then -- I think -- that this isn't necessary required).
-
-
-For more on this topic, see the link:http://www.datanucleus.org/products/datanucleus/jdo/mapping.html#schema_rdbms_views[DataNucleus documentation].
-
-
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/one-to-m-bidirectional-relationships.adoc b/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/one-to-m-bidirectional-relationships.adoc
deleted file mode 100644
index 48bd851ce69..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/mapping-guide/one-to-m-bidirectional-relationships.adoc
+++ /dev/null
@@ -1,320 +0,0 @@
-[[one-to-m-bidirectional-relationships]]
-= 1-m Bidirectional relationships
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-
-Consider a bidirectional one-to-many association between two entities; a collection member in the "parent" and a property member on the "child".
-
-We can tell DataNucleus about the bidirectionality using `@Persistent(mappedBy=...)`, or we can take responsibility for
-this aspect ourselves.
-
-In addition, the two entities can be associated either without or with a join table (indicated by the `@Join` annotation):
-
-* without a join table is more common; a regular foreign key in the child table for `FermentationVessel` points back up to the associated parent `Batch`
-* with a join table; a link table holds the tuple representing the linkage.
-
-Testing (against `dn-core 4.1.7`/`dn-rdbms 4.1.9`) has determined there are two main rules:
-
-* If not using `@Join`, then the association must be maintained by setting the child association on the parent. +
-+
-It is not sufficient to simply add the child object to the parent's collection.
-
-* `@Persistent(mappedBy=...)` and `@Join` cannot be used together. +
-+
-Put another way, if using `@Join` then you must maintain both sides of the relationship in the application code.
-
-
-In the examples that follow, we use two entities, `Batch` and `FermentationVessel` (from a brewery domain).  In the
-original example domain the relationship between these two entities was optional (a `FermentationVessel` may
-have either none or one `Batch` associated with it); for the purpose of this article we'll explore both mandatory and
-optional associations.
-
-== Mandatory, no `@Join`
-
-In the first scenario we have use `@Persistent(mappedBy=...)` to indicate a bidirectional association, without any `@Join`:
-
-[source,java]
-----
-public class Batch {
-
-    // getters and setters omitted
-
-    @Persistent(mappedBy = "batch", dependentElement = "false")     // <1>
-    private SortedSet<FermentationVessel> vessels = new TreeSet<FermentationVessel>();
-}
-----
-<1> "mappedBy" means this is bidirectional
-
-and
-
-[source,java]
-----
-public class FermentationVessel implements Comparable<FermentationVessel> {
-
-    // getters and setters omitted
-
-    @Column(allowsNull = "false")       // <1>
-    private Batch batch;
-
-    @Column(allowsNull = "false")
-    private State state;                // <2>
-}
-----
-<1> mandatory association up to parent
-<2> State is an enum (omitted)
-
-
-Which creates this schema:
-
-[source,sql]
-----
-CREATE TABLE "batch"."Batch"
-(
-    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY,
-    ...
-    "version" BIGINT NOT NULL,
-    CONSTRAINT "Batch_PK" PRIMARY KEY ("id")
-)
-CREATE TABLE "fvessel"."FermentationVessel"
-(
-    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY,
-    "batch_id_OID" BIGINT NOT NULL,
-    "state" NVARCHAR(255) NOT NULL,
-    ...
-    "version" TIMESTAMP NOT NULL,
-    CONSTRAINT "FermentationVessel_PK" PRIMARY KEY ("id")
-)
-----
-
-That is, there is an mandatory foreign key from `FermentationVessel` to `Batch`.
-
-
-In this case we can use this code:
-
-[source,java]
-----
-public Batch transfer(final FermentationVessel vessel) {
-    vessel.setBatch(this);                                  // <1>
-    vessel.setState(FermentationVessel.State.FERMENTING);
-    return this;
-}
-----
-<1> set the parent on the child
-
-This sets up the association correctly, using this SQL:
-
-[source,sql]
-----
-UPDATE "fvessel"."FermentationVessel"
-   SET "batch_id_OID"=\<0>
-       ,"state"=<'FERMENTING'>
-       ,"version"=<2016-07-07 12:37:14.968>
- WHERE "id"=\<0>
-----
-
-
-The following code will also work:
-
-[source,java]
-----
-public Batch transfer(final FermentationVessel vessel) {
-    vessel.setBatch(this);                                  // <1>
-    getVessels().add(vessel);                               // <2>
-    vessel.setState(FermentationVessel.State.FERMENTING);
-    return this;
-}
-----
-<1> set the parent on the child
-<2> add the child to the parent's collection.
-
-However, obviously the second statement is redundant.
-
-
-== Optional, no `@Join`
-
-If the association to the parent is made optional:
-
-[source,java]
-----
-public class FermentationVessel implements Comparable<FermentationVessel> {
-
-    // getters and setters omitted
-
-    @Column(allowsNull = "true")       // <1>
-    private Batch batch;
-
-    @Column(allowsNull = "false")
-    private State state;
-}
-----
-<1> optional association up to parent
-
-
-Which creates this schema:
-
-[source,sql]
-----
-CREATE TABLE "batch"."Batch"
-(
-    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY,
-    ...
-    "version" BIGINT NOT NULL,
-    CONSTRAINT "Batch_PK" PRIMARY KEY ("id")
-)
-CREATE TABLE "fvessel"."FermentationVessel"
-(
-    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY,
-    "batch_id_OID" BIGINT NULL,
-    "state" NVARCHAR(255) NOT NULL,
-    ...
-    "version" TIMESTAMP NOT NULL,
-    CONSTRAINT "FermentationVessel_PK" PRIMARY KEY ("id")
-)
-----
-
-This is almost exactly the same, except the foreign key from `FermentationVessel` to `Batch` is now nullable.
-
-
-In this case then setting the parent on the child still works:
-
-[source,java]
-----
-public Batch transfer(final FermentationVessel vessel) {
-    vessel.setBatch(this);                                  // <1>
-    vessel.setState(FermentationVessel.State.FERMENTING);
-    return this;
-}
-----
-<1> set the parent on the child
-
-*HOWEVER*, if we (redundantly) update both sides, then - paradoxically - the association is NOT set up
-
-[source,java]
-----
-public Batch transfer(final FermentationVessel vessel) {
-    vessel.setBatch(this);                                  // <1>
-    getVessels().add(vessel);                               // <2>
-    vessel.setState(FermentationVessel.State.FERMENTING);
-    return this;
-}
-----
-<1> set the parent on the child
-<2> add the child to the parent's collection.
-
-[NOTE]
-====
-It's not clear if this is a bug in `dn-core 4.1.7`/`dn-rdbms 4.19`; an earlier thread on the mailing list from 2014 actually gave
-the opposite advice, see http://causeway.markmail.org/thread/ipu2lzqqikqdglox[this thread] and in particular this http://markmail.org/message/hblptpw675mlw723[message].
-
-In fact we also have had a different case raised (url lost) which argues that the parent should only be set on the child, and the child _not_ added to the parent's collection.
-This concurs with the most recent testing.
-====
-
-Therefore, the simple advice is that, for bidirectional associations, simply set the parent on the child, and this will work
-reliably irrespective of whether the association is mandatory or optional.
-
-
-== With `@Join`
-
-Although DataNucleus does not complain if `@Persistence(mappedBy=...)` and `@Join` are combined, testing (against `dn-core 4.1.7`/`dn-rdbms 4.19`) has shown that the bidirectional association is not properly maintained.
-
-Therefore, we recommend that if `@Join` is used, then manually maintain both sides of the relationship and do not indicate
-that the association is bidirectional.
-
-For example:
-
-[source,java]
-----
-public class Batch {
-
-    // getters and setters omitted
-
-    @Join(table = "Batch_vessels")
-    @Persistent(dependentElement = "false")
-    private SortedSet<FermentationVessel> vessels = new TreeSet<FermentationVessel>();
-}
-----
-
-and
-
-[source,java]
-----
-public class FermentationVessel implements Comparable<FermentationVessel> {
-
-    // getters and setters omitted
-
-    @Column(allowsNull = "true")       // <1>
-    private Batch batch;
-
-    @Column(allowsNull = "false")
-    private State state;
-}
-----
-<1> optional association up to parent
-
-
-creates this schema:
-
-[source,sql]
-----
-CREATE TABLE "batch"."Batch"
-(
-    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY,
-    ...
-    "version" BIGINT NOT NULL,
-    CONSTRAINT "Batch_PK" PRIMARY KEY ("id")
-)
-CREATE TABLE "fvessel"."FermentationVessel"
-(
-    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY,
-    "state" NVARCHAR(255) NOT NULL,
-    ...
-    "version" TIMESTAMP NOT NULL,
-    CONSTRAINT "FermentationVessel_PK" PRIMARY KEY ("id")
-)
-CREATE TABLE "batch"."Batch_vessels"
-(
-    "id_OID" BIGINT NOT NULL,
-    "id_EID" BIGINT NOT NULL,
-    CONSTRAINT "Batch_vessels_PK" PRIMARY KEY ("id_OID","id_EID")
-)
-----
-
-That is, there is NO foreign key from `FermentationVessel` to `Batch`, instead the `Batch_vessels` table links the two together.
-
-
-These should then be maintained using:
-
-[source,java]
-----
-public Batch transfer(final FermentationVessel vessel) {
-    vessel.setBatch(this);                                  // <1>
-    getVessels().add(vessel);                               // <2>
-    vessel.setState(FermentationVessel.State.FERMENTING);
-    return this;
-}
-----
-<1> set the parent on the child
-<2> add the child to the parent's collection.
-
-
-that is, explicitly update both sides of the relationship.
-
-This generates this SQL:
-
-[source,sql]
-----
-INSERT INTO "batch"."Batch_vessels" ("id_OID","id_EID") VALUES (<0>,<0>)
-UPDATE "batch"."Batch"
-   SET "version"=\<3>
- WHERE "id"=\<0>
-UPDATE "fvessel"."FermentationVessel"
-   SET "state"=<'FERMENTING'>
-      ,"version"=<2016-07-07 12:49:21.49>
- WHERE "id"=\<0>
-----
-
-
-It doesn't matter in these cases whether the association is mandatory or optional; it will be the same SQL generated.
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/module-nav.adoc b/persistence/jdo/adoc/modules/ROOT/partials/module-nav.adoc
deleted file mode 100644
index a68585a4229..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/module-nav.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-
-* xref:pjdo:ROOT:setup-and-configuration.adoc[Setup and Configuration]
-** xref:pjdo:ROOT:configuring/disabling-persistence-by-reachability.adoc[Disabling Persistence by Reachability]
-
-* xref:pjdo:ROOT:enhancer.adoc[Enhancer]
-* xref:pjdo:ROOT:db-schemas.adoc[DB Schemas]
-
-* xref:pjdo:ROOT:mapping-guide.adoc[Mapping Guide]
-** xref:pjdo:ROOT:mapping-guide.adoc#one-to-m-bidirectional-relationships[leveloffset=+1]
-** xref:pjdo:ROOT:mapping-guide.adoc#mandatory-properties-in-subtypes[leveloffset=+1]
-** xref:pjdo:ROOT:mapping-guide.adoc#mapping-to-a-view[leveloffset=+1]
-
-* xref:pjdo:ROOT:dependency-injection.adoc[Dependency Injection]
-* xref:pjdo:ROOT:hints-and-tips.adoc[Hints-n-Tips]
-* xref:pjdo:ROOT:spis.adoc[SPIs (hooks)]
diff --git a/persistence/jdo/adoc/modules/ROOT/partials/spis/JdoEntityDiscoveryListener.adoc b/persistence/jdo/adoc/modules/ROOT/partials/spis/JdoEntityDiscoveryListener.adoc
deleted file mode 100644
index c998f084780..00000000000
--- a/persistence/jdo/adoc/modules/ROOT/partials/spis/JdoEntityDiscoveryListener.adoc
+++ /dev/null
@@ -1,69 +0,0 @@
-= JdoEntityDiscoveryListener
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-The `JdoEntityDiscoveryListener` interface is called during bootstrapping after the `PersistenceManagerFactory` has been created.
-It can be used to perform additional bootstrapping tasks.
-
-For example, to eagerly register all named queries, you could use:
-
-[source,java]
-.NamedQueryEagerRegistrar.java
-----
-@Component
-public class NamedQueryEagerRegistrar implements JdoEntityDiscoveryListener {
-
-    @Override
-    public void onEntitiesDiscovered(
-            final @NonNull PersistenceManagerFactory persistenceManagerFactory,
-            final @NonNull Set<Class<?>> entityTypes,
-            final @NonNull Map<String, Object> properties) {
-
-        val pmf = (JDOPersistenceManagerFactory) persistenceManagerFactory;
-        val nucleusContext = pmf.getNucleusContext();
-
-        val clr = nucleusContext.getClassLoaderResolver(_Context.getDefaultClassLoader());
-        val metaDataManager = nucleusContext.getMetaDataManager();
-
-        metaDataManager
-            .getClassesWithMetaData()
-            .forEach(className->{
-                val meta = metaDataManager.getMetaDataForClass(className, clr);
-                _NullSafe.stream(meta.getQueries())
-                .forEach(metaDataManager::registerNamedQuery);
-            });
-    }
-}
-----
-
-You could also use an implementation to eagerly create the database tables in the database:
-
-[source,java]
-.DatabaseCreator.java
-----
-@Component
-public class DatabaseCreator implements JdoEntityDiscoveryListener {
-
-    @Override
-    public void onEntitiesDiscovered(
-            final @NonNull PersistenceManagerFactory persistenceManagerFactory,
-            final @NonNull Set<Class<?>> entityTypes,
-            final @NonNull Map<String, Object> properties) {
-
-        val pmf = (JDOPersistenceManagerFactory) persistenceManagerFactory;
-        val nucleusContext = pmf.getNucleusContext();
-        val schemaAwareStoreManager = (SchemaAwareStoreManager)nucleusContext.getStoreManager();
-
-        val classNames = entityTypes
-                .stream()
-                .map(Class::getName)
-                .collect(Collectors.toSet());
-
-        schemaAwareStoreManager.createSchemaForClasses(classNames, properties);
-    }
-}
-----
-
-However, for this second use case it's easier to simply set the `datanucleus.schema.generate-database.mode` configuration property.
-
diff --git a/persistence/jdo/applib/pom.xml b/persistence/jdo/applib/pom.xml
deleted file mode 100644
index 58dfecfe02b..00000000000
--- a/persistence/jdo/applib/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.causeway.persistence</groupId>
-		<artifactId>causeway-persistence-jdo</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>causeway-persistence-jdo-applib</artifactId>
-
-	<name>Apache Causeway Persistence - JDO (applib)</name>
-	<description>
-		Supplementary applib for JDO persistence
-    </description>
-
-	<properties>
-		<jar-plugin.automaticModuleName>org.apache.causeway.persistence.jdo.applib</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/causeway/persistence/jdo/applib</git-plugin.propertiesDir>
-	</properties>
-
-	<build>
-		<resources>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<filtering>false</filtering>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<testResources>
-            <testResource>
-                <filtering>false</filtering>
-                <directory>src/test/resources</directory>
-            </testResource>
-            <testResource>
-                <filtering>false</filtering>
-                <directory>src/test/java</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </testResource>
-        </testResources>
-	</build>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.causeway.core</groupId>
-			<artifactId>causeway-applib</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.causeway.commons</groupId>
-			<artifactId>causeway-commons</artifactId>
-		</dependency>
-
-		<!-- JDO API (providing compile dependency) -->
-		<dependency>
-			<groupId>org.datanucleus</groupId>
-			<artifactId>javax.jdo</artifactId>
-			<exclusions>
-				<!-- already provided by JDK system libraries -->
-				<exclusion>
-					<groupId>javax.transaction</groupId>
-					<artifactId>transaction-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.datanucleus</groupId>
-			<artifactId>datanucleus-rdbms</artifactId>
-			<!-- to avoid polluting the classpath -->
-			<optional>true</optional>
-		</dependency>
-
-	</dependencies>
-
-
-</project>
\ No newline at end of file
diff --git a/persistence/jdo/applib/src/main/java/module-info.java b/persistence/jdo/applib/src/main/java/module-info.java
deleted file mode 100644
index 8cc75c002dc..00000000000
--- a/persistence/jdo/applib/src/main/java/module-info.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-module org.apache.causeway.persistence.jdo.applib {
-    exports org.apache.causeway.persistence.jdo.applib.services;
-    exports org.apache.causeway.persistence.jdo.applib.types;
-    exports org.apache.causeway.persistence.jdo.applib;
-
-    requires jakarta.inject;
-    requires jakarta.validation;
-    requires transitive javax.jdo;
-    requires org.apache.causeway.applib;
-    requires org.datanucleus.store.rdbms;
-    requires spring.context;
-    requires spring.core;
-}
\ No newline at end of file
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/CausewayModulePersistenceJdoApplib.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/CausewayModulePersistenceJdoApplib.java
deleted file mode 100644
index 5c70c8ba2de..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/CausewayModulePersistenceJdoApplib.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib;
-
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-public class CausewayModulePersistenceJdoApplib {
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/services/JdoSupportService.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/services/JdoSupportService.java
deleted file mode 100644
index 9483b49fe12..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/services/JdoSupportService.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.services;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.jdo.JDOQLTypedQuery;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.query.BooleanExpression;
-
-import org.datanucleus.store.rdbms.RDBMSPropertyNames;
-
-import org.jspecify.annotations.Nullable;
-
-/**
- * Primarily provides access to the current thread's {@link PersistenceManagerFactory} and
- * hence also the current thread's {@link PersistenceManager}.
- *
- * @since 2.0 {@index}
- *
- * @apiNote While ideally this service should be independent of vendor
- *          specifics, currently it depends on DataNucleus RDBMS.
- */
-public interface JdoSupportService {
-
-    // -- INTERFACE
-
-    PersistenceManagerFactory getPersistenceManagerFactory();
-
-    /**
-     * Force a reload (corresponding to the JDO <tt>PersistenceManager</tt>'s <tt>refresh()</tt> method)
-     * of a domain objects.
-     *
-     * <p>
-     * In fact, this may just reset the lazy-load state of the domain object, but the effect is the same:
-     * to cause the object's state to be reloaded from the database.
-     *
-     * <p>
-     * The particular example that led to this method being added was a 1:m bidirectional relationship,
-     * analogous to <tt>Customer <-> * Order</tt>.  Persisting the child <tt>Order</tt> object did not cause
-     * the parent <tt>Customer</tt>'s collection of orders to be updated.  In fact, JDO does not make any
-     * such guarantee to do so.  Options are therefore either to maintain the collection in code, or to
-     * refresh the parent.
-     */
-    <T> T refresh(T domainObject);
-
-    void ensureLoaded(Collection<?> collectionOfDomainObjects);
-
-    List<Map<String, Object>> executeSql(String sql);
-
-    Integer executeUpdate(String sql);
-
-    /**
-     * Force the deletion of all instances of the specified class.
-     *
-     * <p>
-     * Note: this is intended primarily for testing purposes, eg clearing existing data as part of
-     * installing fixtures.  It will generate a <tt>SQL DELETE</tt> for each instance.  To perform
-     * a bulk deletion with a single <tt>SQL DELETE</tt>, use {@link #executeUpdate(String)}.
-     *
-     * <p>
-     * Implementation note: It can occasionally be the case that Causeway' internal adapter for the domain object is
-     * still in memory.  JDO/DataNucleus seems to bump up the version of the object prior to its deletion,
-     * which under normal circumstances would cause Causeway to throw a concurrency exception.  Therefore
-     * To prevent this from happening (ie to <i>force</i> the deletion of all instances), concurrency checking
-     * is temporarily disabled while this method is performed.
-     */
-    void deleteAll(Class<?>... pcClasses);
-
-    // -- QUERIES
-
-    /**
-     * To perform the most common use-case of executing a (type-safe) query against the specified class,
-     * filtering using the provided {@link BooleanExpression}, then automatically cloning the returned list
-     * and closing the query.
-     *
-     * <p>
-     *     Typical usage:
-     *     <pre>
-     *          final QToDoItem q = QToDoItem.candidate();
-     *          return executeQuery(ToDoItem.class,
-     *                              q.atPath.eq(atPath).and(
-     *                              q.description.indexOf(description).gt(0))
-     *                              );
-     *     </pre>
-     * </p>
-     */
-    <T> List<T> executeQuery(final Class<T> cls, final @Nullable BooleanExpression filter);
-
-    default <T> List<T> executeQuery(final Class<T> cls) {
-        return executeQuery(cls, null);
-    }
-
-    /**
-     * To perform a common use-case of executing a (type-safe) query against the specified class,
-     * filtering a unique match using the provided {@link BooleanExpression}, then returning
-     * the result and closing the query.
-     *
-     * <p>
-     *     Typical usage:
-     *     <pre>
-     *          final QToDoItem q = QToDoItem.candidate();
-     *          return executeQueryUnique(ToDoItem.class,
-     *                              q.atPath.eq(atPath).and(
-     *                              q.description.eq(description))
-     *                              );
-     *     </pre>
-     * </p>
-     */
-    <T> T executeQueryUnique(final Class<T> cls, final @Nullable BooleanExpression filter);
-
-    default <T> T executeQueryUnique(final Class<T> cls) {
-        return executeQueryUnique(cls, null);
-    }
-
-    /**
-     * To support the execution of type-safe queries using DataNucleus' lower-level APIs
-     * (eg for group by and so on).
-     *
-     * <p>
-     *     Responsibility for cloning any result sets and closing the query is the responsibility
-     *     of the caller.
-     * </p>
-     */
-    <T> JDOQLTypedQuery<T> newTypesafeQuery(Class<T> cls);
-
-    // -- UTILITY
-
-    /**
-     * Fetch Optimization
-     * <p>
-     * From <a href="http://www.datanucleus.org/products/accessplatform/jdo/query.html">DN-5.2</a> ...
-     * <p>
-     * For RDBMS any single-valued member will be fetched in the original SQL query, but with
-     * multiple-valued members this is not supported. However what will happen is that any
-     * collection/array field will be retrieved in a single SQL query for all candidate objects
-     * (by default using an EXISTS subquery); this avoids the "N+1" problem, resulting in 1 original
-     * SQL query plus 1 SQL query per collection member. Note that you can disable this by either
-     * not putting multi-valued fields in the FetchPlan, or by setting the query extension
-     * datanucleus.rdbms.query.multivaluedFetch to none (default is "exists" using the single SQL per field).
-     */
-    default void disableMultivaluedFetch(JDOQLTypedQuery<?> query) {
-        query.extension(RDBMSPropertyNames.PROPERTY_RDBMS_QUERY_MULTIVALUED_FETCH, "none");
-    }
-
-    /**
-     * Fetch Optimization
-     * @param query
-     */
-    default void disableMultivaluedFetch(Query<?> query) {
-        query.addExtension(RDBMSPropertyNames.PROPERTY_RDBMS_QUERY_MULTIVALUED_FETCH, "none");
-    }
-
-    // -- SHORTCUTS
-
-    default PersistenceManager getPersistenceManager() {
-        return getPersistenceManagerFactory().getPersistenceManager();
-    }
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/AddressLine.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/AddressLine.java
deleted file mode 100644
index c47a4ccd1d7..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/AddressLine.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for a mandatory {@link String} property or parameter representing a line of an address.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = AddressLine.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = AddressLine.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = AddressLine.MAX_LENGTH, allowsNull = "false")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface AddressLine {
-
-    int MAX_LENGTH = 100;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.MANDATORY;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.MANDATORY;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "false";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-}
\ No newline at end of file
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Description.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Description.java
deleted file mode 100644
index 26eec33b91c..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Description.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for an optional {@link String} property or parameter representing a
- * description of some sort.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = Description.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL
-)
-@PropertyLayout(
-        multiLine = Description.MULTI_LINE
-)
-@Parameter(
-        maxLength = Description.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL
-)
-@ParameterLayout(
-        multiLine = Description.MULTI_LINE
-)
-@javax.jdo.annotations.Column(length = Description.MAX_LENGTH, allowsNull = "true")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Description {
-
-    int MAX_LENGTH = 254;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.OPTIONAL;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.OPTIONAL;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "true";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-    int MULTI_LINE = 1;
-    @AliasFor( annotation =  PropertyLayout.class, attribute = "multiLine")
-    int propertyLayoutMultiLine() default MULTI_LINE;
-    @AliasFor( annotation =  ParameterLayout.class, attribute = "multiLine")
-    int parameterLayoutMultiLine() default MULTI_LINE;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Email.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Email.java
deleted file mode 100644
index 52b75b84daf..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Email.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for an optional {@link String} property or parameter representing an
- * email address.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = Email.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL,
-        regexPattern = Email.REGEX_PATTERN,
-        regexPatternReplacement = Email.REGEX_PATTERN_REPLACEMENT
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = Email.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL,
-        regexPattern = Email.REGEX_PATTERN,
-        regexPatternReplacement = Email.REGEX_PATTERN_REPLACEMENT
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = Email.MAX_LENGTH, allowsNull = "true")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Email {
-
-    /**
-     * See <a href="http://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address">maximum length of an email address</a>.
-     */
-    int MAX_LENGTH = 254;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.OPTIONAL;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.OPTIONAL;
-
-    /**
-     * as per http://emailregex.com/
-     */
-    String REGEX_PATTERN = "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f]) [...]
-    @AliasFor( annotation =  Property.class, attribute = "regexPattern")
-    String propertyRegexPattern() default REGEX_PATTERN;
-    @AliasFor( annotation =  Parameter.class, attribute = "regexPattern")
-    String parameterRegexPattern() default REGEX_PATTERN;
-
-    String REGEX_PATTERN_REPLACEMENT = "Email address is badly formed";
-    @AliasFor( annotation =  Property.class, attribute = "regexPatternReplacement")
-    String propertyRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-    @AliasFor( annotation =  Parameter.class, attribute = "regexPatternReplacement")
-    String parameterRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "true";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Fqcn.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Fqcn.java
deleted file mode 100644
index 9969806a9a0..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Fqcn.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for a {@link String} property or parameter representing a
- * fully qualified class name
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = Fqcn.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = Fqcn.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = Fqcn.MAX_LENGTH, allowsNull = "false")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Fqcn {
-
-    int MAX_LENGTH = 254;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.MANDATORY;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.MANDATORY;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "false";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/LogicalTypeName.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/LogicalTypeName.java
deleted file mode 100644
index 5a80cae52f1..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/LogicalTypeName.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.inject.Named;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for a mandatory {@link String} property or parameter representing a
- * logical type name of a domain object (as per @{@link DomainObject#logicalTypeName()}
- * or @{@link Named#value()}) and consorts.
- *
- * @see DomainObject
- * @see Named
- * @see ObjectIdentifier
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = LogicalTypeName.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = LogicalTypeName.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = LogicalTypeName.MAX_LENGTH, allowsNull = "false")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface LogicalTypeName {
-
-    int MAX_LENGTH = 254;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.MANDATORY;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.MANDATORY;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "false";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Money.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Money.java
deleted file mode 100644
index b2caa165a7b..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Money.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for an optional {@link java.math.BigDecimal} property or parameter
- * representing a monetary amount.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        optionality = Optionality.OPTIONAL
-)
-@PropertyLayout(
-)
-@Parameter(
-        optionality = Optionality.OPTIONAL
-)
-@ParameterLayout(
-)
-@jakarta.validation.constraints.Digits(
-        integer = Money.INTEGER,
-        fraction = Money.FRACTION
-)
-@javax.jdo.annotations.Column(allowsNull = "true", length = Money.INTEGER + Money.FRACTION, scale = Money.FRACTION)
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Money {
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.OPTIONAL;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.OPTIONAL;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "true";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default Money.INTEGER + Money.FRACTION;
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "scale")
-    int columnScale() default Money.FRACTION;
-
-    int INTEGER = 10;
-    @AliasFor( annotation = jakarta.validation.constraints.Digits.class, attribute = "integer")
-    int digitsInteger() default Money.INTEGER;
-
-    int FRACTION = 2;
-    @AliasFor( annotation = jakarta.validation.constraints.Digits.class, attribute = "fraction")
-    int digitsFraction() default Money.FRACTION;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Name.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Name.java
deleted file mode 100644
index 728cf79a0b0..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Name.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for a mandatory {@link String} property or parameter representing a
- * name of some sort.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = Name.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = Name.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = Name.MAX_LENGTH, allowsNull = "false")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Name {
-
-    int MAX_LENGTH = 50;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.MANDATORY;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.MANDATORY;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "false";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-}
\ No newline at end of file
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Notes.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Notes.java
deleted file mode 100644
index 17f7ee3b7fe..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Notes.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for an optional {@link String} property or parameter representing a
- * notes or comments about some object.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = Notes.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL
-)
-@PropertyLayout(
-        multiLine = Notes.MULTI_LINE
-)
-@Parameter(
-        maxLength = Notes.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL
-)
-@ParameterLayout(
-        multiLine = Notes.MULTI_LINE
-)
-@javax.jdo.annotations.Column(length = Notes.MAX_LENGTH, allowsNull = "true")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Notes {
-
-    int MAX_LENGTH = 4000;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.OPTIONAL;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.OPTIONAL;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "true";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-    int MULTI_LINE = 10;
-    @AliasFor( annotation =  PropertyLayout.class, attribute = "multiLine")
-    int propertyLayoutMultiLine() default MULTI_LINE;
-    @AliasFor( annotation =  ParameterLayout.class, attribute = "multiLine")
-    int parameterLayoutMultiLine() default MULTI_LINE;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/ObjectIdentifier.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/ObjectIdentifier.java
deleted file mode 100644
index d2b0340d4a7..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/ObjectIdentifier.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.inject.Named;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for a mandatory {@link String} property or parameter representing a
- * the identity of a domain object (with respect to its logical type,
- * as per @{@link DomainObject#logicalTypeName()}
- * or @{@link Named#value()}) and consorts.
- *
- * @see LogicalTypeName
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = ObjectIdentifier.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = ObjectIdentifier.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = ObjectIdentifier.MAX_LENGTH, allowsNull = "false")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ObjectIdentifier {
-
-    int MAX_LENGTH = 50;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.MANDATORY;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.MANDATORY;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "false";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Percentage.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Percentage.java
deleted file mode 100644
index fba1539ec5a..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/Percentage.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for an optional {@link java.math.BigDecimal} property or parameter
- * representing a percentage amount.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        optionality = Optionality.OPTIONAL
-)
-@PropertyLayout(
-)
-@Parameter(
-        optionality = Optionality.OPTIONAL
-)
-@ParameterLayout(
-)
-@jakarta.validation.constraints.Digits(
-        integer = Percentage.INTEGER,
-        fraction = Percentage.FRACTION
-)
-@javax.jdo.annotations.Column(allowsNull = "true", length = Percentage.INTEGER + Percentage.FRACTION, scale = Percentage.FRACTION)
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Percentage {
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.OPTIONAL;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.OPTIONAL;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "true";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default Percentage.INTEGER + Percentage.FRACTION;
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "scale")
-    int columnScale() default Percentage.FRACTION;
-
-    int INTEGER = 3;
-    @AliasFor( annotation = jakarta.validation.constraints.Digits.class, attribute = "integer")
-    int digitsInteger() default Percentage.INTEGER;
-
-    int FRACTION = 2;
-    @AliasFor( annotation = jakarta.validation.constraints.Digits.class, attribute = "fraction")
-    int digitsFraction() default Percentage.FRACTION;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/PhoneNumber.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/PhoneNumber.java
deleted file mode 100644
index 004deaea43d..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/PhoneNumber.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for an optional {@link String} property or parameter representing a
- * phone number.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = PhoneNumber.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL,
-        regexPattern = PhoneNumber.REGEX_PATTERN,
-        regexPatternReplacement = PhoneNumber.REGEX_PATTERN_REPLACEMENT
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = PhoneNumber.MAX_LENGTH,
-        optionality = Optionality.OPTIONAL,
-        regexPattern = PhoneNumber.REGEX_PATTERN,
-        regexPatternReplacement = PhoneNumber.REGEX_PATTERN_REPLACEMENT
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = PhoneNumber.MAX_LENGTH, allowsNull = "true")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PhoneNumber {
-
-    int MAX_LENGTH = 20;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.OPTIONAL;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.OPTIONAL;
-
-    String REGEX_PATTERN = "[+]?[0-9 -]*";
-    @AliasFor( annotation =  Property.class, attribute = "regexPattern")
-    String propertyRegexPattern() default REGEX_PATTERN;
-    @AliasFor( annotation =  Parameter.class, attribute = "regexPattern")
-    String parameterRegexPattern() default REGEX_PATTERN;
-
-    String REGEX_PATTERN_REPLACEMENT = "Only numbers and two symbols being \"-\" and \"+\" are allowed ";
-    @AliasFor( annotation =  Property.class, attribute = "regexPatternReplacement")
-    String propertyRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-    @AliasFor( annotation =  Parameter.class, attribute = "regexPatternReplacement")
-    String parameterRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
-    String columnAllowsNull() default "true";
-    @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
-    int columnLength() default MAX_LENGTH;
-
-}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/PostalCode.java b/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/PostalCode.java
deleted file mode 100644
index 2e4a28b213c..00000000000
--- a/persistence/jdo/applib/src/main/java/org/apache/causeway/persistence/jdo/applib/types/PostalCode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.persistence.jdo.applib.types;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-
-/**
- * Meta-annotation for a mandatory {@link String} property or parameter representing a
- * postal code or zip code.
- *
- * @since 2.0 {@index}
- */
-@Property(
-        maxLength = PostalCode.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@PropertyLayout(
-)
-@Parameter(
-        maxLength = PostalCode.MAX_LENGTH,
-        optionality = Optionality.MANDATORY
-)
-@ParameterLayout(
-)
-@javax.jdo.annotations.Column(length = PostalCode.MAX_LENGTH, allowsNull = "false")
-@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostalCode {
-
-    int MAX_LENGTH = 12;
-    @AliasFor( annotation =  Property.class, attribute = "maxLength")
-    int propertyMaxLength() default MAX_LENGTH;
-    @AliasFor( annotation =  Parameter.class, attribute = "maxLength")
-    int parameterMaxLength() default MAX_LENGTH;
-
-    @AliasFor( annotation = Property.class, attribute = "optionality")
-    Optionality propertyOptionality() default Optionality.MANDATORY;
-    @AliasFor( annotation = Parameter.class, attribute = "optionality")
-    Optionality parameterOptionality() default Optionality.MANDATORY;
-
... 31510 lines suppressed ...