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 82c486ccd5 ISIS-3275: don't use eclipse moxy a jaxb marshaller - fixes
MetaModelRegressionTest
82c486ccd5 is described below
commit 82c486ccd594682645a59dc8b6f60b22258f4beb
Author: Andi Huber <[email protected]>
AuthorDate: Mon Dec 12 21:42:22 2022 +0100
ISIS-3275: don't use eclipse moxy a jaxb marshaller - fixes
MetaModelRegressionTest
---
commons/pom.xml | 6 +++
commons/src/main/java/module-info.java | 1 +
core/config/src/main/java/module-info.java | 2 +-
core/jdk-supplemental/pom.xml | 46 +++++++++++-----------
persistence/jpa/applib/pom.xml | 20 +++++++++-
.../domainmodel/MetaModelRegressionTest.java | 4 +-
6 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/commons/pom.xml b/commons/pom.xml
index e5f2ea03af..fc91cc8c63 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -63,6 +63,12 @@
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>6.0.2</version>
+</dependency>
+
<dependency>
<groupId>org.apache.causeway.core</groupId>
<artifactId>causeway-core-privileged</artifactId>
diff --git a/commons/src/main/java/module-info.java
b/commons/src/main/java/module-info.java
index 549197845b..d835a867da 100644
--- a/commons/src/main/java/module-info.java
+++ b/commons/src/main/java/module-info.java
@@ -74,6 +74,7 @@ module org.apache.causeway.commons {
requires transitive jakarta.xml.bind;
requires transitive jakarta.inject;
requires jakarta.annotation;
+ requires spring.oxm;
// JAXB JUnit test
opens org.apache.causeway.commons.internal.resources to jakarta.xml.bind;
diff --git a/core/config/src/main/java/module-info.java
b/core/config/src/main/java/module-info.java
index 6179e1b5c1..f0f57ad4b4 100644
--- a/core/config/src/main/java/module-info.java
+++ b/core/config/src/main/java/module-info.java
@@ -45,7 +45,7 @@ module org.apache.causeway.core.config {
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
requires org.apache.logging.log4j;
- requires org.eclipse.persistence.core;
+ //requires org.eclipse.persistence.core;
requires org.hibernate.validator;
requires spring.aop;
requires spring.beans;
diff --git a/core/jdk-supplemental/pom.xml b/core/jdk-supplemental/pom.xml
index 2c3d1155be..0e5419cf23 100644
--- a/core/jdk-supplemental/pom.xml
+++ b/core/jdk-supplemental/pom.xml
@@ -62,25 +62,25 @@
<artifactId>stax2-api</artifactId>
<version>4.2.1</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
-
<artifactId>org.eclipse.persistence.moxy</artifactId>
- <version>4.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
-
<artifactId>asm-tree</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
-
<artifactId>asm-analysis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.eclipse.persistence</groupId>-->
+<!--
<artifactId>org.eclipse.persistence.moxy</artifactId>-->
+<!-- <version>4.0.0</version>-->
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!--
<groupId>org.ow2.asm</groupId>-->
+<!-- <artifactId>asm</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!--
<groupId>org.ow2.asm</groupId>-->
+<!--
<artifactId>asm-tree</artifactId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!--
<groupId>org.ow2.asm</groupId>-->
+<!--
<artifactId>asm-analysis</artifactId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.sdo</artifactId>
@@ -178,10 +178,10 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.moxy</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.eclipse.persistence</groupId>-->
+<!-- <artifactId>org.eclipse.persistence.moxy</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.sdo</artifactId>
diff --git a/persistence/jpa/applib/pom.xml b/persistence/jpa/applib/pom.xml
index ab1cbabce4..594eada19e 100644
--- a/persistence/jpa/applib/pom.xml
+++ b/persistence/jpa/applib/pom.xml
@@ -89,7 +89,25 @@
</dependency>
<!-- TODO JPA API (providing compile dependency) -->
-
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.moxy</artifactId>
+ <version>4.0.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
diff --git
a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index b134227494..88c28adeb0 100644
---
a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
+++
b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
@@ -29,7 +29,6 @@ import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
@@ -61,8 +60,7 @@ import lombok.SneakyThrows;
CausewayPresets.SilenceProgrammingModel
})
//uncomment if intended only for manual verification.
-//TODO[ISIS-3275] - MM export looks rather different compared to v2
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
class MetaModelRegressionTest {
@Inject MetaModelServiceMenu metaModelServiceMenu;
