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/04/12 14:01:36 UTC
[isis] branch master updated: ISIS-3000: update deps on reg. tests
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 c79e615b32 ISIS-3000: update deps on reg. tests
c79e615b32 is described below
commit c79e615b3221dfc863b65bd248efb913b161384d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Apr 12 16:01:30 2022 +0200
ISIS-3000: update deps on reg. tests
---
regressiontests/incubating/pom.xml | 4 ++--
.../test/java/org/apache/isis/testdomain/rest/CorsFilterTest.java | 4 ++--
.../testdomain/rest/RestServiceSimpifiedRepresentationTest.java | 6 +++---
regressiontests/pom.xml | 4 ++--
regressiontests/stable-rest/pom.xml | 4 ++--
.../org/apache/isis/testdomain/rest/RestServiceStressTest.java | 2 +-
regressiontests/stable/pom.xml | 4 ++--
.../org/apache/isis/testdomain/util/rest/RestEndpointService.java | 8 ++++----
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/regressiontests/incubating/pom.xml b/regressiontests/incubating/pom.xml
index 3ee650e0f4..6d24bbbcf3 100644
--- a/regressiontests/incubating/pom.xml
+++ b/regressiontests/incubating/pom.xml
@@ -89,8 +89,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient-applib</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-restfulobjects-client</artifactId>
<scope>test</scope>
</dependency>
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/CorsFilterTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/CorsFilterTest.java
index 1121cc3e17..4d2235f8dc 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/CorsFilterTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/CorsFilterTest.java
@@ -39,12 +39,12 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.extensions.cors.impl.IsisModuleExtCors;
-import org.apache.isis.extensions.restclient.ResponseDigest;
-import org.apache.isis.extensions.restclient.log.ClientConversationFilter;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.rospec.Configuration_usingRoSpec;
import org.apache.isis.testdomain.rospec.RoSpecSampler;
import org.apache.isis.testdomain.util.rest.RestEndpointService;
+import org.apache.isis.viewer.restfulobjects.client.ResponseDigest;
+import org.apache.isis.viewer.restfulobjects.client.log.ClientConversationFilter;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
import lombok.val;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceSimpifiedRepresentationTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
index e034dffd6a..b5584760e7 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
@@ -49,9 +49,6 @@ import org.apache.isis.applib.client.RepresentationTypeSimplifiedV2;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.extensions.restclient.ActionParameterListBuilder;
-import org.apache.isis.extensions.restclient.ResponseDigest;
-import org.apache.isis.extensions.restclient.log.ClientConversationFilter;
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.rospec.BigComplex;
import org.apache.isis.testdomain.rospec.Configuration_usingRoSpec;
@@ -61,6 +58,9 @@ import org.apache.isis.testdomain.util.UtilSurefire;
import org.apache.isis.testdomain.util.rest.RestEndpointService;
import org.apache.isis.tooling.model4adoc.AsciiDocFactory;
import org.apache.isis.tooling.model4adoc.AsciiDocWriter;
+import org.apache.isis.viewer.restfulobjects.client.ActionParameterListBuilder;
+import org.apache.isis.viewer.restfulobjects.client.ResponseDigest;
+import org.apache.isis.viewer.restfulobjects.client.log.ClientConversationFilter;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
import static org.apache.isis.testdomain.util.CollectionAssertions.assertComponentWiseEquals;
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index 009f45740e..27d691d772 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -211,8 +211,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient-applib</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-restfulobjects-client</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/regressiontests/stable-rest/pom.xml b/regressiontests/stable-rest/pom.xml
index 99693b90a7..bbef014d90 100644
--- a/regressiontests/stable-rest/pom.xml
+++ b/regressiontests/stable-rest/pom.xml
@@ -46,8 +46,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient-applib</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-restfulobjects-client</artifactId>
<scope>test</scope>
</dependency>
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java b/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
index 3eec632f1a..c223fcf8e1 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
@@ -36,9 +36,9 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.extensions.restclient.RestfulClient;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.util.rest.RestEndpointService;
+import org.apache.isis.viewer.restfulobjects.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
import lombok.val;
diff --git a/regressiontests/stable/pom.xml b/regressiontests/stable/pom.xml
index e3870b8b9b..10ec070e4b 100644
--- a/regressiontests/stable/pom.xml
+++ b/regressiontests/stable/pom.xml
@@ -90,8 +90,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient-applib</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-restfulobjects-client</artifactId>
<optional>true</optional>
</dependency>
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java
index a7ab111a04..0e1a2c61b9 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/rest/RestEndpointService.java
@@ -32,13 +32,13 @@ import org.apache.isis.applib.client.SuppressionType;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.config.RestEasyConfiguration;
import org.apache.isis.core.config.viewer.web.WebAppContextPath;
-import org.apache.isis.extensions.restclient.ResponseDigest;
-import org.apache.isis.extensions.restclient.RestfulClient;
-import org.apache.isis.extensions.restclient.RestfulClientConfig;
-import org.apache.isis.extensions.restclient.log.ClientConversationFilter;
import org.apache.isis.testdomain.jdo.entities.JdoBook;
import org.apache.isis.testdomain.ldap.LdapConstants;
import org.apache.isis.testdomain.util.dto.BookDto;
+import org.apache.isis.viewer.restfulobjects.client.ResponseDigest;
+import org.apache.isis.viewer.restfulobjects.client.RestfulClient;
+import org.apache.isis.viewer.restfulobjects.client.RestfulClientConfig;
+import org.apache.isis.viewer.restfulobjects.client.log.ClientConversationFilter;
import lombok.NonNull;
import lombok.val;