You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 15:22:23 UTC
[isis] 09/21: ISIS-2259: renames isis-integtestsupport to
isis-testing-integtestsupport-applib
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit aa0d039d124b33657f7822a70a3f415672aea98f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:45:36 2020 +0000
ISIS-2259: renames isis-integtestsupport to isis-testing-integtestsupport-applib
---
antora/playbooks/site-testing.yml | 6 +++---
antora/playbooks/site.yml | 6 +++---
core/pom.xml | 5 -----
mavendeps/testing/pom.xml | 2 +-
testing/fixtures/applib/pom.xml | 2 +-
testing/integtestsupport/pom.xml | 4 ++--
testing/pom.xml | 6 ++++++
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 58015c9..d2e258a 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -19,9 +19,6 @@ content:
- url: .
start_path: core/testsupport/unittestsupport/src/main/doc # testing
branches: HEAD
- - url: .
- start_path: core/testsupport/integtestsupport/src/main/doc # testing
- branches: HEAD
# testing
- url: .
@@ -37,6 +34,9 @@ content:
start_path: testing/hsqldbmgr/impl/src/main/doc # testing
branches: HEAD
- url: .
+ start_path: testing/integtestsupport/src/main/doc # testing
+ branches: HEAD
+ - url: .
start_path: testing/specsupport/src/main/doc # testing
branches: HEAD
- url: .
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 15d28b5..82d0865 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -100,9 +100,6 @@ content:
start_path: core/testsupport/unittestsupport/src/main/doc # testing
branches: HEAD
- url: .
- start_path: core/testsupport/integtestsupport/src/main/doc # testing
- branches: HEAD
- - url: .
start_path: core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc # vro
branches: HEAD
- url: .
@@ -234,6 +231,9 @@ content:
start_path: testing/hsqldbmgr/src/main/doc # testing
branches: HEAD
- url: .
+ start_path: testing/integtestsupport/src/main/doc # testing
+ branches: HEAD
+ - url: .
start_path: testing/specsupport/src/main/doc # testing
branches: HEAD
- url: .
diff --git a/core/pom.xml b/core/pom.xml
index 8910151..750a0de 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -810,11 +810,6 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-integtestsupport</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/mavendeps/testing/pom.xml b/mavendeps/testing/pom.xml
index dec2934..6c4ffba 100644
--- a/mavendeps/testing/pom.xml
+++ b/mavendeps/testing/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-integtestsupport</artifactId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index aaaef79..5db80c0 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-integtestsupport</artifactId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
index b72a8a3..a54f2a9 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -21,8 +21,8 @@
<relativePath>../../core/pom.xml</relativePath>
</parent>
- <artifactId>isis-integtestsupport</artifactId>
- <name>Apache Isis Core - Integ Test Support</name>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <name>Apache Isis Testing - Integ Test Support</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.integtestsupport</jar-plugin.automaticModuleName>
diff --git a/testing/pom.xml b/testing/pom.xml
index eab6c4e..446c902 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -62,6 +62,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-spring-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>