You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/14 18:19:20 UTC
[isis] branch master updated: ISIS-2428: fix gradle build after
relocating 'commons'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new cc249a9 ISIS-2428: fix gradle build after relocating 'commons'
cc249a9 is described below
commit cc249a9198af646ed2c52d6ff209adc27fd8fbbb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 14 20:19:07 2020 +0200
ISIS-2428: fix gradle build after relocating 'commons'
(prev. commit was logged under wrong issue id, should have been this
one)
---
api/applib/build.gradle | 2 +-
api/schema/build.gradle | 2 +-
core/codegen-bytebuddy/build.gradle | 2 +-
core/config/build.gradle | 2 +-
core/internaltestsupport/build.gradle | 2 +-
core/metamodel/build.gradle | 2 +-
examples/demo/domain/build.gradle | 2 +-
examples/demo/wicket/build.gradle | 2 +-
extensions/security/secman/api/build.gradle | 2 +-
legacy/mappings/restclient/build.gradle | 2 +-
mappings/restclient/api/build.gradle | 2 +-
persistence/jdo/applib/build.gradle | 2 +-
persistence/jpa/applib/build.gradle | 2 +-
settings.gradle | 8 ++++----
valuetypes/asciidoc/ui/wicket/build.gradle | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/api/applib/build.gradle b/api/applib/build.gradle
index 2d9cc84..8e55fde 100644
--- a/api/applib/build.gradle
+++ b/api/applib/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'war'
dependencies {
compile project(':isis-parent:isis-schema')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile(Libs.javaeeApi)
compile(Libs.findbugsAnnotations)
diff --git a/api/schema/build.gradle b/api/schema/build.gradle
index e655d48..50781fb 100644
--- a/api/schema/build.gradle
+++ b/api/schema/build.gradle
@@ -16,7 +16,7 @@ sourceSets {
}
dependencies {
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile(Libs.springContext)
compile(Libs.jodaTime)
diff --git a/core/codegen-bytebuddy/build.gradle b/core/codegen-bytebuddy/build.gradle
index 9eaac6c..22a1a63 100644
--- a/core/codegen-bytebuddy/build.gradle
+++ b/core/codegen-bytebuddy/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'war'
dependencies {
compile (Libs.byteBuddy)
compile (Libs.objenesis)
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
testCompile(Libs.jmockJunit4) {
exclude(module: 'junit-dep')
exclude(module: 'byte-buddy')
diff --git a/core/config/build.gradle b/core/config/build.gradle
index 022e5e5..3f4da6e 100644
--- a/core/config/build.gradle
+++ b/core/config/build.gradle
@@ -20,7 +20,7 @@ sourceSets {
dependencies {
compile project(':isis-parent:isis-applib')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile (Libs.hibernateValidator)
compile (Libs.springBootConfigurationProcessor)
testCompile project(':isis-parent:isis:isis-core-internaltestsupport')
diff --git a/core/internaltestsupport/build.gradle b/core/internaltestsupport/build.gradle
index d1b30e5..6c9da5a 100644
--- a/core/internaltestsupport/build.gradle
+++ b/core/internaltestsupport/build.gradle
@@ -2,7 +2,7 @@ description = 'Apache Isis Core - Unit Test Support'
apply plugin: 'war'
dependencies {
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile(Libs.junitJupiterApi)
compile(Libs.junitJupiterEngine)
compile(Libs.junitVintageEngine)
diff --git a/core/metamodel/build.gradle b/core/metamodel/build.gradle
index 2d70f2c..bffa121 100644
--- a/core/metamodel/build.gradle
+++ b/core/metamodel/build.gradle
@@ -34,7 +34,7 @@ dependencies {
exclude(module: 'slf4j-api')
exclude(module: 'commons-lang3')
}
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
testCompile project(':isis-parent:isis:isis-core-internaltestsupport')
diff --git a/examples/demo/domain/build.gradle b/examples/demo/domain/build.gradle
index 405e4cc..4bd76e3 100644
--- a/examples/demo/domain/build.gradle
+++ b/examples/demo/domain/build.gradle
@@ -3,7 +3,7 @@ description = 'Apache Isis App - Demo (Domain)'
dependencies {
compile project(':isis-parent:isis-applib')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-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')
diff --git a/examples/demo/wicket/build.gradle b/examples/demo/wicket/build.gradle
index ace488b..0ec1b57 100644
--- a/examples/demo/wicket/build.gradle
+++ b/examples/demo/wicket/build.gradle
@@ -3,7 +3,7 @@ description = 'Apache Isis App - Demo (Wicket)'
dependencies {
compile project(':isis-parent:isis-applib')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile project(':isis-app-starter-parent:demo-parent:demo-domain')
compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-applib')
compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-markdown:isis-valuetypes-markdown-ui')
diff --git a/extensions/security/secman/api/build.gradle b/extensions/security/secman/api/build.gradle
index f0d50f9..c5ca4fc 100644
--- a/extensions/security/secman/api/build.gradle
+++ b/extensions/security/secman/api/build.gradle
@@ -3,7 +3,7 @@ description = 'Apache Isis Ext - Sec Man API'
apply plugin: 'war'
dependencies {
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-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')
diff --git a/legacy/mappings/restclient/build.gradle b/legacy/mappings/restclient/build.gradle
index c8cb493..c1ef275 100644
--- a/legacy/mappings/restclient/build.gradle
+++ b/legacy/mappings/restclient/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
dependencies {
compile project(':isis-parent:isis:isis-viewer-restfulobjects:isis-viewer-restfulobjects-applib')
testCompile project(':isis-parent:isis:isis-core-internaltestsupport')
- providedCompile project(':isis-parent:isis:isis-commons')
+ providedCompile project(':isis-parent:isis-commons')
}
task packageTests(type: Jar) {
diff --git a/mappings/restclient/api/build.gradle b/mappings/restclient/api/build.gradle
index d4dc804..5c48cf0 100644
--- a/mappings/restclient/api/build.gradle
+++ b/mappings/restclient/api/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.mappings'
description = 'Apache Isis Ext - REST Client'
dependencies {
compile project(':isis-parent:isis-applib')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile (Libs.springContext)
}
diff --git a/persistence/jdo/applib/build.gradle b/persistence/jdo/applib/build.gradle
index b32c2cf..1325d92 100644
--- a/persistence/jdo/applib/build.gradle
+++ b/persistence/jdo/applib/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.persistence'
description = 'Apache Isis Persistence - JDO (applib)'
dependencies {
compile project(':isis-parent:isis-applib')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile(Libs.javaxJdo)
compile(Libs.datanucleusRdbms)
}
diff --git a/persistence/jpa/applib/build.gradle b/persistence/jpa/applib/build.gradle
index 3e2442e..129a334 100644
--- a/persistence/jpa/applib/build.gradle
+++ b/persistence/jpa/applib/build.gradle
@@ -2,7 +2,7 @@ group = 'org.apache.isis.persistence'
description = 'Apache Isis Persistence - JPA (applib)'
dependencies {
compile project(':isis-parent:isis-applib')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
}
task packageTests(type: Jar) {
diff --git a/settings.gradle b/settings.gradle
index c014c60..03bb747 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@ rootProject.name = 'isis-all'
include ':isis-parent:isis-schema'
include ':isis-parent:isis-applib'
include ':isis-parent:isis:isis-core-codegen-bytebuddy'
-include ':isis-parent:isis:isis-core-commons'
+include ':isis-parent:isis-commons'
include ':isis-parent:isis:isis-core-config'
include ':isis-parent:isis:isis-core-internaltestsupport'
include ':isis-parent:isis:isis-core-metamodel'
@@ -30,7 +30,7 @@ include ':isis-parent:isis:isis-persistence-jdo'
include ':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-applib'
include ':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-model'
include ':isis-parent:isis:isis-persistence-jpa'
-include ':isis-parent:isis-core'
+include ':isis-parent:isis'
include ':isis-parent:isis:isis-extensions:isis-extensions-flyway:isis-extensions-flyway-impl'
include ':isis-parent:isis:isis-extensions:isis-extensions-flyway'
include ':isis-parent:isis:isis-extensions:isis-extensions-modelannotation'
@@ -135,7 +135,7 @@ include ':isis-app-starter-parent:smoketests'
project(':isis-parent:isis-schema').projectDir = "$rootDir/api/schema" as File
project(':isis-parent:isis-applib').projectDir = "$rootDir/api/applib" as File
project(':isis-parent:isis:isis-core-codegen-bytebuddy').projectDir = "$rootDir/core/codegen-bytebuddy" as File
-project(':isis-parent:isis:isis-commons').projectDir = "$rootDir/commons" as File
+project(':isis-parent:isis-commons').projectDir = "$rootDir/commons" as File
project(':isis-parent:isis:isis-core-config').projectDir = "$rootDir/core/config" as File
project(':isis-parent:isis:isis-core-internaltestsupport').projectDir = "$rootDir/core/internaltestsupport" as File
project(':isis-parent:isis:isis-core-metamodel').projectDir = "$rootDir/core/metamodel" as File
@@ -163,7 +163,7 @@ project(':isis-parent:isis:isis-persistence-jdo').projectDir = "$rootDir/persist
project(':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-applib').projectDir = "$rootDir/persistence/jpa/applib" as File
project(':isis-parent:isis:isis-persistence-jpa:isis-persistence-jpa-model').projectDir = "$rootDir/persistence/jpa/model" as File
project(':isis-parent:isis:isis-persistence-jpa').projectDir = "$rootDir/persistence/jpa" as File
-project(':isis-parent:isis-core').projectDir = "$rootDir/core" as File
+project(':isis-parent:isis').projectDir = "$rootDir/core" as File
project(':isis-parent:isis:isis-extensions:isis-extensions-flyway:isis-extensions-flyway-impl').projectDir = "$rootDir/extensions/core/flyway/impl" as File
project(':isis-parent:isis:isis-extensions:isis-extensions-flyway').projectDir = "$rootDir/extensions/core/flyway" as File
project(':isis-parent:isis:isis-extensions:isis-extensions-modelannotation').projectDir = "$rootDir/extensions/core/model-annotation" as File
diff --git a/valuetypes/asciidoc/ui/wicket/build.gradle b/valuetypes/asciidoc/ui/wicket/build.gradle
index bdd95b4..7d01f6f 100644
--- a/valuetypes/asciidoc/ui/wicket/build.gradle
+++ b/valuetypes/asciidoc/ui/wicket/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
dependencies {
compile project(':isis-parent:isis-applib')
- compile project(':isis-parent:isis:isis-commons')
+ compile project(':isis-parent:isis-commons')
compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc')
compile project(':isis-parent:isis:isis-valuetypes:isis-valuetypes-asciidoc:isis-valuetypes-asciidoc-applib')