This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
commit e5c9fa363239556ab39866b3fbdc5db95fe121d7 Merge: 59f04fcaff b4e1b03f1c Author: Andi Huber <[email protected]> AuthorDate: Fri Jan 13 20:11:52 2023 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../setupguide/modules/eclipse/pages/about.adoc | 197 +-- .../applib/util/schema/InteractionDtoUtils.java | 2 +- .../util/schema/MemberExecutionDtoUtils.java | 22 +- .../applib/util/JaxbUtilsDtoCloneTest.java | 83 ++ bom/current-hierarchy.drawio.png | Bin 136479 -> 0 bytes bom/pom.xml | 1288 +++++++++++++++++++- .../causeway/commons/internal/base/_Bytes.java | 69 +- core/pom.xml | 286 +---- .../plural/DomainObjectLayoutPluralVm.java | 19 +- extensions/pom.xml | 391 ------ extensions/vro/cors/pom.xml | 10 - mavendeps/pom.xml | 50 +- .../subscriber/ExecutionSubscriberForTesting.java | 6 +- security/shiro/pom.xml | 29 +- .../modules/parent-pom/attachments/parent-pom.pptx | Bin 49485 -> 0 bytes .../parent-pom/images/current-hierarchy.drawio.png | Bin 0 -> 142027 bytes .../parent-pom/images/parent-pom.drawio.svg | 4 - .../parent-pom/images/pom-hierarchy.drawio.png | Bin 0 -> 184350 bytes starters/adoc/modules/parent-pom/pages/about.adoc | 4 +- starters/pom.xml | 129 +- testing/pom.xml | 102 -- valuetypes/markdown/pom.xml | 13 - valuetypes/pom.xml | 131 +- 23 files changed, 1683 insertions(+), 1152 deletions(-) diff --cc bom/pom.xml index 0f10daa9af,e8690f7aeb..36f5fd48b1 --- a/bom/pom.xml +++ b/bom/pom.xml @@@ -101,11 -100,8 +100,8 @@@ It is therefore a copy of org.apache:ap <cucumber.version>7.11.0</cucumber.version> - <cxf-rt-rs-client.version>3.5.5</cxf-rt-rs-client.version> + <cxf-rt-rs-client.version>4.0.0</cxf-rt-rs-client.version> - <danhaywood-java-assertjext.version>0.1.0</danhaywood-java-assertjext.version> - <danhaywood-java-testsupport.version>1.0.0</danhaywood-java-testsupport.version> - <datanucleus-api-jdo.version>6.0.1</datanucleus-api-jdo.version> <datanucleus-api-jpa.version>6.0.1</datanucleus-api-jpa.version> <datanucleus-core.version>6.0.3</datanucleus-core.version> @@@ -200,10 -187,11 +196,10 @@@ <wicket-webjars.version>3.0.6</wicket-webjars.version> <wicket-viewer-jquery.version>3.6.3</wicket-viewer-jquery.version> <!-- as served by wicket via webjars --> - <wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 --> - <wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version> + <wicketstuff.version>9.12.0</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 --> <!-- OTHER --> - + <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName> <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl> <organization.logo>https://www.apache.org/images/asf_logo_wide_2016.png</organization.logo> @@@ -234,8 -222,1236 +230,1236 @@@ [6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes> </properties> <dependencyManagement> - <dependencies> - <dependency> + + + <dependencies> + + <!-- + bill of materials of ALL of the modules making up the framework + --> + + <!-- org.apache.causeway.commons --> + + <dependency> + <groupId>org.apache.causeway.commons</groupId> + <artifactId>causeway-commons</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.core --> + + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-schema</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-codegen-bytebuddy</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-privileged</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-config</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-interaction</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-internaltestsupport</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-metamodel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-runtime</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-runtimeservices</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-security</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-transaction</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.core</groupId> + <artifactId>causeway-core-webapp</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.persistence --> + + <dependency> + <groupId>org.apache.causeway.persistence</groupId> + <artifactId>causeway-persistence-commons</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.persistence</groupId> + <artifactId>causeway-persistence-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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>2.0.0-SNAPSHOT</version> ++ <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>2.0.0-SNAPSHOT</version> ++ <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>2.0.0-SNAPSHOT</version> ++ <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>2.0.0-SNAPSHOT</version> ++ <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>2.0.0-SNAPSHOT</version> ++ <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>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.persistence</groupId> + <artifactId>causeway-persistence-jpa-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.persistence</groupId> + <artifactId>causeway-persistence-jpa-metamodel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.persistence</groupId> + <artifactId>causeway-persistence-jpa-integration</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.persistence</groupId> + <artifactId>causeway-persistence-jpa-eclipselink</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.security --> + + <dependency> + <groupId>org.apache.causeway.security</groupId> + <artifactId>causeway-security-bypass</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.security</groupId> + <artifactId>causeway-security-keycloak</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.security</groupId> + <artifactId>causeway-security-shiro</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.security</groupId> + <artifactId>causeway-security-spring</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.viewer --> + + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-commons</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-commons-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-commons-model</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-commons-prism</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-commons-services</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-restfulobjects</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-restfulobjects-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-restfulobjects-rendering</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-restfulobjects-viewer</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-restfulobjects-testing</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-wicket</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-wicket-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-wicket-graceful</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-wicket-model</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-wicket-ui</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.viewer</groupId> + <artifactId>causeway-viewer-wicket-viewer</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.testing --> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-fixtures</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-fixtures-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-unittestsupport</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-unittestsupport-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-integtestsupport</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-integtestsupport-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-specsupport</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-specsupport-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-archtestsupport</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-archtestsupport-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-fakedata</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-fakedata-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-fakedata-fixtures</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-fakedata-integtests</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-h2console</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-h2console-ui</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-hsqldbmgr</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.testing</groupId> + <artifactId>causeway-testing-hsqldbmgr-ui</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.mavendeps --> + <dependency> + <groupId>org.apache.causeway.mavendeps</groupId> + <artifactId>causeway-mavendeps-webapp</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.extensions (commandlog) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-commandlog</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-commandlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-commandlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-commandlog-persistence-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (excel) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-excel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-excel-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-excel-fixtures</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-excel-integtests</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-excel-testing</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (executionlog) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionlog</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionlog-persistence-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (executionoutbox) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionoutbox</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionoutbox-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionoutbox-restclient</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (executionrepublisher) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionrepublisher</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-executionoutrepublisher-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (flyway) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-flyway</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-flyway-impl</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (audittrail) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-audittrail</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-audittrail-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-audittrail-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-audittrail-persistence-jpa</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-audittrail-persistence-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (secman) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman-delegated-shiro</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman-delegated-springoauth2</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman-encryption-jbcrypt</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman-encryption-spring</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-secman-integration</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (sessionlog) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sessionlog</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sessionlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sessionlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sessionlog-persistence-jpa</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sessionlog-persistence-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (shiro) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-shiro-realm-ldap</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-shiro-realm-ldap-impl</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (spring security) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-spring-security-oauth2</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (restful objects viewer) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-cors</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-cors-impl</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- org.apache.causeway.extensions (wicket viewer) --> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-exceldownload</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-exceldownload-wicket-ui</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-fullcalendar</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-fullcalendar-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-fullcalendar-wicket</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-fullcalendar-wicket-integration</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-fullcalendar-wicket-ui</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-pdfjs</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-pdfjs-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-pdfjs-fixtures</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-pdfjs-metamodel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-pdfjs-wicket</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-pdfjs-wicket-integration</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-pdfjs-wicket-ui</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sse</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sse-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sse-metamodel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.extensions</groupId> + <artifactId>causeway-extensions-sse-wicket</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.valuetypes --> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-jodatime</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-jodatime-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-jodatime-integration</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-asciidoc</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-asciidoc-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-asciidoc-metamodel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-asciidoc-ui-vaa</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-asciidoc-ui-wkt</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-markdown</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-markdown-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-markdown-metamodel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-markdown-ui-wkt</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-vega</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-vega-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-vega-metamodel</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-vega-ui-vaa</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.valuetypes</groupId> + <artifactId>causeway-valuetypes-vega-ui-wkt</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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-jdo</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <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> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + <!-- org.apache.causeway.incubator.viewer --> + <dependency> + <groupId>org.apache.causeway.incubator.viewer</groupId> + <artifactId>causeway-viewer-graphql</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.incubator.viewer</groupId> + <artifactId>causeway-viewer-graphql-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.incubator.viewer</groupId> + <artifactId>causeway-viewer-graphql-model</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.causeway.incubator.viewer</groupId> + <artifactId>causeway-viewer-graphql-viewer</artifactId> - <version>2.0.0-SNAPSHOT</version> ++ <version>3.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + + + <!-- other dependencies --> + + <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>${maven.plugin.tools.version}</version> @@@ -267,9 -1483,9 +1491,9 @@@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.3.7</version> <!-- do not upgrade 2.x to 3.x or higher until Spring 6 --> + <version>4.0.1</version> </dependency> - + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> @@@ -1127,7 -2320,7 +2339,7 @@@ <!-- required for DN plugin.xml loading --> <Bundle-SymbolicName>${jar-plugin.automaticModuleName}</Bundle-SymbolicName> <!-- no requirement as of yet. <Bundle-ManifestVersion>2</Bundle-ManifestVersion> -- <Bundle-Name>${jar-plugin.automaticModuleName}</Bundle-Name> <Bundle-Version>2.0.0-SNAPSHOT</Bundle-Version> ++ <Bundle-Name>${jar-plugin.automaticModuleName}</Bundle-Name> <Bundle-Version>3.0.0-SNAPSHOT</Bundle-Version> <Bundle-Vendor>Apache Causeway™ Project</Bundle-Vendor> --> </manifestEntries> </archive> diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java index d92930075a,8a7861fb68..27e741442b --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.java @@@ -18,14 -18,19 +18,19 @@@ */ package demoapp.dom.domain.objects.DomainObjectLayout.plural; + import java.util.List; + import java.util.UUID; + -import javax.inject.Named; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.DomainObject; + import org.apache.causeway.applib.annotation.DomainObjectLayout; import org.apache.causeway.applib.annotation.Nature; import org.apache.causeway.applib.annotation.ObjectSupport; import org.apache.causeway.applib.annotation.Optionality; diff --cc security/shiro/pom.xml index f7f0e0b0b8,6e56a9bb1d..118391ed61 --- a/security/shiro/pom.xml +++ b/security/shiro/pom.xml @@@ -39,25 -39,11 +39,13 @@@ <!-- apache shiro is not migrated to JPMS yet, so no point in converting ours to JPMS --> <jar-plugin.automaticModuleName>org.apache.causeway.security.shiro</jar-plugin.automaticModuleName> <git-plugin.propertiesDir>org/apache/causeway/security/shiro</git-plugin.propertiesDir> + + <!-- override surefire defaults from bom, as this is not a Java module yet --> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> - - <dependencyManagement> - <!-- for benefit of application developers, using scope=import --> - <dependencies> - <dependency> - <groupId>org.apache.causeway.security</groupId> - <artifactId>causeway-security-shiro</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - </dependencyManagement> -- <dependencies> - + <dependency> <groupId>org.apache.causeway.core</groupId> <artifactId>causeway-core-runtime</artifactId>
