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 2021/01/17 19:04:29 UTC
[isis] 01/01: Merge remote-tracking branch 'origin/master' into
ISIS-2486-jdo-jpa-module-rationalize
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 10df6b119a4324793848c78653657b9b3f5f35be
Merge: 72e966a c167463
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jan 17 19:03:47 2021 +0000
Merge remote-tracking branch 'origin/master' into ISIS-2486-jdo-jpa-module-rationalize
.../schema/JdoSchemaService.adoc | 0
.../modules/generated/pages/system-overview.adoc | 99 ++++++++++++++++------
regressiontests/pom.xml | 10 +++
3 files changed, 84 insertions(+), 25 deletions(-)
diff --cc regressiontests/pom.xml
index 1ba4634,bb3cd75..3615acf
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@@ -340,7 -340,17 +340,17 @@@
<artifactId>isis-mavendeps-jdk11</artifactId>
<type>pom</type>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-unittestsupport-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ </dependency>
-
++
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-shiro</artifactId>