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 10:01:13 UTC
[isis] branch master updated: ISIS-3308: purge jdk-supplemental and cleanup core pom
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 746613a3c5 ISIS-3308: purge jdk-supplemental and cleanup core pom
746613a3c5 is described below
commit 746613a3c5eb976eed5d2cb85cd7dac36010b05c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 16 11:01:06 2022 +0100
ISIS-3308: purge jdk-supplemental and cleanup core pom
- that is, consolidate dependency management in central BOM
---
api/applib/pom.xml | 13 +-
api/schema/pom.xml | 24 +-
api/schema/src/main/java/module-info.java | 1 -
bom/pom.xml | 692 ++++++++++++++++++++-
commons/pom.xml | 138 +++-
core/config/pom.xml | 10 +-
core/jdk-supplemental/pom.xml | 247 --------
.../objects/OneToManyAssociationDefaultTest.java | 3 +-
core/pom.xml | 662 +-------------------
testing/archtestsupport/applib/pom.xml | 5 +-
testing/unittestsupport/applib/pom.xml | 9 +-
viewers/restfulobjects/jaxrs-resteasy/pom.xml | 2 +-
viewers/wicket/applib/pom.xml | 6 +
.../wicket/applib/src/main/java/module-info.java | 1 -
14 files changed, 859 insertions(+), 954 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index e22096500a..d0591e27df 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -70,13 +70,6 @@
<dependencies>
- <!-- JDK11+ SUPPORT AND JEE API -->
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
- <type>pom</type>
- </dependency>
-
<dependency>
<groupId>org.apache.causeway.commons</groupId>
<artifactId>causeway-commons</artifactId>
@@ -93,6 +86,12 @@
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
+
+ <!-- provides @Column -->
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ </dependency>
<!-- marked for deprecation -->
<dependency>
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index bc0b1c0a90..09a61eefbc 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -13,41 +13,37 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.causeway.core</groupId>
<artifactId>causeway-core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
-
<artifactId>causeway-schema</artifactId>
-
<packaging>jar</packaging>
<name>Apache Causeway Api - Schemas</name>
<description>
Apache Causeway schemas, for conversion into canonical DTOs (for use in integration scenarios).
</description>
-
<properties>
<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>
@@ -55,9 +51,7 @@
<name>!skip.xsd-to-java</name>
</property>
</activation>
-
<build>
-
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
@@ -132,6 +126,4 @@
</build>
</profile>
</profiles>
-
-
</project>
diff --git a/api/schema/src/main/java/module-info.java b/api/schema/src/main/java/module-info.java
index e9f289daf6..13e529690f 100644
--- a/api/schema/src/main/java/module-info.java
+++ b/api/schema/src/main/java/module-info.java
@@ -24,7 +24,6 @@ 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 spring.context;
requires java.inject;
diff --git a/bom/pom.xml b/bom/pom.xml
index 9a7e591651..2b4a4cb314 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -125,12 +125,12 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<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>
- <jaxb-impl.version>2.3.6</jaxb-impl.version>
- <jaxws-ri.version>2.3.5</jaxws-ri.version>
+ <jaxb-impl.version>2.3.3</jaxb-impl.version> <!-- don't upgrade to 3.x before Spring 6-->
+ <jaxws-ri.version>2.3.3</jaxws-ri.version> <!-- don't upgrade to 3.x before Spring 6-->
<jbcrypt.version>0.4</jbcrypt.version>
<jboss-jaxrs-api_2.1_spec.version>2.0.2.Final</jboss-jaxrs-api_2.1_spec.version>
@@ -230,6 +230,692 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<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>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.sdo</artifactId>
+ <version>2.7.11</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>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.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>1.0.5</version> <!-- do not upgrade 1.x to 2.x until Spring 6 -->
+ </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>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
+ <groupId>org.apache.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>
+ <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>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
+ <groupId>org.apache.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>
+ <artifactId>wicket-auth-roles</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.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>
+ </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 --git a/commons/pom.xml b/commons/pom.xml
index 4e84adcce8..5439b583d2 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -56,13 +56,144 @@
<dependencies>
<!-- JDK11+ SUPPORT AND JEE API -->
-
<dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>${jaxws-ri.version}</version>
<type>pom</type>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind.external</groupId>
+ <artifactId>rngom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind.external</groupId>
+ <artifactId>relaxng-datatype</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- version clash with spring, we pull it in elsewhere -->
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- version clash jakarta.jws:jakarta.jws-api: 1.1.1 vs 2.1.0 -->
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- version clash org.eclipse.persistence:org.eclipse.persistence.core:
+ 2.7.6 vs 2.7.7 -->
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.moxy</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- version clash org.eclipse.persistence:org.eclipse.persistence.core:
+ 2.7.6 vs 2.7.7 -->
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.sdo</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws-ri.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind.external</groupId>
+ <artifactId>rngom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <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>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind.external</groupId>
+ <artifactId>rngom</artifactId>
+ <version>2.3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind.external</groupId>
+ <artifactId>relaxng-datatype</artifactId>
+ <version>2.3.6</version>
</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 -->
+ <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>
<artifactId>causeway-core-privileged</artifactId>
@@ -116,7 +247,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
-
</exclusions>
</dependency>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 270a3f4ebe..a5a13c2ed4 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -82,14 +82,14 @@
<dependencies>
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-applib</artifactId>
+ <dependency>
+ <groupId>org.apache.causeway.commons</groupId>
+ <artifactId>causeway-commons</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.causeway.commons</groupId>
- <artifactId>causeway-commons</artifactId>
+ <groupId>org.apache.causeway.core</groupId>
+ <artifactId>causeway-applib</artifactId>
</dependency>
<dependency>
diff --git a/core/jdk-supplemental/pom.xml b/core/jdk-supplemental/pom.xml
deleted file mode 100644
index c57b3cb3df..0000000000
--- a/core/jdk-supplemental/pom.xml
+++ /dev/null
@@ -1,247 +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.causeway.core</groupId>
- <artifactId>causeway-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>causeway-jdk-supplemental</artifactId>
-
- <packaging>pom</packaging>
-
- <name>Apache Causeway - JDK Supplemental</name>
- <description>
- Defines a module to bring in dependencies that were part of JDK 8 but
- had been removed with later JDK versions.
- Also brings in Jakarta EE API (@Inject, @Qualifier, ...).
- </description>
-
- <build>
- <pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.15.1</version>
- <configuration>
- <removeOldOutput>true</removeOldOutput>
- <episode>true</episode>
- </configuration>
- </plugin>
- </plugins>
-
- </pluginManagement>
- </build>
-
- <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>
- <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>
- <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>
- <version>2.7.11</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>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-ri</artifactId>
- <version>${jaxws-ri.version}</version>
- <type>pom</type>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind.external</groupId>
- <artifactId>rngom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind.external</groupId>
- <artifactId>relaxng-datatype</artifactId>
- </exclusion>
- <exclusion>
- <!-- version clash with spring, we pull it in elsewhere -->
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- <exclusion>
- <!-- version clash jakarta.jws:jakarta.jws-api: 1.1.1 vs 2.1.0 -->
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- </exclusion>
- <exclusion>
- <!-- version clash org.eclipse.persistence:org.eclipse.persistence.core:
- 2.7.6 vs 2.7.7 -->
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.moxy</artifactId>
- </exclusion>
- <exclusion>
- <!-- version clash org.eclipse.persistence:org.eclipse.persistence.core:
- 2.7.6 vs 2.7.7 -->
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.sdo</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>${jaxws-ri.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind.external</groupId>
- <artifactId>rngom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <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>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind.external</groupId>
- <artifactId>rngom</artifactId>
- <version>2.3.6</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind.external</groupId>
- <artifactId>relaxng-datatype</artifactId>
- <version>2.3.6</version>
- </dependency>
-
- <dependency>
- <!-- provides @Inject, @Qualifier, -->
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- <version>1.0.5</version> <!-- do not upgrade until Spring 6 -->
- </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 -->
- <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>
-
- </dependencies>
-
-</project>
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/OneToManyAssociationDefaultTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/OneToManyAssociationDefaultTest.java
index 275df97514..3368a138f0 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/OneToManyAssociationDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/OneToManyAssociationDefaultTest.java
@@ -18,9 +18,10 @@
*/
package org.apache.causeway.core.metamodel.objects;
+import java.util.List;
import java.util.Optional;
-import com.sun.xml.bind.v2.schemagen.xmlschema.List;
+//import com.sun.xml.bind.v2.schemagen.xmlschema.List;
import org.junit.jupiter.api.Test;
diff --git a/core/pom.xml b/core/pom.xml
index 5acc1faad3..b7de82fd57 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -121,15 +121,9 @@
<dependencyManagement>
- <dependencies>
+ <!-- CHILD MODULES -->
- <!-- CHILD MODULES -->
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.causeway.commons</groupId>
<artifactId>causeway-commons</artifactId>
@@ -403,656 +397,6 @@
<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>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>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
- </dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>org.apache.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>
- <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>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>org.apache.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>
- <artifactId>wicket-auth-roles</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.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>
- </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>
@@ -1211,8 +555,6 @@
<module>../supplemental-model</module>
- <module>jdk-supplemental</module>
-
<module>privileged</module>
<module>../commons</module>
diff --git a/testing/archtestsupport/applib/pom.xml b/testing/archtestsupport/applib/pom.xml
index 7043037717..eb11ac79cf 100644
--- a/testing/archtestsupport/applib/pom.xml
+++ b/testing/archtestsupport/applib/pom.xml
@@ -29,9 +29,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
- <type>pom</type>
+ <groupId>org.apache.causeway.commons</groupId>
+ <artifactId>causeway-commons</artifactId>
</dependency>
<dependency>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index 5b5b6e7d47..c9a629c08e 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -28,11 +28,10 @@
<dependencies>
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-jdk-supplemental</artifactId>
- <type>pom</type>
- </dependency>
+ <dependency>
+ <groupId>org.apache.causeway.commons</groupId>
+ <artifactId>causeway-commons</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.causeway.core</groupId>
diff --git a/viewers/restfulobjects/jaxrs-resteasy/pom.xml b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
index 93cb4e4fe2..39c1e7c7ec 100644
--- a/viewers/restfulobjects/jaxrs-resteasy/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
@@ -87,7 +87,7 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
- <!-- transitively provided by causeway-jdk-supplemental -->
+ <!-- transitively provided by causeway-commons -->
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
diff --git a/viewers/wicket/applib/pom.xml b/viewers/wicket/applib/pom.xml
index 57325c4b7c..97eee4fed1 100644
--- a/viewers/wicket/applib/pom.xml
+++ b/viewers/wicket/applib/pom.xml
@@ -37,6 +37,12 @@
<dependencies>
+ <dependency>
+ <groupId>org.apache.causeway.commons</groupId>
+ <artifactId>causeway-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.causeway.core</groupId>
<artifactId>causeway-applib</artifactId>
diff --git a/viewers/wicket/applib/src/main/java/module-info.java b/viewers/wicket/applib/src/main/java/module-info.java
index adcb287320..0bd3ac3231 100644
--- a/viewers/wicket/applib/src/main/java/module-info.java
+++ b/viewers/wicket/applib/src/main/java/module-info.java
@@ -20,7 +20,6 @@ module org.apache.causeway.viewer.wicket.applib {
exports org.apache.causeway.viewer.wicket.applib;
exports org.apache.causeway.viewer.wicket.applib.mixins;
- requires java.inject;
requires lombok;
requires org.apache.causeway.applib;
requires spring.beans;