This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to tag saveit in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1bc8e6d8a7bd2053533e18bdee5925a9efb7d857 Author: Dan Haywood <[email protected]> AuthorDate: Mon Aug 29 10:57:27 2022 +0100 ISIS-3192: cleans up poms --- extensions/pom.xml | 200 +++++++++++++++++++++++------------------------------ testing/pom.xml | 55 ++++++++++++--- 2 files changed, 133 insertions(+), 122 deletions(-) diff --git a/extensions/pom.xml b/extensions/pom.xml index a7b46a4b7e..bc1c1156ac 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -65,73 +65,60 @@ <dependencyManagement> <dependencies> + <!-- core --> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-audittrail</artifactId> + <artifactId>isis-extensions-commandlog</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-audittrail-applib</artifactId> + <artifactId>isis-extensions-commandlog-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-audittrail-applib</artifactId> + <artifactId>isis-extensions-commandlog-applib</artifactId> <version>2.0.0-SNAPSHOT</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-audittrail-persistence-jpa</artifactId> + <artifactId>isis-extensions-commandlog-persistence-jdo</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-audittrail-persistence-jdo</artifactId> + <artifactId>isis-extensions-commandlog-persistence-jpa</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-commandlog</artifactId> + <artifactId>isis-extensions-excel</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-commandlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-commandlog-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-commandlog-persistence-jdo</artifactId> + <artifactId>isis-extensions-excel-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-commandlog-persistence-jpa</artifactId> + <artifactId>isis-extensions-excel-fixtures</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-exceldownload</artifactId> + <artifactId>isis-extensions-excel-integtests</artifactId> <version>2.0.0-SNAPSHOT</version> - <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-exceldownload-wicket-ui</artifactId> + <artifactId>isis-extensions-excel-testing</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> @@ -175,11 +162,6 @@ <artifactId>isis-extensions-executionoutbox-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-executionoutbox-dto</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> <artifactId>isis-extensions-executionoutbox-persistence-jdo</artifactId> @@ -190,11 +172,6 @@ <artifactId>isis-extensions-executionoutbox-persistence-jpa</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-executionoutbox-restapi</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> <artifactId>isis-extensions-executionoutbox-restclient</artifactId> @@ -215,231 +192,251 @@ <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-excel</artifactId> + <artifactId>isis-extensions-flyway</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-excel-applib</artifactId> + <artifactId>isis-extensions-flyway-impl</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-excel-testing</artifactId> + <artifactId>isis-extensions-quartz</artifactId> <version>2.0.0-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-excel-fixtures</artifactId> + <artifactId>isis-extensions-quartz-impl</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + + + <!-- security --> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-excel-integtests</artifactId> + <artifactId>isis-extensions-audittrail</artifactId> <version>2.0.0-SNAPSHOT</version> + <type>pom</type> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-flyway</artifactId> + <artifactId>isis-extensions-audittrail-applib</artifactId> <version>2.0.0-SNAPSHOT</version> - <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-flyway-impl</artifactId> + <artifactId>isis-extensions-audittrail-applib</artifactId> <version>2.0.0-SNAPSHOT</version> + <scope>test</scope> + <type>test-jar</type> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-fullcalendar</artifactId> + <artifactId>isis-extensions-audittrail-persistence-jpa</artifactId> <version>2.0.0-SNAPSHOT</version> - <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-fullcalendar-applib</artifactId> + <artifactId>isis-extensions-audittrail-persistence-jdo</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-fullcalendar-wicket</artifactId> + <artifactId>isis-extensions-secman</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-fullcalendar-wicket-integration</artifactId> + <artifactId>isis-extensions-secman-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-fullcalendar-wicket-ui</artifactId> + <artifactId>isis-extensions-secman-applib</artifactId> + <scope>test</scope> + <type>test-jar</type> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-pdfjs</artifactId> + <artifactId>isis-extensions-secman-delegated-shiro</artifactId> <version>2.0.0-SNAPSHOT</version> - <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-pdfjs-applib</artifactId> + <artifactId>isis-extensions-secman-delegated-springoauth2</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-pdfjs-fixtures</artifactId> + <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-pdfjs-metamodel</artifactId> + <artifactId>isis-extensions-secman-encryption-spring</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-pdfjs-wicket</artifactId> + <artifactId>isis-extensions-secman-integration</artifactId> <version>2.0.0-SNAPSHOT</version> - <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-pdfjs-wicket-integration</artifactId> + <artifactId>isis-extensions-secman-persistence-jdo</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-pdfjs-wicket-ui</artifactId> + <artifactId>isis-extensions-secman-persistence-jpa</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-quartz</artifactId> + <artifactId>isis-extensions-sessionlog</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-quartz-impl</artifactId> + <artifactId>isis-extensions-sessionlog-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman</artifactId> + <artifactId>isis-extensions-sessionlog-applib</artifactId> <version>2.0.0-SNAPSHOT</version> - <type>pom</type> + <scope>test</scope> + <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-applib</artifactId> + <artifactId>isis-extensions-sessionlog-persistence-jpa</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-applib</artifactId> - <scope>test</scope> - <type>test-jar</type> + <artifactId>isis-extensions-sessionlog-persistence-jdo</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-integration</artifactId> + <artifactId>isis-extensions-shiro-realm-ldap</artifactId> <version>2.0.0-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId> + <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-encryption-spring</artifactId> + <artifactId>isis-extensions-spring-security-oauth2</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + + + <!-- vro --> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-persistence-jdo</artifactId> + <artifactId>isis-extensions-cors</artifactId> <version>2.0.0-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-persistence-jpa</artifactId> + <artifactId>isis-extensions-cors-impl</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + + + <!-- vw --> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-delegated-shiro</artifactId> + <artifactId>isis-extensions-exceldownload</artifactId> <version>2.0.0-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-delegated-springoauth2</artifactId> + <artifactId>isis-extensions-exceldownload-wicket-ui</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-shiro-realm-ldap</artifactId> + <artifactId>isis-extensions-fullcalendar</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId> + <artifactId>isis-extensions-fullcalendar-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-sessionlog</artifactId> + <artifactId>isis-extensions-fullcalendar-wicket</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-sessionlog-applib</artifactId> + <artifactId>isis-extensions-fullcalendar-wicket-integration</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-sessionlog-applib</artifactId> + <artifactId>isis-extensions-fullcalendar-wicket-ui</artifactId> <version>2.0.0-SNAPSHOT</version> - <scope>test</scope> - <type>test-jar</type> </dependency> + <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-sessionlog-persistence-jpa</artifactId> + <artifactId>isis-extensions-pdfjs</artifactId> <version>2.0.0-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-sessionlog-persistence-jdo</artifactId> + <artifactId>isis-extensions-pdfjs-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-cors</artifactId> + <artifactId>isis-extensions-pdfjs-fixtures</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.isis.extensions</groupId> + <artifactId>isis-extensions-pdfjs-metamodel</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.isis.extensions</groupId> + <artifactId>isis-extensions-pdfjs-wicket</artifactId> <version>2.0.0-SNAPSHOT</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-cors-impl</artifactId> + <artifactId>isis-extensions-pdfjs-wicket-integration</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-spring-security-oauth2</artifactId> + <artifactId>isis-extensions-pdfjs-wicket-ui</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> @@ -465,30 +462,9 @@ <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-fixtures</artifactId> - <version>2.0.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-fixtures-applib</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - - </dependencies> </dependencyManagement> - <dependencies> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <modules> <module>core/commandlog</module> diff --git a/testing/pom.xml b/testing/pom.xml index 5cc662cd36..ab7f5e1e7d 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -65,6 +65,11 @@ <!-- this module --> + <dependency> + <groupId>org.apache.isis.testing</groupId> + <artifactId>isis-testing-archtestsupport</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.isis.testing</groupId> <artifactId>isis-testing-archtestsupport-applib</artifactId> @@ -73,23 +78,31 @@ <dependency> <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-integtestsupport-applib</artifactId> - <type>jar</type> + <artifactId>isis-testing-fakedata</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-h2console-ui</artifactId> + <artifactId>isis-testing-fakedata-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-hsqldbmgr-ui</artifactId> + <artifactId>isis-testing-fakedata-fixtures</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.isis.testing</groupId> + <artifactId>isis-testing-fakedata-integtests</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.isis.testing</groupId> + <artifactId>isis-testing-fixtures</artifactId> + <version>2.0.0-SNAPSHOT</version> + <type>pom</type> + </dependency> <dependency> <groupId>org.apache.isis.testing</groupId> <artifactId>isis-testing-fixtures-applib</artifactId> @@ -98,26 +111,48 @@ <dependency> <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-specsupport-applib</artifactId> + <artifactId>isis-testing-h2console</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.isis.testing</groupId> + <artifactId>isis-testing-h2console-ui</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-fakedata-applib</artifactId> + <artifactId>isis-testing-integtestsupport</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-fakedata-fixtures</artifactId> + <artifactId>isis-testing-integtestsupport-applib</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.apache.isis.testing</groupId> - <artifactId>isis-testing-fakedata-integtests</artifactId> + <artifactId>isis-testing-hsqldbmgr-ui</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.isis.testing</groupId> + <artifactId>isis-testing-specsupport</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.isis.testing</groupId> + <artifactId>isis-testing-specsupport-applib</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.isis.testing</groupId> + <artifactId>isis-testing-unittestsupport</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.isis.testing</groupId> <artifactId>isis-testing-unittestsupport-applib</artifactId>
