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:24 UTC
[isis] 10/21: ISIS-2259: adds parent module for integtestsupport
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 bdef229bc2bb5c6d8d945c9437a1106be6c20bab
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:51:22 2020 +0000
ISIS-2259: adds parent module for integtestsupport
---
core/pom.xml | 1 -
testing/integtestsupport/{ => applib}/pom.xml | 15 +-
.../applib}/ExceptionRecognizerTranslate.java | 2 +-
.../applib}/IsisIntegrationTestAbstract.java | 2 +-
.../applib}/ThrowableMatchers.java | 2 +-
.../applib}/validate/ValidateDomainModel.java | 2 +-
testing/integtestsupport/pom.xml | 177 +--------------------
testing/pom.xml | 4 +-
8 files changed, 20 insertions(+), 185 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 750a0de..09b798c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1850,7 +1850,6 @@
<module>webboot-springboot</module>
<module>testsupport/unittestsupport</module>
- <module>../testing/integtestsupport</module>
<module>security</module>
<module>../security/bypass</module>
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/applib/pom.xml
similarity index 91%
copy from testing/integtestsupport/pom.xml
copy to testing/integtestsupport/applib/pom.xml
index a54f2a9..e1322ba 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -15,24 +15,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
- <name>Apache Isis Testing - Integ Test Support</name>
+ <name>Apache Isis Testing - Integ Test Support (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.integtestsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/integtestsupport</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.integtestsupport.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/integtestsupport/applib</git-plugin.propertiesDir>
</properties>
- <description>
- Support for writing integ tests in JUnit 5; should be added as a dependency with scope=test only
- </description>
-
<dependencies>
<dependency>
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
similarity index 97%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
index 0815dab..e2aa4ee 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ExceptionRecognizerTranslate.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.integtestsupport;
+package org.apache.isis.testing.integtestsupport.applib;
import org.junit.rules.MethodRule;
import org.junit.runners.model.FrameworkMethod;
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
similarity index 98%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
index bedb4eb..4e51396 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/IsisIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.integtestsupport;
+package org.apache.isis.testing.integtestsupport.applib;
import javax.inject.Inject;
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ThrowableMatchers.java
similarity index 96%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ThrowableMatchers.java
index 7ab8e65..30077b5 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/ThrowableMatchers.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ThrowableMatchers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.integtestsupport;
+package org.apache.isis.testing.integtestsupport.applib;
import java.util.List;
diff --git a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/validate/ValidateDomainModel.java
similarity index 98%
rename from testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/validate/ValidateDomainModel.java
index 639d080..787df42 100644
--- a/testing/integtestsupport/src/main/java/org/apache/isis/integtestsupport/validate/ValidateDomainModel.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/validate/ValidateDomainModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.integtestsupport.validate;
+package org.apache.isis.testing.integtestsupport.applib.validate;
import java.util.Collection;
import java.util.Collections;
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
index a54f2a9..b1752c8 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -15,183 +15,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
</parent>
- <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>
- <git-plugin.propertiesDir>org/apache/isis/integtestsupport</git-plugin.propertiesDir>
- </properties>
+ <artifactId>isis-testing-integtestsupport</artifactId>
+ <name>Apache Isis Testing - Integ Test Support (parent)</name>
<description>
Support for writing integ tests in JUnit 5; should be added as a dependency with scope=test only
</description>
- <dependencies>
-
- <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.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>
- <scope>compile</scope>
- </dependency>
-
- <!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <!-- convergence issues from spring-boot-starter-log4j2 -->
- <version>${slf4j-api.version}</version>
- </dependency>
-
-
- <!-- SPRING -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <!-- when spring-boot release lags behind spring-core release explicitly
- spring-test added below -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </exclusion>
- <exclusion>
- <!-- when spring-boot release lags behind spring-core release explicitly
- spring-test added below -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <!-- we use log4j-2 instead -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-bypass</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtimeservices</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-webboot-springboot</artifactId>
- </dependency>
- </dependencies>
-
- <profiles>
+ <packaging>pom</packaging>
- <profile>
- <id>jdk11-supplemental</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <!--
- These dependencies are required in order to build on jdk11
- -->
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-ri</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <modules>
+ <module>applib</module>
+ </modules>
</project>
diff --git a/testing/pom.xml b/testing/pom.xml
index 446c902..9b332c4 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -129,8 +129,10 @@
<module>hsqldbmgr</module>
<module>specsupport</module>
+ <module>integtestsupport</module>
+ <module>integtestsupport/applib</module>
+
<module>unittestsupport</module>
- <module>unittestsupport/applib</module>
</modules>
<profiles>