You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/07/20 07:41:28 UTC
[isis] branch ISIS-2348 updated: ISIS-2348 gradle build incl. demo
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2348
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2348 by this push:
new 7d2308b ISIS-2348 gradle build incl. demo
7d2308b is described below
commit 7d2308b9b127838fcf174fa22cde5555d76299ed
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Mon Jul 20 09:41:04 2020 +0200
ISIS-2348 gradle build incl. demo
---
examples/demo/domain/build.gradle | 20 +-
examples/demo/wicket/build.gradle | 24 +-
examples/smoketests/stable/build.gradle | 22 +-
extensions/core/model-annotation/build.gradle | 2 +-
extensions/security/secman/api/build.gradle | 2 +-
.../secman/encryption-jbcrypt/build.gradle | 2 +-
extensions/security/secman/model/build.gradle | 2 +-
.../security/secman/persistence-jdo/build.gradle | 8 +-
.../security/secman/shiro-realm/build.gradle | 2 +-
extensions/vw/exceldownload/ui/build.gradle | 2 +-
extensions/vw/fullcalendar/ui/build.gradle | 4 +-
extensions/vw/pdfjs/metamodel/build.gradle | 2 +-
extensions/vw/pdfjs/ui/build.gradle | 4 +-
legacy/extensions/core/applib/build.gradle | 2 +-
legacy/extensions/core/commons/build.gradle | 2 +-
legacy/extensions/core/metamodel/build.gradle | 2 +-
legacy/extensions/core/runtime/build.gradle | 6 +-
persistence/jdo/datanucleus-5/build.gradle | 2 +-
persistence/jpa/model/build.gradle | 2 +-
settings.gradle | 382 +++++++++++----------
subdomains/base/applib/build.gradle | 2 +-
subdomains/excel/applib/build.gradle | 2 +-
subdomains/excel/fixture/build.gradle | 8 +-
subdomains/excel/integtests/build.gradle | 8 +-
subdomains/excel/testing/build.gradle | 2 +-
subdomains/xdocreport/applib/build.gradle | 2 +-
testing/fakedata/applib/build.gradle | 2 +-
testing/fakedata/fixtures/build.gradle | 6 +-
testing/fakedata/integtests/build.gradle | 6 +-
testing/fixtures/applib/build.gradle | 6 +-
testing/integtestsupport/applib/build.gradle | 2 +-
testing/specsupport/applib/build.gradle | 2 +-
testing/unittestsupport/applib/build.gradle | 4 +-
valuetypes/asciidoc/ui/vaadin/build.gradle | 2 +-
valuetypes/asciidoc/ui/wicket/build.gradle | 6 +-
valuetypes/markdown/persistence/build.gradle | 2 +-
.../markdown/persistence/jdo-dn5/build.gradle | 11 +-
valuetypes/markdown/ui/build.gradle | 4 +-
valuetypes/markdown/ui/wicket/build.gradle | 20 ++
valuetypes/sse/applib/build.gradle | 2 +-
valuetypes/sse/metamodel/build.gradle | 2 +-
valuetypes/sse/ui/build.gradle | 4 +-
valuetypes/sse/ui/wicket/build.gradle | 4 +-
viewers/wicket/model/build.gradle | 2 +-
viewers/wicket/ui/build.gradle | 2 +-
viewers/wicket/viewer/build.gradle | 2 +-
46 files changed, 315 insertions(+), 294 deletions(-)
diff --git a/examples/demo/domain/build.gradle b/examples/demo/domain/build.gradle
index 04a8140..15c5ed1 100644
--- a/examples/demo/domain/build.gradle
+++ b/examples/demo/domain/build.gradle
@@ -17,19 +17,19 @@ apply plugin: "org.rm3l.datanucleus-gradle-plugin"
dependencies {
compile project(':isis-applib')
compile project(':isis-core-commons')
- compile project(':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
- compile project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
+ compile project(':isis-testing-fixtures-applib')
+ compile project(':isis-valuetypes-asciidoc-applib')
+ compile project(':isis-valuetypes-markdown-applib')
// ISIS-2374 compile('commons-httpclient:commons-httpclient:3.1') // did not work for me
compile(Libs.httpClient)
- compile project(':isis-extensions:isis-extensions-exceldownload:isis-extensions-exceldownload-ui')
- compile project(':isis-testing:isis-testing-h2console:isis-testing-h2console-ui')
+ compile project(':isis-extensions-exceldownload:isis-extensions-exceldownload-ui')
+ compile project(':isis-testing-h2console:isis-testing-h2console-ui')
compile project(':isis-viewer-restfulobjects:isis-viewer-restfulobjects-jaxrsresteasy4')
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt')
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-persistence-jdo')
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-shiro-realm')
- compile project(':isis-extensions:isis-extensions-modelannotation')
- compile project(':isis-valuetypes:isis-valuetypes-sse-applib')
+ compile project(':isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt')
+ compile project(':isis-extensions-secman:isis-extensions-secman-persistence-jdo')
+ compile project(':isis-extensions-secman:isis-extensions-secman-shiro-realm')
+ compile project(':isis-extensions-modelannotation')
+ compile project(':isis-valuetypes-sse-applib')
}
diff --git a/examples/demo/wicket/build.gradle b/examples/demo/wicket/build.gradle
index 904aa97..80285ad 100644
--- a/examples/demo/wicket/build.gradle
+++ b/examples/demo/wicket/build.gradle
@@ -3,21 +3,23 @@ description = 'Apache Isis App - Demo (Wicket)'
apply plugin: 'war'
dependencies {
- compile project(':isis-app-starter-parent:demo-parent:demo-domain')
+ compile project(':demo-parent:demo-domain')
compile project(':isis-applib')
compile project(':isis-core-commons')
- compile project(':isis-mavendeps:isis-mavendeps-webapp')
+ compile project(':isis-mavendeps-webapp')
compile project(':isis-valuetypes-asciidoc-metamodel')
compile project(':isis-valuetypes-asciidoc-persistence-jdo-dn5')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-wkt')
- compile project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
- compile project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-ui')
- compile project(':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-ui')
- compile project(':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-ui:isis-valuetypes-sse-ui-wkt')
- compile project(':isis-viewer-wicket:isis-viewer-wicket-viewer')
+ compile project(':isis-valuetypes-markdown-persistence-jdo-dn5')
+ compile project(':isis-valuetypes-asciidoc')
+ compile project(':isis-valuetypes-asciidoc-applib')
+ compile project(':isis-valuetypes-asciidoc-ui')
+ compile project(':isis-valuetypes-asciidoc-ui-wkt')
+ compile project(':isis-valuetypes-markdown-applib')
+ compile project(':isis-valuetypes-markdown-ui')
+ compile project(':isis-valuetypes-markdown-ui-wkt')
+ compile project(':isis-valuetypes-sse-ui')
+ compile project(':isis-valuetypes-sse-ui-wkt')
+ compile project(':isis-viewer-wicket-viewer')
compile(Libs.springBootStarterLog4j2) {
exclude(module: 'slf4j-api')
}
diff --git a/examples/smoketests/stable/build.gradle b/examples/smoketests/stable/build.gradle
index 0cf708c..f746625 100644
--- a/examples/smoketests/stable/build.gradle
+++ b/examples/smoketests/stable/build.gradle
@@ -28,26 +28,26 @@ sourceSets {
}
dependencies {
- compile project(':isis-mavendeps:isis-mavendeps-webapp')
- compile project(':isis-mavendeps:isis-mavendeps-jdk11')
+ compile project(':isis-mavendeps-webapp')
+ compile project(':isis-mavendeps-jdk11')
compile project(':isis-security-shiro')
compile project(':isis-viewer-restfulobjects:isis-viewer-restfulobjects-viewer')
compile project(':isis-viewer-restfulobjects:isis-viewer-restfulobjects-jaxrsresteasy4')
- compile project(':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
- compile project(':isis-mappings:isis-mappings-restclient-api')
- compile project(':isis-extensions:isis-extensions-modelannotation')
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-model')
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt')
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-persistence-jdo')
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-shiro-realm')
- compile project(':isis-extensions:isis-extensions-shiro-realm-ldap:isis-extensions-shiro-realm-ldap-impl')
+ compile project(':isis-testing-fixtures-applib')
+ compile project(':isis-mappings-restclient-api')
+ compile project(':isis-extensions-modelannotation')
+ compile project(':isis-extensions-secman:isis-extensions-secman-model')
+ compile project(':isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt')
+ compile project(':isis-extensions-secman:isis-extensions-secman-persistence-jdo')
+ compile project(':isis-extensions-secman:isis-extensions-secman-shiro-realm')
+ compile project(':isis-extensions-shiro-realm-ldap:isis-extensions-shiro-realm-ldap-impl')
compile(Libs.springDataJpa)
testCompile(Libs.jerseySpring5) {
exclude(module: 'jersey-server')
}
testCompile(Libs.javaxJson)
testCompile(Libs.moxy)
- testCompile project(':isis-mavendeps:isis-mavendeps-integtests')
+ testCompile project(':isis-mavendeps-integtests')
testCompile(Libs.apachedsTestFramework)
}
diff --git a/extensions/core/model-annotation/build.gradle b/extensions/core/model-annotation/build.gradle
index 8b5c527..86aea2c 100644
--- a/extensions/core/model-annotation/build.gradle
+++ b/extensions/core/model-annotation/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
dependencies {
compile project(':isis-core-metamodel')
providedCompile project(':isis-core-webapp')
- providedCompile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ providedCompile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/extensions/security/secman/api/build.gradle b/extensions/security/secman/api/build.gradle
index 9fb0001..065e3b9 100644
--- a/extensions/security/secman/api/build.gradle
+++ b/extensions/security/secman/api/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'war'
dependencies {
compile project(':isis-core-commons')
compile project(':isis-applib')
- compile project(':isis-extensions:isis-extensions-secman')
+ compile project(':isis-extensions-secman')
compile project(':isis-core-metamodel')
}
diff --git a/extensions/security/secman/encryption-jbcrypt/build.gradle b/extensions/security/secman/encryption-jbcrypt/build.gradle
index e5e6389..bae9e82 100644
--- a/extensions/security/secman/encryption-jbcrypt/build.gradle
+++ b/extensions/security/secman/encryption-jbcrypt/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
dependencies {
compile(Libs.jbcrypt)
providedCompile project(':isis-core-runtime')
- providedCompile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-api')
+ providedCompile project(':isis-extensions-secman:isis-extensions-secman-api')
}
task packageTests(type: Jar) {
diff --git a/extensions/security/secman/model/build.gradle b/extensions/security/secman/model/build.gradle
index c52ed64..abbe689 100644
--- a/extensions/security/secman/model/build.gradle
+++ b/extensions/security/secman/model/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.extensions'
description = 'Apache Isis Ext - Sec Man Model'
apply plugin: 'war'
dependencies {
- compile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-api')
+ compile project(':isis-extensions-secman:isis-extensions-secman-api')
providedCompile project(':isis-core-runtime')
}
diff --git a/extensions/security/secman/persistence-jdo/build.gradle b/extensions/security/secman/persistence-jdo/build.gradle
index 14ec4ed..06f3e20 100644
--- a/extensions/security/secman/persistence-jdo/build.gradle
+++ b/extensions/security/secman/persistence-jdo/build.gradle
@@ -2,11 +2,11 @@ group = 'org.apache.isis.extensions'
description = 'Apache Isis Ext - Sec Man Persistence (Using JDO)'
apply plugin: 'war'
dependencies {
- compile project(':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
- providedCompile project(':isis-persistence-jdo:isis-persistence-jdo-datanucleus5')
+ compile project(':isis-testing-fixtures-applib')
+ providedCompile project(':isis-persistence-jdo-datanucleus5')
providedCompile project(':isis-core-runtime')
- providedCompile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-api')
- providedCompile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-model')
+ providedCompile project(':isis-extensions-secman:isis-extensions-secman-api')
+ providedCompile project(':isis-extensions-secman:isis-extensions-secman-model')
}
task packageTests(type: Jar) {
diff --git a/extensions/security/secman/shiro-realm/build.gradle b/extensions/security/secman/shiro-realm/build.gradle
index bbe6966..181be60 100644
--- a/extensions/security/secman/shiro-realm/build.gradle
+++ b/extensions/security/secman/shiro-realm/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
dependencies {
providedCompile project(':isis-security-shiro')
providedCompile project(':isis-core-runtime')
- providedCompile project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-api')
+ providedCompile project(':isis-extensions-secman:isis-extensions-secman-api')
}
task packageTests(type: Jar) {
diff --git a/extensions/vw/exceldownload/ui/build.gradle b/extensions/vw/exceldownload/ui/build.gradle
index fac88c9..f8d7059 100644
--- a/extensions/vw/exceldownload/ui/build.gradle
+++ b/extensions/vw/exceldownload/ui/build.gradle
@@ -6,7 +6,7 @@ dependencies {
exclude(module: 'commons-collections4')
}
compile(Libs.poiOoxmlSchemas)
- providedCompile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ providedCompile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/extensions/vw/fullcalendar/ui/build.gradle b/extensions/vw/fullcalendar/ui/build.gradle
index cc5e427..4509a9b 100644
--- a/extensions/vw/fullcalendar/ui/build.gradle
+++ b/extensions/vw/fullcalendar/ui/build.gradle
@@ -1,8 +1,8 @@
group = 'org.apache.isis.extensions'
description = 'Apache Isis Ext - Wicket Viewer - fullcalendar (ui)'
dependencies {
- compile project(':isis-extensions:isis-extensions-fullcalendar:isis-extensions-fullcalendar-applib')
- compile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ compile project(':isis-extensions-fullcalendar:isis-extensions-fullcalendar-applib')
+ compile project(':isis-viewer-wicket-ui')
compile(Libs.wicketFullCalendarCore)
}
diff --git a/extensions/vw/pdfjs/metamodel/build.gradle b/extensions/vw/pdfjs/metamodel/build.gradle
index cc206cb..470812e 100644
--- a/extensions/vw/pdfjs/metamodel/build.gradle
+++ b/extensions/vw/pdfjs/metamodel/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.extensions'
description = 'Apache Isis Ext - Wicket Viewer - pdf.js (metamodel)'
dependencies {
- compile project(':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-applib')
+ compile project(':isis-extensions-pdfjs:isis-extensions-pdfjs-applib')
compile project(':isis-core-metamodel')
compile(Libs.wicketBootstrapCore)
}
diff --git a/extensions/vw/pdfjs/ui/build.gradle b/extensions/vw/pdfjs/ui/build.gradle
index 212b59e..8e961ca 100644
--- a/extensions/vw/pdfjs/ui/build.gradle
+++ b/extensions/vw/pdfjs/ui/build.gradle
@@ -1,8 +1,8 @@
group = 'org.apache.isis.extensions'
description = 'Apache Isis Ext - Wicket Viewer - pdf.js (ui)'
dependencies {
- compile project(':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-metamodel')
- compile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ compile project(':isis-extensions-pdfjs:isis-extensions-pdfjs-metamodel')
+ compile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/legacy/extensions/core/applib/build.gradle b/legacy/extensions/core/applib/build.gradle
index 2c8a241..e4f082e 100644
--- a/legacy/extensions/core/applib/build.gradle
+++ b/legacy/extensions/core/applib/build.gradle
@@ -7,7 +7,7 @@ dependencies {
compile project(':isis-core-runtime')
testCompile project(':isis-core-internaltestsupport')
compileOnly(Libs.javaxJdo)
- providedCompile project(':isis-persistence-jdo:isis-persistence-jdo-applib')
+ providedCompile project(':isis-persistence-jdo-applib')
}
task packageTests(type: Jar) {
diff --git a/legacy/extensions/core/commons/build.gradle b/legacy/extensions/core/commons/build.gradle
index aa01ded..f71a24c 100644
--- a/legacy/extensions/core/commons/build.gradle
+++ b/legacy/extensions/core/commons/build.gradle
@@ -7,7 +7,7 @@ dependencies {
compile project(':isis-core-runtime')
testCompile project(':isis-core-internaltestsupport')
compileOnly(Libs.javaxJdo)
- providedCompile project(':isis-persistence-jdo:isis-persistence-jdo-applib')
+ providedCompile project(':isis-persistence-jdo-applib')
}
task packageTests(type: Jar) {
diff --git a/legacy/extensions/core/metamodel/build.gradle b/legacy/extensions/core/metamodel/build.gradle
index a5cedd4..3e6ff69 100644
--- a/legacy/extensions/core/metamodel/build.gradle
+++ b/legacy/extensions/core/metamodel/build.gradle
@@ -8,7 +8,7 @@ dependencies {
compile project(':isis-core-metamodel')
testCompile project(':isis-core-internaltestsupport')
compileOnly(Libs.javaxJdo)
- providedCompile project(':isis-persistence-jdo:isis-persistence-jdo-applib')
+ providedCompile project(':isis-persistence-jdo-applib')
}
task packageTests(type: Jar) {
diff --git a/legacy/extensions/core/runtime/build.gradle b/legacy/extensions/core/runtime/build.gradle
index 66df3f8..c074956 100644
--- a/legacy/extensions/core/runtime/build.gradle
+++ b/legacy/extensions/core/runtime/build.gradle
@@ -8,9 +8,9 @@ dependencies {
compile project(':isis-core-runtime')
testCompile project(':isis-core-internaltestsupport')
compileOnly(Libs.javaxJdo)
- providedCompile project(':isis-persistence-jdo:isis-persistence-jdo-applib')
- providedCompile project(':isis-persistence-jdo:isis-persistence-jdo-datanucleus5')
- providedCompile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ providedCompile project(':isis-persistence-jdo-applib')
+ providedCompile project(':isis-persistence-jdo-datanucleus5')
+ providedCompile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/persistence/jdo/datanucleus-5/build.gradle b/persistence/jdo/datanucleus-5/build.gradle
index 0f1aaf5..3baae23 100644
--- a/persistence/jdo/datanucleus-5/build.gradle
+++ b/persistence/jdo/datanucleus-5/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.persistence'
description = 'Apache Isis Persistence - JDO (datanucleus 5)'
dependencies {
- compile project(':isis-persistence-jdo:isis-persistence-jdo-applib')
+ compile project(':isis-persistence-jdo-applib')
compile project(':isis-core-runtime')
compile(Libs.datanucleusCore)
implementation(Libs.datanucleusApiJdo)
diff --git a/persistence/jpa/model/build.gradle b/persistence/jpa/model/build.gradle
index e96f627..ce868f9 100644
--- a/persistence/jpa/model/build.gradle
+++ b/persistence/jpa/model/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.persistence'
description = 'Apache Isis Persistence - JPA (model)'
dependencies {
- compile project(':isis-persistence-jpa:isis-persistence-jpa-applib')
+ compile project(':isis-persistence-jpa-applib')
compile project(':isis-core-runtime')
testCompile project(':isis-core-internaltestsupport')
}
diff --git a/settings.gradle b/settings.gradle
index 9638bcd..f006383 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,9 @@
rootProject.name = 'isis-all'
+include ':demo-parent'
+include ':demo-parent:demo-domain'
+include ':demo-parent:demo-wicket'
include ':isis'
-include ':isis-app-starter-parent:demo-parent'
-include ':isis-app-starter-parent:demo-parent:demo-domain'
-include ':isis-app-starter-parent:demo-parent:demo-wicket'
-include ':isis-app-starter-parent:smoketests'
include ':isis-applib'
include ':isis-core-codegen-bytebuddy'
include ':isis-core-commons'
@@ -16,28 +15,28 @@ include ':isis-core-runtimeservices'
include ':isis-core-security'
include ':isis-core-webapp'
include ':isis-extensions'
-include ':isis-extensions:isis-extensions-cors'
-include ':isis-extensions:isis-extensions-cors:isis-extensions-cors-impl'
-include ':isis-extensions:isis-extensions-exceldownload'
-include ':isis-extensions:isis-extensions-exceldownload:isis-extensions-exceldownload-ui'
-include ':isis-extensions:isis-extensions-flyway'
-include ':isis-extensions:isis-extensions-flyway:isis-extensions-flyway-impl'
-include ':isis-extensions:isis-extensions-fullcalendar'
-include ':isis-extensions:isis-extensions-fullcalendar:isis-extensions-fullcalendar-applib'
-include ':isis-extensions:isis-extensions-fullcalendar:isis-extensions-fullcalendar-ui'
-include ':isis-extensions:isis-extensions-modelannotation'
-include ':isis-extensions:isis-extensions-pdfjs'
-include ':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-applib'
-include ':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-metamodel'
-include ':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-ui'
-include ':isis-extensions:isis-extensions-secman'
-include ':isis-extensions:isis-extensions-secman:isis-extensions-secman-api'
-include ':isis-extensions:isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt'
-include ':isis-extensions:isis-extensions-secman:isis-extensions-secman-model'
-include ':isis-extensions:isis-extensions-secman:isis-extensions-secman-persistence-jdo'
-include ':isis-extensions:isis-extensions-secman:isis-extensions-secman-shiro-realm'
-include ':isis-extensions:isis-extensions-shiro-realm-ldap'
-include ':isis-extensions:isis-extensions-shiro-realm-ldap:isis-extensions-shiro-realm-ldap-impl'
+include ':isis-extensions-cors'
+include ':isis-extensions-cors:isis-extensions-cors-impl'
+include ':isis-extensions-exceldownload'
+include ':isis-extensions-exceldownload:isis-extensions-exceldownload-ui'
+include ':isis-extensions-flyway'
+include ':isis-extensions-flyway:isis-extensions-flyway-impl'
+include ':isis-extensions-fullcalendar'
+include ':isis-extensions-fullcalendar:isis-extensions-fullcalendar-applib'
+include ':isis-extensions-fullcalendar:isis-extensions-fullcalendar-ui'
+include ':isis-extensions-modelannotation'
+include ':isis-extensions-pdfjs'
+include ':isis-extensions-pdfjs:isis-extensions-pdfjs-applib'
+include ':isis-extensions-pdfjs:isis-extensions-pdfjs-metamodel'
+include ':isis-extensions-pdfjs:isis-extensions-pdfjs-ui'
+include ':isis-extensions-secman'
+include ':isis-extensions-secman:isis-extensions-secman-api'
+include ':isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt'
+include ':isis-extensions-secman:isis-extensions-secman-model'
+include ':isis-extensions-secman:isis-extensions-secman-persistence-jdo'
+include ':isis-extensions-secman:isis-extensions-secman-shiro-realm'
+include ':isis-extensions-shiro-realm-ldap'
+include ':isis-extensions-shiro-realm-ldap:isis-extensions-shiro-realm-ldap-impl'
include ':isis-incubator'
include ':isis-incubator:isis-incubator-microprofile'
include ':isis-incubator:isis-viewer-vaadin'
@@ -51,85 +50,88 @@ include ':isis-legacy:isis-legacy-metamodel'
include ':isis-legacy:isis-legacy-restclient'
include ':isis-legacy:isis-legacy-runtime'
include ':isis-mappings'
-include ':isis-mappings:isis-mappings-jaxrsclient'
-include ':isis-mappings:isis-mappings-jaxrsclient:isis-mappings-jaxrsclient-api'
-include ':isis-mappings:isis-mappings-restclient'
-include ':isis-mappings:isis-mappings-restclient-api'
+include ':isis-mappings-jaxrsclient'
+include ':isis-mappings-jaxrsclient:isis-mappings-jaxrsclient-api'
+include ':isis-mappings-restclient'
+include ':isis-mappings-restclient-api'
include ':isis-mavendeps'
-include ':isis-mavendeps:isis-mavendeps-integspecs'
-include ':isis-mavendeps:isis-mavendeps-integtests'
-include ':isis-mavendeps:isis-mavendeps-jdk11'
-include ':isis-mavendeps:isis-mavendeps-unittests'
-include ':isis-mavendeps:isis-mavendeps-webapp'
+include ':isis-mavendeps-integspecs'
+include ':isis-mavendeps-integtests'
+include ':isis-mavendeps-jdk11'
+include ':isis-mavendeps-unittests'
+include ':isis-mavendeps-webapp'
include ':isis-persistence-jdo'
-include ':isis-persistence-jdo:isis-persistence-jdo-applib'
-include ':isis-persistence-jdo:isis-persistence-jdo-datanucleus5'
+include ':isis-persistence-jdo-applib'
+include ':isis-persistence-jdo-datanucleus5'
include ':isis-persistence-jpa'
-include ':isis-persistence-jpa:isis-persistence-jpa-applib'
-include ':isis-persistence-jpa:isis-persistence-jpa-model'
+include ':isis-persistence-jpa-applib'
+include ':isis-persistence-jpa-model'
include ':isis-schema'
include ':isis-security-bypass'
include ':isis-security-keycloak'
include ':isis-security-shiro'
include ':isis-subdomains'
-include ':isis-subdomains:isis-subdomains-base'
-include ':isis-subdomains:isis-subdomains-base:isis-subdomains-base-applib'
-include ':isis-subdomains:isis-subdomains-docx'
-include ':isis-subdomains:isis-subdomains-docx:isis-subdomains-docx-applib'
-include ':isis-subdomains:isis-subdomains-excel'
-include ':isis-subdomains:isis-subdomains-excel-fixtures'
-include ':isis-subdomains:isis-subdomains-excel-integtests'
-include ':isis-subdomains:isis-subdomains-excel:isis-subdomains-excel-applib'
-include ':isis-subdomains:isis-subdomains-excel:isis-subdomains-excel-testing'
-include ':isis-subdomains:isis-subdomains-freemarker'
-include ':isis-subdomains:isis-subdomains-freemarker:isis-subdomains-freemarker-applib'
-include ':isis-subdomains:isis-subdomains-ognl'
-include ':isis-subdomains:isis-subdomains-ognl-applib'
-include ':isis-subdomains:isis-subdomains-pdfbox'
-include ':isis-subdomains:isis-subdomains-pdfbox:isis-subdomains-pdfbox-applib'
-include ':isis-subdomains:isis-subdomains-spring'
-include ':isis-subdomains:isis-subdomains-spring:isis-subdomains-spring-applib'
-include ':isis-subdomains:isis-subdomains-xdocreport'
-include ':isis-subdomains:isis-subdomains-xdocreport:isis-subdomains-xdocreport-applib'
-include ':isis-subdomains:isis-subdomains-zip'
-include ':isis-subdomains:isis-subdomains-zip:isis-subdomains-zip-applib'
+include ':isis-subdomains-base'
+include ':isis-subdomains-base:isis-subdomains-base-applib'
+include ':isis-subdomains-docx'
+include ':isis-subdomains-docx:isis-subdomains-docx-applib'
+include ':isis-subdomains-excel'
+include ':isis-subdomains-excel-applib'
+include ':isis-subdomains-excel-fixtures'
+include ':isis-subdomains-excel-integtests'
+include ':isis-subdomains-excel-testing'
+include ':isis-subdomains-freemarker'
+include ':isis-subdomains-freemarker:isis-subdomains-freemarker-applib'
+include ':isis-subdomains-ognl'
+include ':isis-subdomains-ognl-applib'
+include ':isis-subdomains-pdfbox'
+include ':isis-subdomains-pdfbox:isis-subdomains-pdfbox-applib'
+include ':isis-subdomains-spring'
+include ':isis-subdomains-spring:isis-subdomains-spring-applib'
+include ':isis-subdomains-xdocreport'
+include ':isis-subdomains-xdocreport:isis-subdomains-xdocreport-applib'
+include ':isis-subdomains-zip'
+include ':isis-subdomains-zip:isis-subdomains-zip-applib'
include ':isis-testing'
-include ':isis-testing:isis-testing-fakedata'
-include ':isis-testing:isis-testing-fakedata:isis-testing-fakedata-applib'
-include ':isis-testing:isis-testing-fakedata:isis-testing-fakedata-fixtures'
-include ':isis-testing:isis-testing-fakedata:isis-testing-fakedata-integtests'
-include ':isis-testing:isis-testing-fixtures'
-include ':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib'
-include ':isis-testing:isis-testing-h2console'
-include ':isis-testing:isis-testing-h2console:isis-testing-h2console-ui'
-include ':isis-testing:isis-testing-hsqldbmgr'
-include ':isis-testing:isis-testing-hsqldbmgr:isis-testing-hsqldbmgr-ui'
-include ':isis-testing:isis-testing-integtestsupport'
-include ':isis-testing:isis-testing-integtestsupport:isis-testing-integtestsupport-applib'
-include ':isis-testing:isis-testing-specsupport'
-include ':isis-testing:isis-testing-specsupport:isis-testing-specsupport-applib'
-include ':isis-testing:isis-testing-unittestsupport'
-include ':isis-testing:isis-testing-unittestsupport:isis-testing-unittestsupport-applib'
+include ':isis-testing-fakedata'
+include ':isis-testing-fakedata-applib'
+include ':isis-testing-fakedata-fixtures'
+include ':isis-testing-fakedata-integtests'
+include ':isis-testing-fixtures'
+include ':isis-testing-fixtures-applib'
+include ':isis-testing-h2console'
+include ':isis-testing-h2console:isis-testing-h2console-ui'
+include ':isis-testing-hsqldbmgr'
+include ':isis-testing-hsqldbmgr:isis-testing-hsqldbmgr-ui'
+include ':isis-testing-integtestsupport'
+include ':isis-testing-integtestsupport:isis-testing-integtestsupport-applib'
+include ':isis-testing-specsupport'
+include ':isis-testing-specsupport:isis-testing-specsupport-applib'
+include ':isis-testing-unittestsupport'
+include ':isis-testing-unittestsupport:isis-testing-unittestsupport-applib'
include ':isis-valuetypes'
+include ':isis-valuetypes-asciidoc'
+include ':isis-valuetypes-asciidoc-applib'
include ':isis-valuetypes-asciidoc-metamodel'
include ':isis-valuetypes-asciidoc-persistence'
include ':isis-valuetypes-asciidoc-persistence-jdo-dn5'
include ':isis-valuetypes-asciidoc-ui'
-include ':isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-vaa'
-include ':isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-wkt'
-include ':isis-valuetypes:isis-valuetypes-asciidoc'
-include ':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib'
-include ':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui'
-include ':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-vaa'
-include ':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-wkt'
-include ':isis-valuetypes:isis-valuetypes-markdown'
-include ':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib'
-include ':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-ui'
-include ':isis-valuetypes:isis-valuetypes-sse'
-include ':isis-valuetypes:isis-valuetypes-sse-applib'
-include ':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-metamodel'
-include ':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-ui'
-include ':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-ui:isis-valuetypes-sse-ui-wkt'
+include ':isis-valuetypes-asciidoc-ui'
+include ':isis-valuetypes-asciidoc-ui-vaa'
+include ':isis-valuetypes-asciidoc-ui-vaa'
+include ':isis-valuetypes-asciidoc-ui-wkt'
+include ':isis-valuetypes-asciidoc-ui-wkt'
+include ':isis-valuetypes-markdown'
+include ':isis-valuetypes-markdown-applib'
+include ':isis-valuetypes-markdown-persistence'
+include ':isis-valuetypes-markdown-persistence-jdo-dn5'
+include ':isis-valuetypes-markdown-ui'
+include ':isis-valuetypes-markdown-ui-wkt'
+include ':isis-valuetypes-sse'
+include ':isis-valuetypes-sse-applib'
+include ':isis-valuetypes-sse-metamodel'
+include ':isis-valuetypes-sse-ui'
+include ':isis-valuetypes-sse-ui-wkt'
include ':isis-viewer-common'
include ':isis-viewer-restfulobjects'
include ':isis-viewer-restfulobjects:isis-viewer-restfulobjects-applib'
@@ -138,14 +140,14 @@ include ':isis-viewer-restfulobjects:isis-viewer-restfulobjects-rendering'
include ':isis-viewer-restfulobjects:isis-viewer-restfulobjects-testing'
include ':isis-viewer-restfulobjects:isis-viewer-restfulobjects-viewer'
include ':isis-viewer-wicket'
-include ':isis-viewer-wicket:isis-viewer-wicket-model'
-include ':isis-viewer-wicket:isis-viewer-wicket-ui'
-include ':isis-viewer-wicket:isis-viewer-wicket-viewer'
+include ':isis-viewer-wicket-model'
+include ':isis-viewer-wicket-ui'
+include ':isis-viewer-wicket-viewer'
+include ':smoketests'
+project(':demo-parent').projectDir = "$rootDir/examples/demo" as File
+project(':demo-parent:demo-domain').projectDir = "$rootDir/examples/demo/domain" as File
+project(':demo-parent:demo-wicket').projectDir = "$rootDir/examples/demo/wicket" as File
project(':isis').projectDir = "$rootDir/core" as File
-project(':isis-app-starter-parent:demo-parent').projectDir = "$rootDir/examples/demo" as File
-project(':isis-app-starter-parent:demo-parent:demo-domain').projectDir = "$rootDir/examples/demo/domain" as File
-project(':isis-app-starter-parent:demo-parent:demo-wicket').projectDir = "$rootDir/examples/demo/wicket" as File
-project(':isis-app-starter-parent:smoketests').projectDir = "$rootDir/examples/smoketests" as File
project(':isis-applib').projectDir = "$rootDir/api/applib" as File
project(':isis-core-codegen-bytebuddy').projectDir = "$rootDir/core/codegen-bytebuddy" as File
project(':isis-core-commons').projectDir = "$rootDir/core/commons" as File
@@ -157,28 +159,28 @@ project(':isis-core-runtimeservices').projectDir = "$rootDir/core/runtimeservice
project(':isis-core-security').projectDir = "$rootDir/core/security" as File
project(':isis-core-webapp').projectDir = "$rootDir/core/webapp" as File
project(':isis-extensions').projectDir = "$rootDir/extensions" as File
-project(':isis-extensions:isis-extensions-cors').projectDir = "$rootDir/extensions/vro/cors" as File
-project(':isis-extensions:isis-extensions-cors:isis-extensions-cors-impl').projectDir = "$rootDir/extensions/vro/cors/impl" as File
-project(':isis-extensions:isis-extensions-exceldownload').projectDir = "$rootDir/extensions/vw/exceldownload" as File
-project(':isis-extensions:isis-extensions-exceldownload:isis-extensions-exceldownload-ui').projectDir = "$rootDir/extensions/vw/exceldownload/ui" as File
-project(':isis-extensions:isis-extensions-flyway').projectDir = "$rootDir/extensions/core/flyway" as File
-project(':isis-extensions:isis-extensions-flyway:isis-extensions-flyway-impl').projectDir = "$rootDir/extensions/core/flyway/impl" as File
-project(':isis-extensions:isis-extensions-fullcalendar').projectDir = "$rootDir/extensions/vw/fullcalendar" as File
-project(':isis-extensions:isis-extensions-fullcalendar:isis-extensions-fullcalendar-applib').projectDir = "$rootDir/extensions/vw/fullcalendar/applib" as File
-project(':isis-extensions:isis-extensions-fullcalendar:isis-extensions-fullcalendar-ui').projectDir = "$rootDir/extensions/vw/fullcalendar/ui" as File
-project(':isis-extensions:isis-extensions-modelannotation').projectDir = "$rootDir/extensions/core/model-annotation" as File
-project(':isis-extensions:isis-extensions-pdfjs').projectDir = "$rootDir/extensions/vw/pdfjs" as File
-project(':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-applib').projectDir = "$rootDir/extensions/vw/pdfjs/applib" as File
-project(':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-metamodel').projectDir = "$rootDir/extensions/vw/pdfjs/metamodel" as File
-project(':isis-extensions:isis-extensions-pdfjs:isis-extensions-pdfjs-ui').projectDir = "$rootDir/extensions/vw/pdfjs/ui" as File
-project(':isis-extensions:isis-extensions-secman').projectDir = "$rootDir/extensions/security/secman" as File
-project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-api').projectDir = "$rootDir/extensions/security/secman/api" as File
-project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt').projectDir = "$rootDir/extensions/security/secman/encryption-jbcrypt" as File
-project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-model').projectDir = "$rootDir/extensions/security/secman/model" as File
-project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-persistence-jdo').projectDir = "$rootDir/extensions/security/secman/persistence-jdo" as File
-project(':isis-extensions:isis-extensions-secman:isis-extensions-secman-shiro-realm').projectDir = "$rootDir/extensions/security/secman/shiro-realm" as File
-project(':isis-extensions:isis-extensions-shiro-realm-ldap').projectDir = "$rootDir/extensions/security/shiro-realm-ldap" as File
-project(':isis-extensions:isis-extensions-shiro-realm-ldap:isis-extensions-shiro-realm-ldap-impl').projectDir = "$rootDir/extensions/security/shiro-realm-ldap/impl" as File
+project(':isis-extensions-cors').projectDir = "$rootDir/extensions/vro/cors" as File
+project(':isis-extensions-cors:isis-extensions-cors-impl').projectDir = "$rootDir/extensions/vro/cors/impl" as File
+project(':isis-extensions-exceldownload').projectDir = "$rootDir/extensions/vw/exceldownload" as File
+project(':isis-extensions-exceldownload:isis-extensions-exceldownload-ui').projectDir = "$rootDir/extensions/vw/exceldownload/ui" as File
+project(':isis-extensions-flyway').projectDir = "$rootDir/extensions/core/flyway" as File
+project(':isis-extensions-flyway:isis-extensions-flyway-impl').projectDir = "$rootDir/extensions/core/flyway/impl" as File
+project(':isis-extensions-fullcalendar').projectDir = "$rootDir/extensions/vw/fullcalendar" as File
+project(':isis-extensions-fullcalendar:isis-extensions-fullcalendar-applib').projectDir = "$rootDir/extensions/vw/fullcalendar/applib" as File
+project(':isis-extensions-fullcalendar:isis-extensions-fullcalendar-ui').projectDir = "$rootDir/extensions/vw/fullcalendar/ui" as File
+project(':isis-extensions-modelannotation').projectDir = "$rootDir/extensions/core/model-annotation" as File
+project(':isis-extensions-pdfjs').projectDir = "$rootDir/extensions/vw/pdfjs" as File
+project(':isis-extensions-pdfjs:isis-extensions-pdfjs-applib').projectDir = "$rootDir/extensions/vw/pdfjs/applib" as File
+project(':isis-extensions-pdfjs:isis-extensions-pdfjs-metamodel').projectDir = "$rootDir/extensions/vw/pdfjs/metamodel" as File
+project(':isis-extensions-pdfjs:isis-extensions-pdfjs-ui').projectDir = "$rootDir/extensions/vw/pdfjs/ui" as File
+project(':isis-extensions-secman').projectDir = "$rootDir/extensions/security/secman" as File
+project(':isis-extensions-secman:isis-extensions-secman-api').projectDir = "$rootDir/extensions/security/secman/api" as File
+project(':isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt').projectDir = "$rootDir/extensions/security/secman/encryption-jbcrypt" as File
+project(':isis-extensions-secman:isis-extensions-secman-model').projectDir = "$rootDir/extensions/security/secman/model" as File
+project(':isis-extensions-secman:isis-extensions-secman-persistence-jdo').projectDir = "$rootDir/extensions/security/secman/persistence-jdo" as File
+project(':isis-extensions-secman:isis-extensions-secman-shiro-realm').projectDir = "$rootDir/extensions/security/secman/shiro-realm" as File
+project(':isis-extensions-shiro-realm-ldap').projectDir = "$rootDir/extensions/security/shiro-realm-ldap" as File
+project(':isis-extensions-shiro-realm-ldap:isis-extensions-shiro-realm-ldap-impl').projectDir = "$rootDir/extensions/security/shiro-realm-ldap/impl" as File
project(':isis-incubator').projectDir = "$rootDir/incubator" as File
project(':isis-incubator:isis-incubator-microprofile').projectDir = "$rootDir/incubator/mappings/microprofile" as File
project(':isis-incubator:isis-viewer-vaadin').projectDir = "$rootDir/incubator/viewers/vaadin" as File
@@ -192,85 +194,88 @@ project(':isis-legacy:isis-legacy-metamodel').projectDir = "$rootDir/legacy/exte
project(':isis-legacy:isis-legacy-restclient').projectDir = "$rootDir/legacy/mappings/restclient" as File
project(':isis-legacy:isis-legacy-runtime').projectDir = "$rootDir/legacy/extensions/core/runtime" as File
project(':isis-mappings').projectDir = "$rootDir/mappings" as File
-project(':isis-mappings:isis-mappings-jaxrsclient').projectDir = "$rootDir/mappings/jaxrsclient" as File
-project(':isis-mappings:isis-mappings-jaxrsclient:isis-mappings-jaxrsclient-api').projectDir = "$rootDir/mappings/jaxrsclient/api" as File
-project(':isis-mappings:isis-mappings-restclient').projectDir = "$rootDir/mappings/restclient" as File
-project(':isis-mappings:isis-mappings-restclient-api').projectDir = "$rootDir/mappings/restclient/api" as File
+project(':isis-mappings-jaxrsclient').projectDir = "$rootDir/mappings/jaxrsclient" as File
+project(':isis-mappings-jaxrsclient:isis-mappings-jaxrsclient-api').projectDir = "$rootDir/mappings/jaxrsclient/api" as File
+project(':isis-mappings-restclient').projectDir = "$rootDir/mappings/restclient" as File
+project(':isis-mappings-restclient-api').projectDir = "$rootDir/mappings/restclient/api" as File
project(':isis-mavendeps').projectDir = "$rootDir/mavendeps" as File
-project(':isis-mavendeps:isis-mavendeps-integspecs').projectDir = "$rootDir/mavendeps/integspecs" as File
-project(':isis-mavendeps:isis-mavendeps-integtests').projectDir = "$rootDir/mavendeps/integtests" as File
-project(':isis-mavendeps:isis-mavendeps-jdk11').projectDir = "$rootDir/mavendeps/jdk11" as File
-project(':isis-mavendeps:isis-mavendeps-unittests').projectDir = "$rootDir/mavendeps/unittests" as File
-project(':isis-mavendeps:isis-mavendeps-webapp').projectDir = "$rootDir/mavendeps/webapp" as File
+project(':isis-mavendeps-integspecs').projectDir = "$rootDir/mavendeps/integspecs" as File
+project(':isis-mavendeps-integtests').projectDir = "$rootDir/mavendeps/integtests" as File
+project(':isis-mavendeps-jdk11').projectDir = "$rootDir/mavendeps/jdk11" as File
+project(':isis-mavendeps-unittests').projectDir = "$rootDir/mavendeps/unittests" as File
+project(':isis-mavendeps-webapp').projectDir = "$rootDir/mavendeps/webapp" as File
project(':isis-persistence-jdo').projectDir = "$rootDir/persistence/jdo" as File
-project(':isis-persistence-jdo:isis-persistence-jdo-applib').projectDir = "$rootDir/persistence/jdo/applib" as File
-project(':isis-persistence-jdo:isis-persistence-jdo-datanucleus5').projectDir = "$rootDir/persistence/jdo/datanucleus-5" as File
+project(':isis-persistence-jdo-applib').projectDir = "$rootDir/persistence/jdo/applib" as File
+project(':isis-persistence-jdo-datanucleus5').projectDir = "$rootDir/persistence/jdo/datanucleus-5" as File
project(':isis-persistence-jpa').projectDir = "$rootDir/persistence/jpa" as File
-project(':isis-persistence-jpa:isis-persistence-jpa-applib').projectDir = "$rootDir/persistence/jpa/applib" as File
-project(':isis-persistence-jpa:isis-persistence-jpa-model').projectDir = "$rootDir/persistence/jpa/model" as File
+project(':isis-persistence-jpa-applib').projectDir = "$rootDir/persistence/jpa/applib" as File
+project(':isis-persistence-jpa-model').projectDir = "$rootDir/persistence/jpa/model" as File
project(':isis-schema').projectDir = "$rootDir/api/schema" as File
project(':isis-security-bypass').projectDir = "$rootDir/security/bypass" as File
project(':isis-security-keycloak').projectDir = "$rootDir/security/keycloak" as File
project(':isis-security-shiro').projectDir = "$rootDir/security/shiro" as File
project(':isis-subdomains').projectDir = "$rootDir/subdomains" as File
-project(':isis-subdomains:isis-subdomains-base').projectDir = "$rootDir/subdomains/base" as File
-project(':isis-subdomains:isis-subdomains-base:isis-subdomains-base-applib').projectDir = "$rootDir/subdomains/base/applib" as File
-project(':isis-subdomains:isis-subdomains-docx').projectDir = "$rootDir/subdomains/docx" as File
-project(':isis-subdomains:isis-subdomains-docx:isis-subdomains-docx-applib').projectDir = "$rootDir/subdomains/docx/applib" as File
-project(':isis-subdomains:isis-subdomains-excel').projectDir = "$rootDir/subdomains/excel" as File
-project(':isis-subdomains:isis-subdomains-excel-fixtures').projectDir = "$rootDir/subdomains/excel/fixture" as File
-project(':isis-subdomains:isis-subdomains-excel-integtests').projectDir = "$rootDir/subdomains/excel/integtests" as File
-project(':isis-subdomains:isis-subdomains-excel:isis-subdomains-excel-applib').projectDir = "$rootDir/subdomains/excel/applib" as File
-project(':isis-subdomains:isis-subdomains-excel:isis-subdomains-excel-testing').projectDir = "$rootDir/subdomains/excel/testing" as File
-project(':isis-subdomains:isis-subdomains-freemarker').projectDir = "$rootDir/subdomains/freemarker" as File
-project(':isis-subdomains:isis-subdomains-freemarker:isis-subdomains-freemarker-applib').projectDir = "$rootDir/subdomains/freemarker/applib" as File
-project(':isis-subdomains:isis-subdomains-ognl').projectDir = "$rootDir/subdomains/ognl" as File
-project(':isis-subdomains:isis-subdomains-ognl-applib').projectDir = "$rootDir/subdomains/ognl/applib" as File
-project(':isis-subdomains:isis-subdomains-pdfbox').projectDir = "$rootDir/subdomains/pdfbox" as File
-project(':isis-subdomains:isis-subdomains-pdfbox:isis-subdomains-pdfbox-applib').projectDir = "$rootDir/subdomains/pdfbox/applib" as File
-project(':isis-subdomains:isis-subdomains-spring').projectDir = "$rootDir/subdomains/spring" as File
-project(':isis-subdomains:isis-subdomains-spring:isis-subdomains-spring-applib').projectDir = "$rootDir/subdomains/spring/applib" as File
-project(':isis-subdomains:isis-subdomains-xdocreport').projectDir = "$rootDir/subdomains/xdocreport" as File
-project(':isis-subdomains:isis-subdomains-xdocreport:isis-subdomains-xdocreport-applib').projectDir = "$rootDir/subdomains/xdocreport/applib" as File
-project(':isis-subdomains:isis-subdomains-zip').projectDir = "$rootDir/subdomains/zip" as File
-project(':isis-subdomains:isis-subdomains-zip:isis-subdomains-zip-applib').projectDir = "$rootDir/subdomains/zip/applib" as File
+project(':isis-subdomains-base').projectDir = "$rootDir/subdomains/base" as File
+project(':isis-subdomains-base:isis-subdomains-base-applib').projectDir = "$rootDir/subdomains/base/applib" as File
+project(':isis-subdomains-docx').projectDir = "$rootDir/subdomains/docx" as File
+project(':isis-subdomains-docx:isis-subdomains-docx-applib').projectDir = "$rootDir/subdomains/docx/applib" as File
+project(':isis-subdomains-excel').projectDir = "$rootDir/subdomains/excel" as File
+project(':isis-subdomains-excel-applib').projectDir = "$rootDir/subdomains/excel/applib" as File
+project(':isis-subdomains-excel-fixtures').projectDir = "$rootDir/subdomains/excel/fixture" as File
+project(':isis-subdomains-excel-integtests').projectDir = "$rootDir/subdomains/excel/integtests" as File
+project(':isis-subdomains-excel-testing').projectDir = "$rootDir/subdomains/excel/testing" as File
+project(':isis-subdomains-freemarker').projectDir = "$rootDir/subdomains/freemarker" as File
+project(':isis-subdomains-freemarker:isis-subdomains-freemarker-applib').projectDir = "$rootDir/subdomains/freemarker/applib" as File
+project(':isis-subdomains-ognl').projectDir = "$rootDir/subdomains/ognl" as File
+project(':isis-subdomains-ognl-applib').projectDir = "$rootDir/subdomains/ognl/applib" as File
+project(':isis-subdomains-pdfbox').projectDir = "$rootDir/subdomains/pdfbox" as File
+project(':isis-subdomains-pdfbox:isis-subdomains-pdfbox-applib').projectDir = "$rootDir/subdomains/pdfbox/applib" as File
+project(':isis-subdomains-spring').projectDir = "$rootDir/subdomains/spring" as File
+project(':isis-subdomains-spring:isis-subdomains-spring-applib').projectDir = "$rootDir/subdomains/spring/applib" as File
+project(':isis-subdomains-xdocreport').projectDir = "$rootDir/subdomains/xdocreport" as File
+project(':isis-subdomains-xdocreport:isis-subdomains-xdocreport-applib').projectDir = "$rootDir/subdomains/xdocreport/applib" as File
+project(':isis-subdomains-zip').projectDir = "$rootDir/subdomains/zip" as File
+project(':isis-subdomains-zip:isis-subdomains-zip-applib').projectDir = "$rootDir/subdomains/zip/applib" as File
project(':isis-testing').projectDir = "$rootDir/testing" as File
-project(':isis-testing:isis-testing-fakedata').projectDir = "$rootDir/testing/fakedata" as File
-project(':isis-testing:isis-testing-fakedata:isis-testing-fakedata-applib').projectDir = "$rootDir/testing/fakedata/applib" as File
-project(':isis-testing:isis-testing-fakedata:isis-testing-fakedata-fixtures').projectDir = "$rootDir/testing/fakedata/fixtures" as File
-project(':isis-testing:isis-testing-fakedata:isis-testing-fakedata-integtests').projectDir = "$rootDir/testing/fakedata/integtests" as File
-project(':isis-testing:isis-testing-fixtures').projectDir = "$rootDir/testing/fixtures" as File
-project(':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib').projectDir = "$rootDir/testing/fixtures/applib" as File
-project(':isis-testing:isis-testing-h2console').projectDir = "$rootDir/testing/h2console" as File
-project(':isis-testing:isis-testing-h2console:isis-testing-h2console-ui').projectDir = "$rootDir/testing/h2console/ui" as File
-project(':isis-testing:isis-testing-hsqldbmgr').projectDir = "$rootDir/testing/hsqldbmgr" as File
-project(':isis-testing:isis-testing-hsqldbmgr:isis-testing-hsqldbmgr-ui').projectDir = "$rootDir/testing/hsqldbmgr/ui" as File
-project(':isis-testing:isis-testing-integtestsupport').projectDir = "$rootDir/testing/integtestsupport" as File
-project(':isis-testing:isis-testing-integtestsupport:isis-testing-integtestsupport-applib').projectDir = "$rootDir/testing/integtestsupport/applib" as File
-project(':isis-testing:isis-testing-specsupport').projectDir = "$rootDir/testing/specsupport" as File
-project(':isis-testing:isis-testing-specsupport:isis-testing-specsupport-applib').projectDir = "$rootDir/testing/specsupport/applib" as File
-project(':isis-testing:isis-testing-unittestsupport').projectDir = "$rootDir/testing/unittestsupport" as File
-project(':isis-testing:isis-testing-unittestsupport:isis-testing-unittestsupport-applib').projectDir = "$rootDir/testing/unittestsupport/applib" as File
+project(':isis-testing-fakedata').projectDir = "$rootDir/testing/fakedata" as File
+project(':isis-testing-fakedata-applib').projectDir = "$rootDir/testing/fakedata/applib" as File
+project(':isis-testing-fakedata-fixtures').projectDir = "$rootDir/testing/fakedata/fixtures" as File
+project(':isis-testing-fakedata-integtests').projectDir = "$rootDir/testing/fakedata/integtests" as File
+project(':isis-testing-fixtures').projectDir = "$rootDir/testing/fixtures" as File
+project(':isis-testing-fixtures-applib').projectDir = "$rootDir/testing/fixtures/applib" as File
+project(':isis-testing-h2console').projectDir = "$rootDir/testing/h2console" as File
+project(':isis-testing-h2console:isis-testing-h2console-ui').projectDir = "$rootDir/testing/h2console/ui" as File
+project(':isis-testing-hsqldbmgr').projectDir = "$rootDir/testing/hsqldbmgr" as File
+project(':isis-testing-hsqldbmgr:isis-testing-hsqldbmgr-ui').projectDir = "$rootDir/testing/hsqldbmgr/ui" as File
+project(':isis-testing-integtestsupport').projectDir = "$rootDir/testing/integtestsupport" as File
+project(':isis-testing-integtestsupport:isis-testing-integtestsupport-applib').projectDir = "$rootDir/testing/integtestsupport/applib" as File
+project(':isis-testing-specsupport').projectDir = "$rootDir/testing/specsupport" as File
+project(':isis-testing-specsupport:isis-testing-specsupport-applib').projectDir = "$rootDir/testing/specsupport/applib" as File
+project(':isis-testing-unittestsupport').projectDir = "$rootDir/testing/unittestsupport" as File
+project(':isis-testing-unittestsupport:isis-testing-unittestsupport-applib').projectDir = "$rootDir/testing/unittestsupport/applib" as File
project(':isis-valuetypes').projectDir = "$rootDir/valuetypes" as File
+project(':isis-valuetypes-asciidoc').projectDir = "$rootDir/valuetypes/asciidoc" as File
+project(':isis-valuetypes-asciidoc-applib').projectDir = "$rootDir/valuetypes/asciidoc/applib" as File
project(':isis-valuetypes-asciidoc-metamodel').projectDir = "$rootDir/valuetypes/asciidoc/metamodel" as File
project(':isis-valuetypes-asciidoc-persistence').projectDir = "$rootDir/valuetypes/asciidoc/persistence" as File
project(':isis-valuetypes-asciidoc-persistence-jdo-dn5').projectDir = "$rootDir/valuetypes/asciidoc/persistence/jdo-dn5" as File
project(':isis-valuetypes-asciidoc-ui').projectDir = "$rootDir/valuetypes/asciidoc/ui" as File
-project(':isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-vaa').projectDir = "$rootDir/valuetypes/asciidoc/ui/vaadin" as File
-project(':isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-wkt').projectDir = "$rootDir/valuetypes/asciidoc/ui/wicket" as File
-project(':isis-valuetypes:isis-valuetypes-asciidoc').projectDir = "$rootDir/valuetypes/asciidoc" as File
-project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib').projectDir = "$rootDir/valuetypes/asciidoc/applib" as File
-project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui').projectDir = "$rootDir/valuetypes/asciidoc/ui" as File
-project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-vaa').projectDir = "$rootDir/valuetypes/asciidoc/ui/vaadin" as File
-project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-ui:isis-valuetypes-asciidoc-ui-wkt').projectDir = "$rootDir/valuetypes/asciidoc/ui/wicket" as File
-project(':isis-valuetypes:isis-valuetypes-markdown').projectDir = "$rootDir/valuetypes/markdown" as File
-project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib').projectDir = "$rootDir/valuetypes/markdown/applib" as File
-project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-ui').projectDir = "$rootDir/valuetypes/markdown/ui" as File
-project(':isis-valuetypes:isis-valuetypes-sse').projectDir = "$rootDir/valuetypes/sse" as File
-project(':isis-valuetypes:isis-valuetypes-sse-applib').projectDir = "$rootDir/valuetypes/sse/applib" as File
-project(':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-metamodel').projectDir = "$rootDir/valuetypes/sse/metamodel" as File
-project(':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-ui').projectDir = "$rootDir/valuetypes/sse/ui" as File
-project(':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-ui:isis-valuetypes-sse-ui-wkt').projectDir = "$rootDir/valuetypes/sse/ui/wkt" as File
+project(':isis-valuetypes-asciidoc-ui').projectDir = "$rootDir/valuetypes/asciidoc/ui" as File
+project(':isis-valuetypes-asciidoc-ui-vaa').projectDir = "$rootDir/valuetypes/asciidoc/ui/vaadin" as File
+project(':isis-valuetypes-asciidoc-ui-vaa').projectDir = "$rootDir/valuetypes/asciidoc/ui/vaadin" as File
+project(':isis-valuetypes-asciidoc-ui-wkt').projectDir = "$rootDir/valuetypes/asciidoc/ui/wicket" as File
+project(':isis-valuetypes-asciidoc-ui-wkt').projectDir = "$rootDir/valuetypes/asciidoc/ui/wicket" as File
+project(':isis-valuetypes-markdown').projectDir = "$rootDir/valuetypes/markdown" as File
+project(':isis-valuetypes-markdown-applib').projectDir = "$rootDir/valuetypes/markdown/applib" as File
+project(':isis-valuetypes-markdown-persistence').projectDir = "$rootDir/valuetypes/markdown/persistence" as File
+project(':isis-valuetypes-markdown-persistence-jdo-dn5').projectDir = "$rootDir/valuetypes/markdown/persistence/jdo-dn5" as File
+project(':isis-valuetypes-markdown-ui').projectDir = "$rootDir/valuetypes/markdown/ui" as File
+project(':isis-valuetypes-markdown-ui-wkt').projectDir = "$rootDir/valuetypes/markdown/ui/wicket" as File
+project(':isis-valuetypes-sse').projectDir = "$rootDir/valuetypes/sse" as File
+project(':isis-valuetypes-sse-applib').projectDir = "$rootDir/valuetypes/sse/applib" as File
+project(':isis-valuetypes-sse-metamodel').projectDir = "$rootDir/valuetypes/sse/metamodel" as File
+project(':isis-valuetypes-sse-ui').projectDir = "$rootDir/valuetypes/sse/ui" as File
+project(':isis-valuetypes-sse-ui-wkt').projectDir = "$rootDir/valuetypes/sse/ui/wicket" as File
project(':isis-viewer-common').projectDir = "$rootDir/viewers/common" as File
project(':isis-viewer-restfulobjects').projectDir = "$rootDir/viewers/restfulobjects" as File
project(':isis-viewer-restfulobjects:isis-viewer-restfulobjects-applib').projectDir = "$rootDir/viewers/restfulobjects/applib" as File
@@ -279,6 +284,7 @@ project(':isis-viewer-restfulobjects:isis-viewer-restfulobjects-rendering').proj
project(':isis-viewer-restfulobjects:isis-viewer-restfulobjects-testing').projectDir = "$rootDir/viewers/restfulobjects/testing" as File
project(':isis-viewer-restfulobjects:isis-viewer-restfulobjects-viewer').projectDir = "$rootDir/viewers/restfulobjects/viewer" as File
project(':isis-viewer-wicket').projectDir = "$rootDir/viewers/wicket" as File
-project(':isis-viewer-wicket:isis-viewer-wicket-model').projectDir = "$rootDir/viewers/wicket/model" as File
-project(':isis-viewer-wicket:isis-viewer-wicket-ui').projectDir = "$rootDir/viewers/wicket/ui" as File
-project(':isis-viewer-wicket:isis-viewer-wicket-viewer').projectDir = "$rootDir/viewers/wicket/viewer" as File
+project(':isis-viewer-wicket-model').projectDir = "$rootDir/viewers/wicket/model" as File
+project(':isis-viewer-wicket-ui').projectDir = "$rootDir/viewers/wicket/ui" as File
+project(':isis-viewer-wicket-viewer').projectDir = "$rootDir/viewers/wicket/viewer" as File
+project(':smoketests').projectDir = "$rootDir/examples/smoketests" as File
diff --git a/subdomains/base/applib/build.gradle b/subdomains/base/applib/build.gradle
index 6f770c7..44205be 100644
--- a/subdomains/base/applib/build.gradle
+++ b/subdomains/base/applib/build.gradle
@@ -7,7 +7,7 @@ dependencies {
testCompile(Libs.reflections)
testCompile project(':isis-core-metamodel')
testCompile(Libs.javaxJdo)
- testCompile project(':isis-testing:isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
}
task packageTests(type: Jar) {
diff --git a/subdomains/excel/applib/build.gradle b/subdomains/excel/applib/build.gradle
index a43a862..29df692 100644
--- a/subdomains/excel/applib/build.gradle
+++ b/subdomains/excel/applib/build.gradle
@@ -3,7 +3,7 @@ description = 'Apache Isis Sub - Excel (applib)'
dependencies {
compile project(':isis-applib')
compile project(':isis-core-runtime')
- compile project(':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
+ compile project(':isis-testing-fixtures-applib')
compile(Libs.guava)
compile(Libs.datanucleusCore)
compile(Libs.poiOoxml)
diff --git a/subdomains/excel/fixture/build.gradle b/subdomains/excel/fixture/build.gradle
index 492aee7..421c7f4 100644
--- a/subdomains/excel/fixture/build.gradle
+++ b/subdomains/excel/fixture/build.gradle
@@ -1,11 +1,11 @@
group = 'org.apache.isis.subdomains'
description = 'Apache Isis Sub - Excel (Fixtures)'
dependencies {
- compile project(':isis-subdomains:isis-subdomains-excel:isis-subdomains-excel-applib')
- compile project(':isis-subdomains:isis-subdomains-excel:isis-subdomains-excel-testing')
+ compile project(':isis-subdomains-excel-applib')
+ compile project(':isis-subdomains-excel-testing')
compile project(':isis-applib')
- compile project(':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
- compile project(':isis-persistence-jdo:isis-persistence-jdo-datanucleus5')
+ compile project(':isis-testing-fixtures-applib')
+ compile project(':isis-persistence-jdo-datanucleus5')
}
task packageTests(type: Jar) {
diff --git a/subdomains/excel/integtests/build.gradle b/subdomains/excel/integtests/build.gradle
index c76eb2c..cbc53d6 100644
--- a/subdomains/excel/integtests/build.gradle
+++ b/subdomains/excel/integtests/build.gradle
@@ -1,10 +1,10 @@
group = 'org.apache.isis.subdomains'
description = 'Apache Isis Sub - Excel (Integ Tests)'
dependencies {
- testCompile project(':isis-subdomains:isis-subdomains-excel-fixtures')
- testCompile project(':isis-testing:isis-testing-fakedata:isis-testing-fakedata-applib')
- testCompile project(':isis-mavendeps:isis-mavendeps-integtests')
- testCompile project(':isis-persistence-jdo:isis-persistence-jdo-datanucleus5')
+ testCompile project(':isis-subdomains-excel-fixtures')
+ testCompile project(':isis-testing-fakedata-applib')
+ testCompile project(':isis-mavendeps-integtests')
+ testCompile project(':isis-persistence-jdo-datanucleus5')
testCompile(Libs.hsqldb)
}
diff --git a/subdomains/excel/testing/build.gradle b/subdomains/excel/testing/build.gradle
index 3426ff9..9a177d3 100644
--- a/subdomains/excel/testing/build.gradle
+++ b/subdomains/excel/testing/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.subdomains'
description = 'Apache Isis Sub - Excel (testing support)'
dependencies {
- compile project(':isis-subdomains:isis-subdomains-excel:isis-subdomains-excel-applib')
+ compile project(':isis-subdomains-excel-applib')
}
task packageTests(type: Jar) {
diff --git a/subdomains/xdocreport/applib/build.gradle b/subdomains/xdocreport/applib/build.gradle
index 350b9c5..bdef7d8 100644
--- a/subdomains/xdocreport/applib/build.gradle
+++ b/subdomains/xdocreport/applib/build.gradle
@@ -7,7 +7,7 @@ dependencies {
compile(Libs.xdocreportXwpf)
compile(Libs.xdocreportPdf)
compile(Libs.xdocreportCore)
- testCompile project(':isis-testing:isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
testCompile(Libs.guava)
}
diff --git a/testing/fakedata/applib/build.gradle b/testing/fakedata/applib/build.gradle
index 7f07f39..d521f1a 100644
--- a/testing/fakedata/applib/build.gradle
+++ b/testing/fakedata/applib/build.gradle
@@ -12,7 +12,7 @@ dependencies {
exclude(module: 'snakeyaml')
}
compile(Libs.guava)
- testCompile project(':isis-testing:isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
}
task packageTests(type: Jar) {
diff --git a/testing/fakedata/fixtures/build.gradle b/testing/fakedata/fixtures/build.gradle
index 09ab5d0..ae787fa 100644
--- a/testing/fakedata/fixtures/build.gradle
+++ b/testing/fakedata/fixtures/build.gradle
@@ -1,10 +1,10 @@
group = 'org.apache.isis.testing'
description = 'Apache Isis Tst - FakeData (fixtures)'
dependencies {
- compile project(':isis-testing:isis-testing-fakedata:isis-testing-fakedata-applib')
+ compile project(':isis-testing-fakedata-applib')
compile project(':isis-applib')
- compile project(':isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
- compile project(':isis-persistence-jdo:isis-persistence-jdo-datanucleus5')
+ compile project(':isis-testing-fixtures-applib')
+ compile project(':isis-persistence-jdo-datanucleus5')
compile(Libs.guava)
}
diff --git a/testing/fakedata/integtests/build.gradle b/testing/fakedata/integtests/build.gradle
index 62b4826..1cd2c22 100644
--- a/testing/fakedata/integtests/build.gradle
+++ b/testing/fakedata/integtests/build.gradle
@@ -1,9 +1,9 @@
group = 'org.apache.isis.testing'
description = 'Apache Isis Tst - FakeData (integ tests)'
dependencies {
- testCompile project(':isis-testing:isis-testing-fakedata:isis-testing-fakedata-fixtures')
- testCompile project(':isis-testing:isis-testing-fakedata:isis-testing-fakedata-applib')
- testCompile project(':isis-mavendeps:isis-mavendeps-integtests')
+ testCompile project(':isis-testing-fakedata-fixtures')
+ testCompile project(':isis-testing-fakedata-applib')
+ testCompile project(':isis-mavendeps-integtests')
}
task packageTests(type: Jar) {
diff --git a/testing/fixtures/applib/build.gradle b/testing/fixtures/applib/build.gradle
index 436f7dd..ef902c2 100644
--- a/testing/fixtures/applib/build.gradle
+++ b/testing/fixtures/applib/build.gradle
@@ -3,10 +3,10 @@ description = 'Apache Isis Tst - Fixtures (applib)'
apply plugin: 'war'
dependencies {
compile compile(Libs.jodaTime)
- compile project(':isis-subdomains:isis-subdomains-spring:isis-subdomains-spring-applib')
- providedCompile project(':isis-testing:isis-testing-integtestsupport:isis-testing-integtestsupport-applib')
+ compile project(':isis-subdomains-spring:isis-subdomains-spring-applib')
+ providedCompile project(':isis-testing-integtestsupport:isis-testing-integtestsupport-applib')
compileOnly(Libs.javaxJdo)
- providedCompile project(':isis-persistence-jdo:isis-persistence-jdo-applib')
+ providedCompile project(':isis-persistence-jdo-applib')
providedCompile project(':isis-core-runtime')
}
diff --git a/testing/integtestsupport/applib/build.gradle b/testing/integtestsupport/applib/build.gradle
index b121fd8..42160ce 100644
--- a/testing/integtestsupport/applib/build.gradle
+++ b/testing/integtestsupport/applib/build.gradle
@@ -16,7 +16,7 @@ dependencies {
compile (Libs.slf4jApi)
compile project(':isis-security-bypass')
compile project(':isis-core-runtimeservices')
- compile project(':isis-persistence-jdo:isis-persistence-jdo-datanucleus5')
+ compile project(':isis-persistence-jdo-datanucleus5')
compile(Libs.hsqldb)
compile (Libs.h2)
compileOnly (Libs.javaxJdo)
diff --git a/testing/specsupport/applib/build.gradle b/testing/specsupport/applib/build.gradle
index c5a7424..4ba2402 100644
--- a/testing/specsupport/applib/build.gradle
+++ b/testing/specsupport/applib/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.testing'
description = 'Apache Isis Tst - Spec/Cucumber (applib)'
dependencies {
- compile project(':isis-testing:isis-testing-integtestsupport:isis-testing-integtestsupport-applib')
+ compile project(':isis-testing-integtestsupport:isis-testing-integtestsupport-applib')
compile(Libs.cucumberJava)
compile(Libs.cucumberSpring)
compile(Libs.cucumberJunit)
diff --git a/testing/unittestsupport/applib/build.gradle b/testing/unittestsupport/applib/build.gradle
index 32d540e..fceea3e 100644
--- a/testing/unittestsupport/applib/build.gradle
+++ b/testing/unittestsupport/applib/build.gradle
@@ -26,8 +26,8 @@ dependencies {
compile(Libs.javaxJdo)
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
- testCompile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
+ compile project(':isis-valuetypes-asciidoc-applib')
+ testCompile project(':isis-valuetypes-asciidoc-applib')
testCompile project(':isis-applib')
// These dependencies are required in order to build on jdk11
diff --git a/valuetypes/asciidoc/ui/vaadin/build.gradle b/valuetypes/asciidoc/ui/vaadin/build.gradle
index 8a50778..50cbdb0 100644
--- a/valuetypes/asciidoc/ui/vaadin/build.gradle
+++ b/valuetypes/asciidoc/ui/vaadin/build.gradle
@@ -1,7 +1,7 @@
description = 'Apache Isis Val - Asciidoctor (ui vaadin)'
dependencies {
compile project(':isis-incubator:isis-viewer-vaadin:isis-viewer-vaadin-ui')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
+ compile project(':isis-valuetypes-asciidoc-applib')
}
task packageTests(type: Jar) {
diff --git a/valuetypes/asciidoc/ui/wicket/build.gradle b/valuetypes/asciidoc/ui/wicket/build.gradle
index 553bf73..095b157 100644
--- a/valuetypes/asciidoc/ui/wicket/build.gradle
+++ b/valuetypes/asciidoc/ui/wicket/build.gradle
@@ -5,10 +5,10 @@ apply plugin: 'io.freefair.lombok'
dependencies {
compile project(':isis-applib')
compile project(':isis-core-commons')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc')
- compile project(':isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
+ compile project(':isis-valuetypes-asciidoc')
+ compile project(':isis-valuetypes-asciidoc-applib')
- providedCompile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ providedCompile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/valuetypes/markdown/persistence/build.gradle b/valuetypes/markdown/persistence/build.gradle
index b31b465..fda43ce 100644
--- a/valuetypes/markdown/persistence/build.gradle
+++ b/valuetypes/markdown/persistence/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.valuetypes'
description = 'Apache Isis Val - Markdown (persistence)'
dependencies {
compile(Libs.datanucleusCore)
- compile project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
+ compile project(':isis-valuetypes-markdown-applib')
compile project(':isis-core-metamodel')
}
diff --git a/valuetypes/markdown/persistence/jdo-dn5/build.gradle b/valuetypes/markdown/persistence/jdo-dn5/build.gradle
index b370b5f9..4a74bdb 100644
--- a/valuetypes/markdown/persistence/jdo-dn5/build.gradle
+++ b/valuetypes/markdown/persistence/jdo-dn5/build.gradle
@@ -1,16 +1,9 @@
group = 'org.apache.isis.valuetypes'
description = 'Apache Isis Val - Markdown (persistence jdo-dn5)'
-/*apply plugin: 'war'
-sourceSets {
- main {
- java {
- srcDirs += "${buildDir}/target/classes"
- }
- }
-}*/
+
dependencies {
compile(Libs.datanucleusCore)
- compile project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
+ compile project(':isis-valuetypes-markdown-applib')
}
task packageTests(type: Jar) {
diff --git a/valuetypes/markdown/ui/build.gradle b/valuetypes/markdown/ui/build.gradle
index 7b5c8db..8b034d3 100644
--- a/valuetypes/markdown/ui/build.gradle
+++ b/valuetypes/markdown/ui/build.gradle
@@ -1,9 +1,9 @@
group = 'org.apache.isis.valuetypes'
description = 'Apache Isis Val - Markdown (ui)'
dependencies {
- compile project(':isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
+ compile project(':isis-valuetypes-markdown-applib')
compile project(':isis-core-metamodel')
- compile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ compile project(':isis-viewer-wicket-ui')
compile(Libs.flexmarkAll) {
exclude(module: 'jsoup')
}
diff --git a/valuetypes/markdown/ui/wicket/build.gradle b/valuetypes/markdown/ui/wicket/build.gradle
new file mode 100644
index 0000000..041de6e
--- /dev/null
+++ b/valuetypes/markdown/ui/wicket/build.gradle
@@ -0,0 +1,20 @@
+group = 'org.apache.isis.valuetypes'
+description = 'Apache Isis Val - Markdown (ui-wkt)'
+dependencies {
+ compile project(':isis-core-commons')
+ compile project(':isis-viewer-wicket-ui')
+ compile project(':isis-valuetypes-markdown-applib')
+ compile(Libs.wicketCore) {
+ exclude(module: 'slf4j-api')
+ exclude(module: 'commons-io')
+ }
+ compile(Libs.wicketExtensions) {
+ exclude(module: 'slf4j-api')
+ }
+}
+
+task packageTests(type: Jar) {
+ from sourceSets.test.output
+ classifier = 'tests'
+}
+artifacts.archives packageTests
diff --git a/valuetypes/sse/applib/build.gradle b/valuetypes/sse/applib/build.gradle
index 8e9602c..4e1a1c5 100644
--- a/valuetypes/sse/applib/build.gradle
+++ b/valuetypes/sse/applib/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
dependencies {
compile project(':isis-core-metamodel')
providedCompile project(':isis-core-webapp')
- providedCompile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ providedCompile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/valuetypes/sse/metamodel/build.gradle b/valuetypes/sse/metamodel/build.gradle
index 5d85a8c..b8f19db 100644
--- a/valuetypes/sse/metamodel/build.gradle
+++ b/valuetypes/sse/metamodel/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.valuetypes'
description = 'Apache Isis Val - Server Sent Events (metamodel)'
dependencies {
- compile project(':isis-valuetypes:isis-valuetypes-sse-applib')
+ compile project(':isis-valuetypes-sse-applib')
compile project(':isis-core-metamodel')
}
diff --git a/valuetypes/sse/ui/build.gradle b/valuetypes/sse/ui/build.gradle
index 05767b1..70028c7 100644
--- a/valuetypes/sse/ui/build.gradle
+++ b/valuetypes/sse/ui/build.gradle
@@ -2,10 +2,10 @@ group = 'org.apache.isis.valuetypes'
description = 'Apache Isis Val - Server Sent Events (ui)'
dependencies {
- compile project(':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-metamodel')
+ compile project(':isis-valuetypes-sse-metamodel')
compile project(':isis-core-metamodel')
compile project(':isis-core-webapp')
- compile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ compile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/valuetypes/sse/ui/wicket/build.gradle b/valuetypes/sse/ui/wicket/build.gradle
index b1b6a9f..b586d91 100644
--- a/valuetypes/sse/ui/wicket/build.gradle
+++ b/valuetypes/sse/ui/wicket/build.gradle
@@ -2,10 +2,10 @@ group = 'org.apache.isis.valuetypes'
description = 'Apache Isis Val - Server Sent Events (ui-wkt)'
dependencies {
- compile project(':isis-valuetypes:isis-valuetypes-sse:isis-valuetypes-sse-metamodel')
+ compile project(':isis-valuetypes-sse-metamodel')
compile project(':isis-core-metamodel')
compile project(':isis-core-webapp')
- compile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ compile project(':isis-viewer-wicket-ui')
}
task packageTests(type: Jar) {
diff --git a/viewers/wicket/model/build.gradle b/viewers/wicket/model/build.gradle
index 40ffb99..2d27b45 100644
--- a/viewers/wicket/model/build.gradle
+++ b/viewers/wicket/model/build.gradle
@@ -11,7 +11,7 @@ dependencies {
compile project(':isis-core-webapp')
compile project(':isis-viewer-common')
testCompile project(':isis-core-internaltestsupport')
- testCompile project(':isis-testing:isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport:isis-testing-unittestsupport-applib')
testCompile(Libs.guava)
}
diff --git a/viewers/wicket/ui/build.gradle b/viewers/wicket/ui/build.gradle
index a58ec51..a3503d9 100644
--- a/viewers/wicket/ui/build.gradle
+++ b/viewers/wicket/ui/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.viewer'
description = 'Apache Isis Viewer - Wicket (UI Components)'
dependencies {
- compile project(':isis-viewer-wicket:isis-viewer-wicket-model')
+ compile project(':isis-viewer-wicket-model')
compile(Libs.wicketCore) {
exclude(module: 'slf4j-api')
exclude(module: 'commons-io')
diff --git a/viewers/wicket/viewer/build.gradle b/viewers/wicket/viewer/build.gradle
index f5cbb7f..12d9c0a 100644
--- a/viewers/wicket/viewer/build.gradle
+++ b/viewers/wicket/viewer/build.gradle
@@ -1,7 +1,7 @@
group = 'org.apache.isis.viewer'
description = 'Apache Isis Viewer - Wicket (Viewer)'
dependencies {
- compile project(':isis-viewer-wicket:isis-viewer-wicket-ui')
+ compile project(':isis-viewer-wicket-ui')
compile(Libs.wicketSpring) {
exclude(module: 'asm')
exclude(module: 'slf4j-api')