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/12 15:25:28 UTC
[isis] 02/03: Runs up to:
:isis-app-starter-parent:demo-parent:demo-wicket:compileJava
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2374
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e5851330c40de9700a503f0ba3f27b9508f5870a
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sun Jul 12 15:23:26 2020 +0200
Runs up to: :isis-app-starter-parent:demo-parent:demo-wicket:compileJava
---
api/applib/build.gradle | 10 ----------
api/schema/build.gradle | 10 ----------
build.gradle | 11 +++++++++++
core/security/build.gradle | 3 +++
examples/demo/domain/build.gradle | 20 ++++++++++++++++++++
extensions/security/secman/api/build.gradle | 12 ++++++++++--
6 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/api/applib/build.gradle b/api/applib/build.gradle
index 5e3e014..58d9699 100644
--- a/api/applib/build.gradle
+++ b/api/applib/build.gradle
@@ -1,16 +1,6 @@
description = 'Apache Isis Core - AppLib'
apply plugin: 'war'
-buildscript {
- repositories {
- maven { url "https://plugins.gradle.org/m2/" }
- }
- dependencies {
- classpath "io.freefair.gradle:lombok-plugin:5.1.0"
- }
-}
-apply plugin: "io.freefair.lombok"
-
dependencies {
compile project(':isis-parent:isis-schema')
compile project(':isis-parent:isis:isis-core-commons')
diff --git a/api/schema/build.gradle b/api/schema/build.gradle
index fd9a62c..1a8037e 100644
--- a/api/schema/build.gradle
+++ b/api/schema/build.gradle
@@ -1,16 +1,6 @@
description = 'Apache Isis Core - Schemas'
apply plugin: 'war'
-buildscript {
- repositories {
- maven { url "https://plugins.gradle.org/m2/" }
- }
- dependencies {
- classpath "io.freefair.gradle:lombok-plugin:5.1.0"
- }
-}
-apply plugin: "io.freefair.lombok"
-
sourceSets {
main {
java {
diff --git a/build.gradle b/build.gradle
index 35dec3b..b3c10af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,21 @@
+buildscript {
+ repositories {
+ maven { url "https://plugins.gradle.org/m2/" }
+ }
+ dependencies {
+ classpath "io.freefair.gradle:lombok-plugin:5.1.0"
+ }
+}
+
allprojects {
+ apply plugin: "io.freefair.lombok"
apply plugin: 'maven'
group = 'org.apache.isis'
version = '2.0.0-SNAPSHOT'
}
subprojects {
+ apply plugin: "io.freefair.lombok"
apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
diff --git a/core/security/build.gradle b/core/security/build.gradle
index 6276916..8f21889 100644
--- a/core/security/build.gradle
+++ b/core/security/build.gradle
@@ -2,6 +2,9 @@ description = 'Apache Isis Core - Security'
dependencies {
compile project(':isis-parent:isis-applib')
compile project(':isis-parent:isis:isis-core-config')
+ compile('org.springframework.boot:spring-boot-starter-log4j2:2.2.7.RELEASE') {
+ exclude(module: 'slf4j-api')
+ }
testCompile(group: 'org.jmock', name: 'jmock-junit4', version: '2.11.0') {
exclude(module: 'junit-dep')
}
diff --git a/examples/demo/domain/build.gradle b/examples/demo/domain/build.gradle
index 9758438..e83b525 100644
--- a/examples/demo/domain/build.gradle
+++ b/examples/demo/domain/build.gradle
@@ -1,2 +1,22 @@
group = 'org.apache.isis.examples.apps'
description = 'Apache Isis App - Demo (Domain)'
+
+dependencies {
+ compile project(':isis-parent:isis-applib')
+ compile project(':isis-parent:isis:isis-core-commons')
+ compile project(':isis-parent:isis:isis-testing:isis-testing-fixtures:isis-testing-fixtures-applib')
+ compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')
+ compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
+
+ //compile('commons-httpclient:commons-httpclient:3.1') // did not work for me
+ compile('org.apache.httpcomponents:httpclient:4.5.12')
+
+ compile project(':isis-parent:isis:isis-extensions:isis-extensions-exceldownload:isis-extensions-exceldownload-ui')
+ compile project(':isis-parent:isis:isis-testing:isis-testing-h2console:isis-testing-h2console-ui')
+ compile project(':isis-parent:isis:isis-viewer-restfulobjects:isis-viewer-restfulobjects-jaxrsresteasy4')
+ compile project(':isis-parent:isis:isis-extensions:isis-extensions-secman:isis-extensions-secman-encryption-jbcrypt')
+ compile project(':isis-parent:isis:isis-extensions:isis-extensions-secman:isis-extensions-secman-persistence-jdo')
+ compile project(':isis-parent:isis:isis-extensions:isis-extensions-secman:isis-extensions-secman-shiro-realm')
+ compile project(':isis-parent:isis:isis-extensions:isis-extensions-modelannotation')
+ compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-sse-applib')
+}
diff --git a/extensions/security/secman/api/build.gradle b/extensions/security/secman/api/build.gradle
index d547ff2..9c3666e 100644
--- a/extensions/security/secman/api/build.gradle
+++ b/extensions/security/secman/api/build.gradle
@@ -1,8 +1,16 @@
group = 'org.apache.isis.extensions'
description = 'Apache Isis Ext - Sec Man API'
+apply plugin: 'war'
+
+dependencies {
+ compile project(':isis-parent:isis:isis-core-commons')
+ compile project(':isis-parent:isis-applib')
+ compile project(':isis-parent:isis:isis-extensions:isis-extensions-secman')
+ compile project(':isis-parent:isis:isis-core-metamodel')
+}
task packageTests(type: Jar) {
- from sourceSets.test.output
- classifier = 'tests'
+ from sourceSets.test.output
+ classifier = 'tests'
}
artifacts.archives packageTests