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/30 17:03:29 UTC
[isis] 04/08: ISIS-2192: sorting out dependencies
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ef123c3187538904c50c4a7d41d9d8421660d6b8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 16:09:30 2020 +0000
ISIS-2192: sorting out dependencies
go the other way. Also add in fakedata for all 3
---
README.adoc | 4 ++--
mavendeps/adoc/modules/mavendeps/pages/about.adoc | 5 +++++
mavendeps/integspecs/pom.xml | 11 +++++++++++
mavendeps/integtests/pom.xml | 10 ++++++++++
mavendeps/unittests/pom.xml | 5 +++++
testing/fixtures/applib/pom.xml | 6 ++++++
testing/integtestsupport/applib/pom.xml | 5 -----
7 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/README.adoc b/README.adoc
index 314250a..e0e76b7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -11,8 +11,8 @@ image:https://github.com/apache-isis-committers/isis-nightly/workflows/Nightly/b
_http://isis.apache.org[Apache Isis] software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API._
-Start learning about Apache Isis using our http://isis.apache.org/arch/helloworld/about.html["Hello World"] Maven archetype.
-Build your own apps using our http://isis.apache.org/arch/simpleapp/about.html["SimpleApp"] Maven archetype.
+Start learning about Apache Isis using the http://github.com/apache/isis-app-helloworld["Hello World"] starter app.
+Build your own apps using our http://github.com/apache/isis-app-simpleapp["SimpleApp"] starter app.
For help and support, join the http://isis.apache.org/support.html[mailing lists].
To contribute to our documentation, see our https://github.com/apache/isis/tree/master/adocs/documentation[Asciidoctor source].
diff --git a/mavendeps/adoc/modules/mavendeps/pages/about.adoc b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
index 24a791f..765ac28 100644
--- a/mavendeps/adoc/modules/mavendeps/pages/about.adoc
+++ b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
@@ -201,6 +201,11 @@ with JMock2 extensions to mock classes
| Y
| Y
+| Apache Isis xref:testing:fakedata:about.adoc[Fake Data]
+| Y
+| Y
+| Y
+
| Apache Isis xref:testing:fixtures:about.adoc[Fixture Scripts]
|
| Y
diff --git a/mavendeps/integspecs/pom.xml b/mavendeps/integspecs/pom.xml
index cc8285f..5fa2c17 100644
--- a/mavendeps/integspecs/pom.xml
+++ b/mavendeps/integspecs/pom.xml
@@ -35,6 +35,17 @@
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-specsupport-applib</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/mavendeps/integtests/pom.xml b/mavendeps/integtests/pom.xml
index aa013e3..6fd564b 100644
--- a/mavendeps/integtests/pom.xml
+++ b/mavendeps/integtests/pom.xml
@@ -37,6 +37,16 @@
<artifactId>isis-testing-integtestsupport-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/mavendeps/unittests/pom.xml b/mavendeps/unittests/pom.xml
index 260da8d..cfe9872 100644
--- a/mavendeps/unittests/pom.xml
+++ b/mavendeps/unittests/pom.xml
@@ -57,6 +57,11 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index a469687..c136aca 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -59,6 +59,12 @@
<artifactId>isis-subdomains-spring-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- JDO API (non transient, provided by plugin) -->
<dependency>
<groupId>javax.jdo</groupId>
diff --git a/testing/integtestsupport/applib/pom.xml b/testing/integtestsupport/applib/pom.xml
index a4f3f8a..f2ca83b 100644
--- a/testing/integtestsupport/applib/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -100,11 +100,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-bypass</artifactId>
</dependency>