You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/02 16:44:34 UTC
[isis] branch master updated: ISIS-2843: Remove mavendeps 'integtests'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new bc39388837 ISIS-2843: Remove mavendeps 'integtests'
bc39388837 is described below
commit bc39388837fc60da12b7204fd314faf9ac8310e1
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon May 2 18:44:24 2022 +0200
ISIS-2843: Remove mavendeps 'integtests'
---
.../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 24 +++++++++-
core/pom.xml | 15 +++++--
examples/demo/javafx/pom.xml | 5 +--
extensions/applib/excel/fixture/pom.xml | 12 -----
extensions/applib/excel/integtests/pom.xml | 19 +++++---
extensions/core/command-log/applib/pom.xml | 7 ++-
extensions/core/command-log/jdo/pom.xml | 7 ++-
extensions/core/command-log/jpa/pom.xml | 13 ++++--
extensions/security/secman/applib/pom.xml | 11 +++--
extensions/security/secman/persistence-jdo/pom.xml | 11 +++--
extensions/security/secman/persistence-jpa/pom.xml | 11 +++--
mavendeps/integtests/pom.xml | 52 ----------------------
mavendeps/pom.xml | 7 ---
regressiontests/pom.xml | 20 +++------
starters/pom.xml | 19 ++++++--
testing/fakedata/integtests/pom.xml | 18 +++++---
16 files changed, 117 insertions(+), 134 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index a87403668f..35b5d3905a 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -109,8 +109,6 @@ import org.apache.isis.viewer.restfulobjects.client.RestfulClientConfig;
<T> Try<Can<T>> digestList(Response response, Class<T> entityType, GenericType<List<T>> genericType);
----
-
-
=== Mappings
[source, xml]
@@ -122,5 +120,27 @@ import org.apache.isis.viewer.restfulobjects.client.RestfulClientConfig;
-->
----
+=== Mavendeps
+
+[source, xml]
+.integtests
+----
+<!-- removed
+<groupId>org.apache.isis.mavendeps</groupId>
+<artifactId>isis-mavendeps-integtests</artifactId>
+<type>pom</type>
+-->
+
+<!-- instead use directly as required ... -->
+
+<groupId>org.apache.isis.testing</groupId>
+<artifactId>isis-testing-integtestsupport-applib</artifactId>
+
+<groupId>org.apache.isis.testing</groupId>
+<artifactId>isis-testing-fakedata-applib</artifactId>
+
+<groupId>org.apache.isis.testing</groupId>
+<artifactId>isis-testing-fixtures-applib</artifactId>
+----
diff --git a/core/pom.xml b/core/pom.xml
index 87cee1665a..2871041bb8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -664,10 +664,19 @@
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
diff --git a/examples/demo/javafx/pom.xml b/examples/demo/javafx/pom.xml
index 922824f38b..511a431ab7 100644
--- a/examples/demo/javafx/pom.xml
+++ b/examples/demo/javafx/pom.xml
@@ -136,10 +136,9 @@
<!-- INTEGRATION TESTING -->
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
<scope>test</scope>
- <type>pom</type>
</dependency>
<!-- OTHER DEPENDENCIES -->
diff --git a/extensions/applib/excel/fixture/pom.xml b/extensions/applib/excel/fixture/pom.xml
index 6192a6467a..a56fa6c9cd 100644
--- a/extensions/applib/excel/fixture/pom.xml
+++ b/extensions/applib/excel/fixture/pom.xml
@@ -98,11 +98,6 @@ under the License.
<artifactId>jdom2</artifactId>
<version>2.0.3</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-applib</artifactId>
- </dependency>
-->
<dependency>
@@ -112,13 +107,6 @@ under the License.
<!-- test -->
<!--
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.togglz</groupId>
<artifactId>togglz-junit</artifactId>
diff --git a/extensions/applib/excel/integtests/pom.xml b/extensions/applib/excel/integtests/pom.xml
index 27ad752ee1..5e6213f911 100644
--- a/extensions/applib/excel/integtests/pom.xml
+++ b/extensions/applib/excel/integtests/pom.xml
@@ -95,13 +95,18 @@ under the License.
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- PERSISTENCE -->
<dependency>
diff --git a/extensions/core/command-log/applib/pom.xml b/extensions/core/command-log/applib/pom.xml
index 51b7437517..c1e4e04ff3 100644
--- a/extensions/core/command-log/applib/pom.xml
+++ b/extensions/core/command-log/applib/pom.xml
@@ -81,10 +81,9 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/extensions/core/command-log/jdo/pom.xml b/extensions/core/command-log/jdo/pom.xml
index 5649ec4471..fedf8f8de5 100644
--- a/extensions/core/command-log/jdo/pom.xml
+++ b/extensions/core/command-log/jdo/pom.xml
@@ -68,10 +68,9 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/extensions/core/command-log/jpa/pom.xml b/extensions/core/command-log/jpa/pom.xml
index 6c50de6606..e7779eb123 100644
--- a/extensions/core/command-log/jpa/pom.xml
+++ b/extensions/core/command-log/jpa/pom.xml
@@ -68,10 +68,15 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/extensions/security/secman/applib/pom.xml b/extensions/security/secman/applib/pom.xml
index 8fd4aff74d..841ce5102b 100644
--- a/extensions/security/secman/applib/pom.xml
+++ b/extensions/security/secman/applib/pom.xml
@@ -55,12 +55,11 @@
<artifactId>spring-security-crypto</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index 3c57db0e2d..835bbbadcf 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -68,9 +68,14 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<scope>test</scope>
</dependency>
diff --git a/extensions/security/secman/persistence-jpa/pom.xml b/extensions/security/secman/persistence-jpa/pom.xml
index d4bb98afae..54f2b5cf5f 100644
--- a/extensions/security/secman/persistence-jpa/pom.xml
+++ b/extensions/security/secman/persistence-jpa/pom.xml
@@ -75,9 +75,14 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<scope>test</scope>
</dependency>
diff --git a/mavendeps/integtests/pom.xml b/mavendeps/integtests/pom.xml
deleted file mode 100644
index ce921a5796..0000000000
--- a/mavendeps/integtests/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-mavendeps-integtests</artifactId>
-
- <packaging>pom</packaging>
-
- <name>Apache Isis Maven Deps - Integration Testing</name>
- <description>
- Defines a module that can be used as a single dependency for integration tests.
- </description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <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/pom.xml b/mavendeps/pom.xml
index cf7dc4a19c..61cde4b5be 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -92,12 +92,6 @@
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
@@ -126,7 +120,6 @@
<modules>
<module>unittests</module>
- <module>integtests</module>
<module>webapp</module>
</modules>
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index 27d691d772..52b1e2df7e 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -153,12 +153,6 @@
<scope>provided</scope>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.apache.isis.mavendeps</groupId> -->
-<!-- <artifactId>isis-mavendeps-webapp</artifactId> -->
-<!-- <type>pom</type> -->
-<!-- </dependency> -->
-
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-unittestsupport-applib</artifactId>
@@ -167,6 +161,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -248,6 +243,12 @@
<artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ </dependency>
+
<!-- TEST DEPENDENCIES -->
@@ -264,13 +265,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-specsupport-applib</artifactId>
diff --git a/starters/pom.xml b/starters/pom.xml
index 55c3252baa..9d523a15cf 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -105,12 +105,17 @@
<scope>import</scope>
<type>pom</type>
</dependency>
-
+
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <type>pom</type>
</dependency>
<dependency>
@@ -120,6 +125,12 @@
<scope>import</scope>
<type>pom</type>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>com.approvaltests</groupId>
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index f869a290ba..1788d7bd61 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -92,13 +92,17 @@ under the License.
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>