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/21 13:52:22 UTC
[isis] branch ISIS-2348 updated: ISIS-2348 $ gradlew.bat
demo-domain:enhance demo-wicket:bootRun stuck at task
':demo-wicket:bootRun'
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 20536f1 ISIS-2348 $ gradlew.bat demo-domain:enhance demo-wicket:bootRun stuck at task ':demo-wicket:bootRun'
20536f1 is described below
commit 20536f1e404dd2c3330b534f0a6fa15bcd5030df
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Tue Jul 21 15:51:23 2020 +0200
ISIS-2348
$ gradlew.bat demo-domain:enhance demo-wicket:bootRun
stuck at task ':demo-wicket:bootRun'
---
dependencies.gradle | 5 +++-
examples/demo/domain/build.gradle | 24 ++++++++-------
examples/demo/wicket/build.gradle | 34 +++++++++++++---------
.../demo/wicket/src/main/resources/application.yml | 11 ++++---
settings.gradle | 14 ++++-----
subdomains/base/applib/build.gradle | 2 +-
subdomains/xdocreport/applib/build.gradle | 2 +-
testing/fakedata/applib/build.gradle | 2 +-
testing/fixtures/applib/build.gradle | 2 +-
testing/specsupport/applib/build.gradle | 2 +-
valuetypes/asciidoc/ui/build.gradle | 11 +++++++
viewers/wicket/model/build.gradle | 2 +-
12 files changed, 68 insertions(+), 43 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index f254ce0..13edb5e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -18,6 +18,7 @@
*/
ext {
+ asciidoctorjVersion = "2.4.0"
cucumberVersion = "5.1.2"
jacksonVersion = "2.10.4"
jaxApiVersion = "2.3.1"
@@ -33,7 +34,8 @@ ext {
Libs = [
apachedsTestFramework : "org.apache.directory.server:apacheds-test-framework:2.0.0.AM25",
approvaltests : "com.approvaltests:approvaltests:4.0.2",
- asciidoctorjApi : "org.asciidoctor:asciidoctorj-api:2.1.0",
+ asciidoctorj : "org.asciidoctor:asciidoctorj:$asciidoctorjVersion",
+ asciidoctorjApi : "org.asciidoctor:asciidoctorj-api:$asciidoctorjVersion",
assertjCore : "org.assertj:assertj-core:3.13.2",
byteBuddy : "net.bytebuddy:byte-buddy:1.10.10",
commonsEmail : "org.apache.commons:commons-email:1.5",
@@ -99,6 +101,7 @@ ext {
springBootConfigurationProcessor: "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion",
springBootStarter : "org.springframework.boot:spring-boot-starter:$springBootVersion",
springBootStarterBatch : "org.springframework.boot:spring-boot-starter-batch:$springBootVersion",
+ springBootStarterDataJpa : "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion",
springBootStarterLog4j2 : "org.springframework.boot:spring-boot-starter-log4j2:$springBootVersion",
springBootStarterTest : "org.springframework.boot:spring-boot-starter-test:$springBootVersion",
springBootStarterThymeleaf : "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion",
diff --git a/examples/demo/domain/build.gradle b/examples/demo/domain/build.gradle
index 4743f2c..1d53499 100644
--- a/examples/demo/domain/build.gradle
+++ b/examples/demo/domain/build.gradle
@@ -17,19 +17,23 @@ apply plugin: "org.rm3l.datanucleus-gradle-plugin"
dependencies {
compile project(':isis-applib')
compile project(':isis-core-commons')
- 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-cors-impl')
compile project(':isis-extensions-exceldownload-ui')
- compile project(':isis-testing-h2console:isis-testing-h2console-ui')
- compile project(':isis-viewer-restfulobjects-jaxrsresteasy4')
+ compile project(':isis-extensions-modelannotation')
compile project(':isis-extensions-secman-encryption-jbcrypt')
+ compile project(':isis-extensions-secman-model')
compile project(':isis-extensions-secman-persistence-jdo')
compile project(':isis-extensions-secman-shiro-realm')
- compile project(':isis-extensions-modelannotation')
+ compile project(':isis-mavendeps-webapp')
+ compile project(':isis-persistence-jdo-datanucleus5')
+ compile project(':isis-testing-fixtures-applib')
+ compile project(':isis-testing-h2console-ui')
+ compile project(':isis-valuetypes-asciidoc-applib')
+ compile project(':isis-valuetypes-asciidoc-persistence-jdo-dn5')
+ compile project(':isis-valuetypes-markdown-applib')
+ compile project(':isis-valuetypes-markdown-persistence-jdo-dn5')
compile project(':isis-valuetypes-sse-applib')
+ compile project(':isis-viewer-restfulobjects-jaxrsresteasy4')
+ implementation(Libs.h2)
+ implementation(Libs.httpClient)
}
diff --git a/examples/demo/wicket/build.gradle b/examples/demo/wicket/build.gradle
index 432dbf3..1f21c57 100644
--- a/examples/demo/wicket/build.gradle
+++ b/examples/demo/wicket/build.gradle
@@ -1,27 +1,33 @@
group = 'org.apache.isis.examples.apps'
description = 'Apache Isis App - Demo (Wicket)'
-apply plugin: 'war'
+buildscript {
+ repositories {
+ maven {
+ url "https://plugins.gradle.org/m2/"
+ }
+ }
+ dependencies {
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:2.3.1.RELEASE"
+ }
+}
+apply plugin: 'org.springframework.boot'
+apply plugin: 'java'
dependencies {
compile project(':demo-domain')
- compile project(':isis-applib')
- compile project(':isis-core-commons')
- compile project(':isis-mavendeps-webapp')
compile project(':isis-valuetypes-asciidoc-metamodel')
compile project(':isis-valuetypes-asciidoc-persistence-jdo-dn5')
- 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-persistence-jdo-dn5')
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')
- }
+ implementation(Libs.springBootStarterDataJpa)
+ implementation(Libs.springBootStarterWeb)
}
+task packageTests(type: Jar) {
+ from sourceSets.test.output
+ classifier = 'tests'
+}
+artifacts.archives packageTests
diff --git a/examples/demo/wicket/src/main/resources/application.yml b/examples/demo/wicket/src/main/resources/application.yml
index b8bfab8..5a225c8 100644
--- a/examples/demo/wicket/src/main/resources/application.yml
+++ b/examples/demo/wicket/src/main/resources/application.yml
@@ -17,11 +17,14 @@
#
# See also config/application.properties
#
+server:
+ port: 8080
+
cors:
allowed:
- origins: *
- headers: *
- methods: GET,POST,HEAD,PUT
+ origins: '*'
+ headers: '*'
+ methods: 'GET,POST,HEAD,PUT'
exposed:
- headers: *
+ headers: '*'
diff --git a/settings.gradle b/settings.gradle
index 6743b67..78a54dc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -100,15 +100,15 @@ 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-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-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-testing-unittestsupport-applib'
include ':isis-valuetypes'
include ':isis-valuetypes-asciidoc'
include ':isis-valuetypes-asciidoc-applib'
@@ -116,7 +116,6 @@ 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'
include ':isis-valuetypes-asciidoc-ui-vaa'
include ':isis-valuetypes-asciidoc-ui-vaa'
include ':isis-valuetypes-asciidoc-ui-wkt'
@@ -244,15 +243,15 @@ project(':isis-testing-fakedata-integtests').projectDir = "$rootDir/testing/fake
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-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-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-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
@@ -260,7 +259,6 @@ project(':isis-valuetypes-asciidoc-metamodel').projectDir = "$rootDir/valuetypes
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').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
diff --git a/subdomains/base/applib/build.gradle b/subdomains/base/applib/build.gradle
index 44205be..47047f0 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-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport-applib')
}
task packageTests(type: Jar) {
diff --git a/subdomains/xdocreport/applib/build.gradle b/subdomains/xdocreport/applib/build.gradle
index bdef7d8..fdbee57 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-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport-applib')
testCompile(Libs.guava)
}
diff --git a/testing/fakedata/applib/build.gradle b/testing/fakedata/applib/build.gradle
index d521f1a..c3ca912 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-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport-applib')
}
task packageTests(type: Jar) {
diff --git a/testing/fixtures/applib/build.gradle b/testing/fixtures/applib/build.gradle
index 6e702e9..a816098 100644
--- a/testing/fixtures/applib/build.gradle
+++ b/testing/fixtures/applib/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
dependencies {
compile compile(Libs.jodaTime)
compile project(':isis-subdomains-spring-applib')
- providedCompile project(':isis-testing-integtestsupport:isis-testing-integtestsupport-applib')
+ providedCompile project(':isis-testing-integtestsupport-applib')
compileOnly(Libs.javaxJdo)
providedCompile project(':isis-persistence-jdo-applib')
providedCompile project(':isis-core-runtime')
diff --git a/testing/specsupport/applib/build.gradle b/testing/specsupport/applib/build.gradle
index 4ba2402..9f4cd79 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-integtestsupport:isis-testing-integtestsupport-applib')
+ compile project(':isis-testing-integtestsupport-applib')
compile(Libs.cucumberJava)
compile(Libs.cucumberSpring)
compile(Libs.cucumberJunit)
diff --git a/valuetypes/asciidoc/ui/build.gradle b/valuetypes/asciidoc/ui/build.gradle
new file mode 100644
index 0000000..a53affc
--- /dev/null
+++ b/valuetypes/asciidoc/ui/build.gradle
@@ -0,0 +1,11 @@
+group = 'org.apache.isis.valuetypes'
+description = 'Apache Isis Val - Asciidoctor (ui)'
+dependencies {
+ compile(Libs.asciidoctorj)
+}
+
+task packageTests(type: Jar) {
+ from sourceSets.test.output
+ classifier = 'tests'
+}
+artifacts.archives packageTests
diff --git a/viewers/wicket/model/build.gradle b/viewers/wicket/model/build.gradle
index 2d27b45..414914b 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-unittestsupport:isis-testing-unittestsupport-applib')
+ testCompile project(':isis-testing-unittestsupport-applib')
testCompile(Libs.guava)
}