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/12/16 13:28:14 UTC
[isis] branch spring6 updated (651e8dd003 -> f12c389f58)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
from 651e8dd003 Merge pull request #1273 from apache/dependabot/maven/spring6/org.datanucleus-datanucleus-core-6.0.3
add 09c528f345 Bump datanucleus-core from 6.0.2 to 6.0.3
add a3fff98af4 Merge pull request #1270 from apache/dependabot/maven/master/org.datanucleus-datanucleus-core-6.0.3
add 18ad616e31 Bump datanucleus-rdbms from 6.0.2 to 6.0.3
add 668df60d54 Merge pull request #1271 from apache/dependabot/maven/master/org.datanucleus-datanucleus-rdbms-6.0.3
add 746613a3c5 ISIS-3308: purge jdk-supplemental and cleanup core pom
add 8220894066 ISIS-3308: purge legacy com.sun.xml.bind:jaxb-ri keep jaxb-impl
new f12c389f58 Merge remote-tracking branch 'origin/master' into spring6
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api/applib/pom.xml | 7 -
api/applib/src/main/java/module-info.java | 2 +-
api/schema/pom.xml | 16 +-
api/schema/src/main/java/module-info.java | 1 -
bom/pom.xml | 702 ++-
commons/pom.xml | 49 +-
commons/src/main/java/module-info.java | 1 +
.../org/apache/causeway/commons/io/JaxbUtils.java | 22 +-
.../internal/resources/XmlRoundTripTest.java | 25 +-
core/config/pom.xml | 10 +-
.../environment/CausewaySystemEnvironment.java | 20 +-
core/jdk-supplemental/pom.xml | 222 -
core/pom.xml | 688 +--
core/runtimeservices/pom.xml | 5 +
.../domainmodel/MetaModelRegressionTest.java | 77 +-
.../MetaModelRegressionTest.verify.approved.xml | 6466 ++++++++++----------
testing/archtestsupport/applib/pom.xml | 5 +-
testing/unittestsupport/applib/pom.xml | 14 +-
viewers/restfulobjects/jaxrs-resteasy/pom.xml | 2 +-
viewers/wicket/applib/pom.xml | 6 +
20 files changed, 4137 insertions(+), 4203 deletions(-)
delete mode 100644 core/jdk-supplemental/pom.xml
[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
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
commit f12c389f587f844c1b5282526bca2586cf40727a
Merge: 651e8dd003 8220894066
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 16 13:21:11 2022 +0100
Merge remote-tracking branch 'origin/master' into spring6
api/applib/pom.xml | 7 -
api/applib/src/main/java/module-info.java | 2 +-
api/schema/pom.xml | 16 +-
api/schema/src/main/java/module-info.java | 1 -
bom/pom.xml | 702 ++-
commons/pom.xml | 49 +-
commons/src/main/java/module-info.java | 1 +
.../org/apache/causeway/commons/io/JaxbUtils.java | 22 +-
.../internal/resources/XmlRoundTripTest.java | 25 +-
core/config/pom.xml | 10 +-
.../environment/CausewaySystemEnvironment.java | 20 +-
core/jdk-supplemental/pom.xml | 222 -
core/pom.xml | 688 +--
core/runtimeservices/pom.xml | 5 +
.../domainmodel/MetaModelRegressionTest.java | 77 +-
.../MetaModelRegressionTest.verify.approved.xml | 6466 ++++++++++----------
testing/archtestsupport/applib/pom.xml | 5 +-
testing/unittestsupport/applib/pom.xml | 14 +-
viewers/restfulobjects/jaxrs-resteasy/pom.xml | 2 +-
viewers/wicket/applib/pom.xml | 6 +
20 files changed, 4137 insertions(+), 4203 deletions(-)
diff --cc api/applib/src/main/java/module-info.java
index 5bb86b67b4,e1af9f8a4a..3c71005697
--- a/api/applib/src/main/java/module-info.java
+++ b/api/applib/src/main/java/module-info.java
@@@ -138,8 -141,10 +138,9 @@@ module org.apache.causeway.applib
requires transitive spring.beans;
requires transitive spring.context;
requires transitive spring.core;
- requires spring.tx;
// JAXB viewmodels
+ opens org.apache.causeway.applib.annotation;
opens org.apache.causeway.applib.layout.component;
opens org.apache.causeway.applib.layout.grid.bootstrap;
opens org.apache.causeway.applib.layout.grid;
diff --cc api/schema/pom.xml
index ad3cc6313c,09a61eefbc..dfc48d2d59
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@@ -33,21 -29,21 +33,23 @@@
<jar-plugin.automaticModuleName>org.apache.causeway.schema</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/causeway/schema</git-plugin.propertiesDir>
</properties>
+
<dependencies>
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
- <type>pom</type>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
</dependencies>
-
<profiles>
+
<profile>
<id>xsd-to-java</id>
<activation>
diff --cc api/schema/src/main/java/module-info.java
index d4757b35d6,13e529690f..309ae906b4
--- a/api/schema/src/main/java/module-info.java
+++ b/api/schema/src/main/java/module-info.java
@@@ -24,10 -24,9 +24,9 @@@ module org.apache.causeway.schema
exports org.apache.causeway.schema.ixn.v2;
exports org.apache.causeway.schema.chg.v2;
- requires java.xml;
- requires java.xml.bind;
+ requires jakarta.xml.bind;
requires spring.context;
- requires java.inject;
+ requires jakarta.inject;
opens org.apache.causeway.schema.metamodel.v2;
opens org.apache.causeway.schema.common.v2;
diff --cc bom/pom.xml
index 3eba07b002,25427824ca..770bf8c520
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -126,12 -125,11 +126,13 @@@ It is therefore a copy of org.apache:ap
<htmlparser.version>2.1</htmlparser.version>
- <jakartaee.version>10.0.0</jakartaee.version>
+ <jakartaee.version>8.0.0</jakartaee.version>
<javafaker.version>1.0.2</javafaker.version>
<javassist.version>3.29.2-GA</javassist.version>
- <javax-servlet.version>4.0.1</javax-servlet.version>
- <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version> <!-- don't upgrade to 3.x before Spring 6-->
+ <jakarta-servlet.version>6.0.0</jakarta-servlet.version>
+ <jaxb-impl.version>4.0.1</jaxb-impl.version>
+ <jaxws-ri.version>4.0.0</jaxws-ri.version>
++ <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
<jbcrypt.version>0.4</jbcrypt.version>
<jboss-jaxrs-api_2.1_spec.version>2.0.2.Final</jboss-jaxrs-api_2.1_spec.version>
@@@ -236,6 -229,691 +237,705 @@@
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven.plugin.tools.version}</version>
</dependency>
+
+
+ <!-- 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>
+ <version>6.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>4.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.moxy</artifactId>
- <version>2.7.11</version> <!-- do not upgrade 2.x to 3.x or higher until Spring 6 -->
++ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.sdo</artifactId>
- <version>2.7.11</version> <!-- do not upgrade 2.x to 3.x or higher until Spring 6 -->
++ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
- <version>2.3.3</version> <!-- do not upgrade 2.x to 3.x or higher until Spring 6 -->
++ <version>4.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda-time.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.approvaltests</groupId>
+ <artifactId>approvaltests</artifactId>
+ <version>${approvaltests.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.danhaywood.java</groupId>
+ <artifactId>danhaywood-java-assertjext</artifactId>
+ <version>${danhaywood-java-assertjext.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.danhaywood.java</groupId>
+ <artifactId>danhaywood-java-testsupport</artifactId>
+ <version>${danhaywood-java-testsupport.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>${error_prone_annotations.version}</version>
+ </dependency>
+
+ <!-- provides @Nullable that's required by Spring 5.x -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.javafaker</groupId>
+ <artifactId>javafaker</artifactId>
+ <version>${javafaker.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.tngtech.archunit</groupId>
+ <artifactId>archunit-junit5-api</artifactId>
+ <version>${archunit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.tngtech.archunit</groupId>
+ <artifactId>archunit-junit5-engine</artifactId>
+ <version>${archunit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ullink.slack</groupId>
+ <artifactId>simpleslackapi</artifactId>
+ <version>${simpleslackapi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-core</artifactId>
+ <version>${wicket-bootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-extensions</artifactId>
+ <version>${wicket-bootstrap.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>momentjs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-themes</artifactId>
+ <version>${wicket-bootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket.webjars</groupId>
+ <artifactId>wicket-webjars</artifactId>
+ <version>${wicket-webjars.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>momentjs</artifactId>
+ <version>${momentjs.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-core</artifactId>
+ <version>${swagger-core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
+ <version>${jakartaee.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
- <version>1.0.5</version> <!-- do not upgrade 1.x to 2.x until Spring 6 -->
++ <version>2.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax-servlet.version}</version>
+ </dependency>
+
+ <!-- 3.2 not available yet, instead use org.datanucleus:javax.jdo
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>${jopt-simple.version}</version>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>${ognl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jms</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-stream</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-ognl</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jackson</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-javaconfig</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cxf</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <version>${camel.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <version>${camel.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>${commons-email.version}</version>
+ <exclusions>
+ <!-- excluded because provided by javax:javaee-api -->
+ <exclusion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf-rt-rs-client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-lite</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>${jsoup.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-bom</artifactId>
+ <version>${vaadin.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ <version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-datetime</artifactId>
+ <version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
- <groupId>org.apache.wicket</groupId>
++ <!-- <groupId>org.apache.wicket</groupId> -->
++ <groupId>com.github.apache-causeway-committers.wicket</groupId>
+ <artifactId>wicket-spring</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-guava</artifactId>
+ <version>${assertj-guava.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>${datanucleus-api-jdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jpa</artifactId>
+ <version>${datanucleus-api-jpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ <version>${datanucleus-jdo-query.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jodatime</artifactId>
+ <version>${datanucleus-jodatime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>${datanucleus-rdbms.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
+ <version>${datanucleus-jdo-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.docx4j</groupId>
+ <artifactId>docx4j-JAXB-internal</artifactId>
+ <version>${docx4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>${htmlparser.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+ <version>${jboss-jaxrs-api_2.1_spec.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ <version>${jdom.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-spring-boot-starter</artifactId>
- <version>${resteasy-spring-boot-starter.version}</version>
++ <version>${resteasy-spring-boot.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.jboss.resteasy.spring</groupId>
++ <artifactId>resteasy-spring</artifactId>
++ <version>${resteasy-spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-quartz</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>${jmock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>${jmock.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.lazyluke</groupId>
+ <artifactId>log4jdbc-remix</artifactId>
+ <version>${log4jdbc-remix.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mindrot</groupId>
+ <artifactId>jbcrypt</artifactId>
+ <version>${jbcrypt.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>${objenesis.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <version>${picocontainer.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz-scheduler.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-jobs</artifactId>
+ <version>${quartz-scheduler.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-core</artifactId>
+ <version>${togglz.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-junit</artifactId>
+ <version>${togglz.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-servlet</artifactId>
+ <version>${togglz.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-console</artifactId>
+ <version>${togglz.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>datatables</artifactId>
+ <version>${datatables.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ <version>${wicket-viewer-jquery.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui</artifactId>
+ <version>${jquery-ui.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>select2</artifactId>
+ <version>${select2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>summernote</artifactId>
+ <version>${summernote.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-gmap3</artifactId>
+ <version>${wicketstuff-gmap3.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-select2</artifactId>
+ <version>${wicketstuff.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-spring</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-junit-platform-engine</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-console</artifactId>
+ <version>${junit-platform.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<repositories>
diff --cc commons/pom.xml
index 42646b3934,f471d61719..c173cb2a2e
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@@ -55,13 -55,58 +55,46 @@@
<dependencies>
- <!-- JDK11+ SUPPORT AND JEE API -->
-
<dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
- <type>pom</type>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </dependency>
+ <dependency>
+ <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.sdo</artifactId>
- </dependency>
+
+ <dependency>
+ <!-- provides @Inject, @Qualifier, -->
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- provides javax.enterprise.inject.* -->
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>2.0.1</version> <!-- do not upgrade before Spring 6 -->
++ <version>4.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </exclusion>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- provides javax.transaction.TransactionalException -->
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
+ <dependency>
+ <!-- MediaType support -->
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.causeway.core</groupId>
diff --cc commons/src/main/java/module-info.java
index 0506eaa057,c14b7bd28e..05bc7cabaa
--- a/commons/src/main/java/module-info.java
+++ b/commons/src/main/java/module-info.java
@@@ -71,12 -72,11 +71,13 @@@ module org.apache.causeway.commons
requires transitive spring.beans;
requires transitive spring.context;
requires transitive spring.core;
- requires java.inject;
- requires java.annotation;
- requires org.eclipse.persistence.moxy;
++ //requires org.eclipse.persistence.moxy;
+
+ requires transitive jakarta.xml.bind;
+ requires transitive jakarta.inject;
+ requires jakarta.annotation;
// JAXB JUnit test
- opens org.apache.causeway.commons.internal.resources to java.xml.bind;
+ opens org.apache.causeway.commons.internal.resources to jakarta.xml.bind;
}
diff --cc commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
index eeb8a354e0,fc31be7abe..27c00b6c4a
--- a/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
+++ b/commons/src/main/java/org/apache/causeway/commons/io/JaxbUtils.java
@@@ -61,6 -60,27 +61,27 @@@ import lombok.experimental.UtilityClass
@UtilityClass
public class JaxbUtils {
- /** uses MOXy as default */
++ /** uses given context factory as the new platform default */
+ public void setDefaultJAXBContextFactory(final Class<?> jaxbContextFactoryClass, final boolean force) {
+ if(force
+ || System.getProperty(JAXBContext.JAXB_CONTEXT_FACTORY)==null) {
+ if(jaxbContextFactoryClass!=null) {
+ System.setProperty(JAXBContext.JAXB_CONTEXT_FACTORY, jaxbContextFactoryClass.getName());
+ } else {
+ System.clearProperty(JAXBContext.JAXB_CONTEXT_FACTORY);
+ }
+ }
+ }
+
+ /** uses MOXy */
+ public void useMoxy() {
- setDefaultJAXBContextFactory(org.eclipse.persistence.jaxb.JAXBContextFactory.class, true);
++ //setDefaultJAXBContextFactory(org.eclipse.persistence.jaxb.JAXBContextFactory.class, true);
+ }
+
+ public static void usePlatformDefault() {
+ setDefaultJAXBContextFactory(null, true);
+ }
+
@Data @Builder
public static class JaxbOptions {
private final @Builder.Default boolean useContextCache = true;
diff --cc commons/src/test/java/org/apache/causeway/commons/internal/resources/XmlRoundTripTest.java
index c4150dcf4b,d391b1195f..1f720913e7
--- a/commons/src/test/java/org/apache/causeway/commons/internal/resources/XmlRoundTripTest.java
+++ b/commons/src/test/java/org/apache/causeway/commons/internal/resources/XmlRoundTripTest.java
@@@ -18,12 -18,13 +18,13 @@@
*/
package org.apache.causeway.commons.internal.resources;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --cc core/pom.xml
index 371b70bf9a,b7de82fd57..1cdbafcbf9
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -121,15 -121,9 +121,8 @@@
<dependencyManagement>
+ <!-- CHILD MODULES -->
-
<dependencies>
-
- <!-- CHILD MODULES -->
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
<dependency>
<groupId>org.apache.causeway.commons</groupId>
<artifactId>causeway-commons</artifactId>
@@@ -403,653 -397,6 +396,8 @@@
<type>pom</type>
<scope>test</scope>
</dependency>
+
- <!-- THIRD PARTY DEPENDENCIES -->
-
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-util</artifactId>
- <version>${asm.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${hibernate-validator.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda-time.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.approvaltests</groupId>
- <artifactId>approvaltests</artifactId>
- <version>${approvaltests.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.danhaywood.java</groupId>
- <artifactId>danhaywood-java-assertjext</artifactId>
- <version>${danhaywood-java-assertjext.version}</version>
- </dependency>
- <dependency>
- <groupId>com.danhaywood.java</groupId>
- <artifactId>danhaywood-java-testsupport</artifactId>
- <version>${danhaywood-java-testsupport.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- <version>${error_prone_annotations.version}</version>
- </dependency>
-
- <!-- provides @Nullable that's required by Spring 5.x -->
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${jsr305.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons-httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.javafaker</groupId>
- <artifactId>javafaker</artifactId>
- <version>${javafaker.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.tngtech.archunit</groupId>
- <artifactId>archunit-junit5-api</artifactId>
- <version>${archunit.version}</version>
- </dependency>
- <dependency>
- <groupId>com.tngtech.archunit</groupId>
- <artifactId>archunit-junit5-engine</artifactId>
- <version>${archunit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.ullink.slack</groupId>
- <artifactId>simpleslackapi</artifactId>
- <version>${simpleslackapi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl.version}</version>
- </dependency>
-
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-core</artifactId>
- <version>${wicket-bootstrap.version}</version>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-extensions</artifactId>
- <version>${wicket-bootstrap.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>momentjs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-themes</artifactId>
- <version>${wicket-bootstrap.version}</version>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket.webjars</groupId>
- <artifactId>wicket-webjars</artifactId>
- <version>${wicket-webjars.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>momentjs</artifactId>
- <version>${momentjs.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-core</artifactId>
- <version>${swagger-core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>jakarta.platform</groupId>
- <artifactId>jakarta.jakartaee-api</artifactId>
- <version>${jakartaee.version}</version>
- </dependency>
-
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>${jakarta-servlet.version}</version>
- </dependency>
-
- <!-- 3.2 not available yet, instead use org.datanucleus:javax.jdo
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>net.sf.jopt-simple</groupId>
- <artifactId>jopt-simple</artifactId>
- <version>${jopt-simple.version}</version>
- </dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>${ognl.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jms</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-stream</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-ognl</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxb</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-javaconfig</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cxf</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <version>${camel.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <version>${camel.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>${commons-email.version}</version>
- <exclusions>
- <!-- excluded because provided by javax:javaee-api -->
- <exclusion>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf-rt-rs-client.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-lite</artifactId>
- <version>${poi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- <version>${shiro.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>${jsoup.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-bom</artifactId>
- <version>${vaadin.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <dependency>
- <groupId>com.github.apache-causeway-committers</groupId>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-core-tester</artifactId>
- <version>${wicket.version}</version>
- </dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- <version>${wicket.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <version>${wicket.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-auth-roles</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.apache-causeway-committers.wicket</groupId>
- <artifactId>wicket-spring</artifactId>
- <version>${wicket.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-guava</artifactId>
- <version>${assertj-guava.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- <version>${datanucleus-api-jdo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jpa</artifactId>
- <version>${datanucleus-api-jpa.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>${datanucleus-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jdo-query</artifactId>
- <version>${datanucleus-jdo-query.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
- <version>${datanucleus-jodatime.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-rdbms</artifactId>
- <version>${datanucleus-rdbms.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>javax.jdo</artifactId>
- <version>${datanucleus-jdo-api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-JAXB-internal</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock.version}</version>
- </dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>org.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>${htmlparser.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.ws.rs</groupId>
- <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
- <version>${jboss-jaxrs-api_2.1_spec.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- <version>${jdom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-spring-boot-starter</artifactId>
- <version>${resteasy-spring-boot.version}</version>
- <!-- exclusions not supported here, but as a reminder -->
- <exclusions>
- <exclusion>
- <groupId>org.jboss.resteasy.spring</groupId>
- <artifactId>resteasy-spring</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy.spring</groupId>
- <artifactId>resteasy-spring</artifactId>
- <version>${resteasy-spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>${resteasy-jaxb-provider.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-quartz</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>${jmock.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>${jmock.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.lazyluke</groupId>
- <artifactId>log4jdbc-remix</artifactId>
- <version>${log4jdbc-remix.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.mindrot</groupId>
- <artifactId>jbcrypt</artifactId>
- <version>${jbcrypt.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>${objenesis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>${osgi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- <version>${picocontainer.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz-scheduler.version}</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz-jobs</artifactId>
- <version>${quartz-scheduler.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-core</artifactId>
- <version>${togglz.version}</version>
- </dependency>
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-junit</artifactId>
- <version>${togglz.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-servlet</artifactId>
- <version>${togglz.version}</version>
- </dependency>
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-console</artifactId>
- <version>${togglz.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>datatables</artifactId>
- <version>${datatables.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- <version>${wicket-viewer-jquery.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>jquery-ui</artifactId>
- <version>${jquery-ui.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>select2</artifactId>
- <version>${select2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.webjars.npm</groupId>
- <artifactId>summernote</artifactId>
- <version>${summernote.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-select2</artifactId>
- <version>${wicketstuff.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-spring</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-junit-platform-engine</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit-jupiter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-console</artifactId>
- <version>${junit-platform.version}</version>
- </dependency>
+
</dependencies>
</dependencyManagement>
diff --cc regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index 4e1cd30f1d,6ac3c6e8e8..22164998b8
--- 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
@@@ -20,8 -20,9 +20,9 @@@ package org.apache.causeway.testdomain.
import java.nio.charset.StandardCharsets;
import java.util.List;
+ import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.approvaltests.Approvals;
import org.approvaltests.core.Options;