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/29 19:38:47 UTC
[isis] 18/25: ISIS-2273: removing core references to
isis-core-unittestsupport
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7fd51ff24ecc10d0a173a2d7dd8f6c95803ac547
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 18:33:51 2020 +0000
ISIS-2273: removing core references to isis-core-unittestsupport
---
core/config/pom.xml | 27 +++++++++---
core/detached-tests/pom.xml | 7 ---
core/runtime/pom.xml | 6 ---
core/runtimeservices/pom.xml | 6 ---
core/webapp/pom.xml | 12 ------
extensions/security/shiro-realm-ldap/impl/pom.xml | 6 ---
legacy/extensions/core/applib/pom.xml | 13 ------
legacy/extensions/core/commons/pom.xml | 13 ------
legacy/extensions/core/metamodel/pom.xml | 13 ------
legacy/extensions/core/runtime/pom.xml | 13 ------
legacy/mappings/restclient/pom.xml | 4 +-
legacy/testing/mavenplugin/pom.xml | 5 ---
persistence/jdo/datanucleus-5/pom.xml | 6 ---
security/keycloak/pom.xml | 6 ---
security/shiro/pom.xml | 6 ---
subdomains/excel/applib/pom.xml | 5 ---
subdomains/excel/integtests/pom.xml | 4 --
subdomains/xdocreport/applib/pom.xml | 7 ---
testing/fakedata/integtests/pom.xml | 4 --
testing/unittestsupport/applib/pom.xml | 52 ++++++++++++++++++++++-
viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 5 ---
viewers/restfulobjects/rendering/pom.xml | 5 ---
viewers/restfulobjects/viewer/pom.xml | 5 ---
viewers/wicket/model/pom.xml | 5 ---
viewers/wicket/ui/pom.xml | 13 ------
viewers/wicket/viewer/pom.xml | 6 ---
26 files changed, 75 insertions(+), 179 deletions(-)
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 9f7318e..5794fcb 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -81,18 +81,35 @@
</dependency>
<!-- TESTS -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 49b4405..43a20e4 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -88,13 +88,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
<scope>test</scope>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 2b72eac..542c6f0 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -69,12 +69,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index 0ed1f2e..b44927c 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -78,12 +78,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-config</artifactId>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index c56024e..cb648a3 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -88,18 +88,6 @@
<!-- TESTING -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/impl/pom.xml
index ec3c302..9000af5 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/impl/pom.xml
@@ -42,12 +42,6 @@
<artifactId>isis-security-shiro</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index e56a40a..c2b4d17 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -73,19 +73,6 @@
<!-- TEST DEPENDENCY -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 911a3bd..5f82d24 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -73,19 +73,6 @@
<!-- TEST DEPENDENCY -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 9432d1a..ad1853d 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -93,19 +93,6 @@
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index f50fea6..3688064 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -90,19 +90,6 @@
<!-- TEST DEPENDENCY -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/mappings/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
index be8a788..65940b6 100644
--- a/legacy/mappings/restclient/pom.xml
+++ b/legacy/mappings/restclient/pom.xml
@@ -52,12 +52,12 @@
</dependency>
<!-- TESTING -->
- <dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
-
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 6b104bc..5774e21 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -40,11 +40,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- </dependency>
-
<!-- JUPITER -->
<dependency>
<!-- JUnit API for writing tests and extensions -->
diff --git a/persistence/jdo/datanucleus-5/pom.xml b/persistence/jdo/datanucleus-5/pom.xml
index f1a7062..f95817b 100644
--- a/persistence/jdo/datanucleus-5/pom.xml
+++ b/persistence/jdo/datanucleus-5/pom.xml
@@ -131,12 +131,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
diff --git a/security/keycloak/pom.xml b/security/keycloak/pom.xml
index 8df1a9e..0297a4f 100644
--- a/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -71,12 +71,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml
index 6ef0ca5..2d77506 100644
--- a/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -72,12 +72,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<exclusions>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index fcfa015..c9baf99 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -71,11 +71,6 @@
</dependency>
<!-- test -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index 40791da..1336f89 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -78,10 +78,6 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
index e98a695..8420e66 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -69,13 +69,6 @@
<scope>test</scope>
</dependency>
- <!-- provided -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index 3d64a2d..eaa5735 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -74,10 +74,6 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index 53df518..1b1def5 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -28,11 +28,61 @@
<artifactId>guava</artifactId>
</dependency>
- <!-- note that this is *not* a test dependency -->
+ <!-- note that these are *not* a test dependency -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- framework default codegen for tests -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
</dependency>
+
</dependencies>
</project>
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 6694c39..3724daf 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -93,11 +93,6 @@
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/viewers/restfulobjects/rendering/pom.xml b/viewers/restfulobjects/rendering/pom.xml
index c6b0889..c2ea906 100644
--- a/viewers/restfulobjects/rendering/pom.xml
+++ b/viewers/restfulobjects/rendering/pom.xml
@@ -47,11 +47,6 @@
</dependency>
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/viewers/restfulobjects/viewer/pom.xml b/viewers/restfulobjects/viewer/pom.xml
index 15fc084..ce9f713 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -70,11 +70,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index 0df92e7..75a2873 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -68,11 +68,6 @@
</dependency>
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index 333c607..6c9299f 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -318,19 +318,6 @@
</dependency>
<!-- TEST DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
-<!--
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
--->
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index 7a39974..3c6a348 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -157,12 +157,6 @@
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<scope>test</scope>