This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new d81b37fce4 ISIS-3275: test fixes and jdk-suppl. cleanup
d81b37fce4 is described below
commit d81b37fce4906017f6223d2c99c27fb60275208a
Author: Andi Huber <[email protected]>
AuthorDate: Fri Nov 18 11:58:19 2022 +0100
ISIS-3275: test fixes and jdk-suppl. cleanup
---
core/jdk-supplemental/pom.xml | 10 ++++------
.../restclient/integtests/OutboxRestClient_IntegTest.java | 13 +++++++++----
.../apache/causeway/testdomain/rest/RestServiceTest.java | 12 ++++++++----
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/core/jdk-supplemental/pom.xml b/core/jdk-supplemental/pom.xml
index e0da67da5b..2c3d1155be 100644
--- a/core/jdk-supplemental/pom.xml
+++ b/core/jdk-supplemental/pom.xml
@@ -52,8 +52,6 @@
<dependencyManagement>
<dependencies>
- <!-- dependency convergence clash with
org.apache.cxf:cxf-core:3.4.0 (used
- by causeway-mappings-jaxrsclient-impl) TODO ...
jaxrsclient was removed -->
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
@@ -212,7 +210,7 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <!-- provides javax.enterprise.inject.* -->
+ <!-- provides jakarta.enterprise.inject.* -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0.1</version>
@@ -228,7 +226,7 @@
</exclusions>
</dependency>
<dependency>
- <!-- provides javax.transaction.TransactionalException -->
+ <!-- provides jakarta.transaction.TransactionalException -->
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
@@ -238,8 +236,8 @@
</dependency>
<dependency>
<!-- MediaType support -->
- <groupId>org.jboss.spec.javax.ws.rs</groupId>
- <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
</dependencies>
diff --git
a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
index 36988a127f..35940bccfe 100644
---
a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
+++
b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
@@ -21,8 +21,6 @@ package
org.apache.causeway.extensions.executionoutbox.restclient.integtests;
import java.util.List;
import java.util.stream.IntStream;
-import jakarta.inject.Inject;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -59,8 +57,12 @@ import
org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistence
import org.apache.causeway.schema.ixn.v2.InteractionDto;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
+import jakarta.inject.Inject;
+
@SpringBootTest(
classes = OutboxRestClient_IntegTest.AppManifest.class,
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
@@ -81,7 +83,10 @@ public class OutboxRestClient_IntegTest {
// mixins
Counter_bumpUsingMixin.class,
- Counter_bumpUsingMixinWithExecutionPublishingDisabled.class
+ Counter_bumpUsingMixinWithExecutionPublishingDisabled.class,
+
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, //
because something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class //
because something? disables autoconfiguration
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
@@ -237,7 +242,7 @@ public class OutboxRestClient_IntegTest {
}
- private void
bump(org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter
counter, int numberOfTimes) {
+ private void bump(final
org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter
counter, final int numberOfTimes) {
IntStream.range(0, numberOfTimes).forEach(x -> {
wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class,
counter).act();
});
diff --git
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
index 359b65a2da..2f6711301c 100644
---
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
+++
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.causeway.testdomain.rest;
-import jakarta.inject.Inject;
-import jakarta.xml.bind.JAXBException;
-
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -38,8 +35,12 @@ import org.apache.causeway.testdomain.jdo.JdoInventoryJaxbVm;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
+import jakarta.inject.Inject;
+import jakarta.xml.bind.JAXBException;
import lombok.val;
@SpringBootTest(
@@ -48,7 +49,10 @@ import lombok.val;
@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_usingJdo.class,
- CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
+
+ FixtureScriptsSpecificationProviderAutoConfiguration.class, // because
something? disables autoconfiguration
+ ExecutionParametersServiceAutoConfiguration.class // because
something? disables autoconfiguration
})
class RestServiceTest {
