You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/20 16:16:22 UTC
[isis] 05/05: ISIS-2181: adds dependencyManagement from platform
modules
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2181
in repository https://gitbox.apache.org/repos/asf/isis.git
View the commit online:
https://github.com/apache/isis/commit/4fabf1b6b3cbeb838a69017e943bf9673441545c
commit 4fabf1b6b3cbeb838a69017e943bf9673441545c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 20 16:16:02 2019 +0000
ISIS-2181: adds dependencyManagement from platform modules
---
core/commons/pom.xml | 3 +-
core/detached-tests/pom.xml | 4 +
core/metamodel/pom.xml | 4 +
core/plugins/codegen-bytebuddy/pom.xml | 5 +
core/plugins/jaxrs-resteasy-4/pom.xml | 3 -
core/plugins/jdo/datanucleus-5/pom.xml | 7 -
core/pom.xml | 518 +++++++++++++--------
core/testsupport/integtestsupport/pom.xml | 7 +
core/testsupport/unittestsupport/pom.xml | 4 +
core/viewer-wicket/impl/pom.xml | 64 ++-
core/viewer-wicket/model/pom.xml | 17 +
core/viewer-wicket/ui/pom.xml | 154 +++++-
examples/apps/simpleapp/module-simple/pom.xml | 1 -
extensions/pom.xml | 2 -
.../security/secman/encryption-jbcrypt/pom.xml | 2 -
mavendeps/jdk11/pom.xml | 7 +
16 files changed, 565 insertions(+), 237 deletions(-)
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 8abe366..24f21844 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -110,6 +110,7 @@
<artifactId>spring-boot-starter-log4j2</artifactId>
<exclusions>
<exclusion>
+ <!-- convergence issues from spring-boot-starter-log4j2 -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -118,8 +119,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <!-- convergence issues from spring-boot-starter-log4j2 -->
- <version>${slf4j-api.version}</version>
</dependency>
</dependencies>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index e15a68d..fba81f0 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -134,6 +134,10 @@
<artifactId>jmock-junit4</artifactId>
<exclusions>
<exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 0eae224..178134e 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -112,6 +112,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/core/plugins/codegen-bytebuddy/pom.xml b/core/plugins/codegen-bytebuddy/pom.xml
index e147b70..0d5bded 100644
--- a/core/plugins/codegen-bytebuddy/pom.xml
+++ b/core/plugins/codegen-bytebuddy/pom.xml
@@ -79,6 +79,11 @@
<artifactId>jmock-junit4</artifactId>
<exclusions>
<exclusion>
+ <!-- for dependency convergence -->
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
diff --git a/core/plugins/jaxrs-resteasy-4/pom.xml b/core/plugins/jaxrs-resteasy-4/pom.xml
index 0578b87..8888f2f 100644
--- a/core/plugins/jaxrs-resteasy-4/pom.xml
+++ b/core/plugins/jaxrs-resteasy-4/pom.xml
@@ -75,7 +75,6 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
- <version>${resteasy4-jaxrs.version}</version>
</dependency>
<!-- OVERRIDES RestEasy JAX-B 2.3, to be the newest, such that code can
@@ -83,7 +82,6 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
- <version>${resteasy4-jaxrs.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
@@ -105,7 +103,6 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy4-jaxrs.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.servlet</groupId>
diff --git a/core/plugins/jdo/datanucleus-5/pom.xml b/core/plugins/jdo/datanucleus-5/pom.xml
index 8188ef9..8aa501e 100644
--- a/core/plugins/jdo/datanucleus-5/pom.xml
+++ b/core/plugins/jdo/datanucleus-5/pom.xml
@@ -73,8 +73,6 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>javax.jdo</artifactId>
- <version>${datanucleus-jdo-api.version}</version>
- <scope>compile</scope>
</dependency>
<!-- DataNucleus -->
@@ -82,27 +80,22 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
- <version>${datanucleus-core.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-jdo-query</artifactId>
- <version>${datanucleus-jdo-query.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
- <version>${datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId>
- <version>${datanucleus-jodatime.version}</version>
</dependency>
<!-- Core Runtime -->
diff --git a/core/pom.xml b/core/pom.xml
index 5918bd0..e654a1b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -86,8 +86,6 @@
<camel.version>2.14.2</camel.version>
- <com-sun-mail.version>1.5.2</com-sun-mail.version>
-
<commons-email.version>1.4</commons-email.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>2.6</commons-io.version>
@@ -112,11 +110,9 @@
<findbugs-annotations.version>2.0.1</findbugs-annotations.version>
- <geronimo-servlet_3.0_spec.version>1.0</geronimo-servlet_3.0_spec.version>
<guava.version>28.1-jre</guava.version>
<htmlparser.version>2.1</htmlparser.version>
- <hsqldb.version>2.5.0</hsqldb.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
<javaee.version>8.0</javaee.version>
@@ -127,7 +123,7 @@
<jaxb-impl.version>2.3.0.1</jaxb-impl.version>
<jaxws-ri.version>2.3.2</jaxws-ri.version>
- <jbcrypt.version>0.3m</jbcrypt.version>
+ <jbcrypt.version>0.4</jbcrypt.version>
<jboss-jaxrs-api_2.0_spec.version>1.0.0.Final</jboss-jaxrs-api_2.0_spec.version>
<jdo-api.version>3.1</jdo-api.version> <!-- see also datanucleus.x.x versions -->
@@ -163,7 +159,6 @@
<swagger-core.version>1.5.21</swagger-core.version>
<togglz.version>2.1.0.Final</togglz.version>
- <transaction-api.version>1.2</transaction-api.version>
<wicket.version>8.6.1</wicket.version>
<wicket-bootstrap.version>2.0.10</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
@@ -178,11 +173,6 @@
<xdocreport.version>1.0.6</xdocreport.version>
- <!-- PLUGIN DEPENDENCIES -->
-<!--
- <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version> <!– JUnit 5 requires Surefire version 2.22.0 or higher –>
--->
-
</properties>
<pluginRepositories>
@@ -1111,6 +1101,18 @@
<!-- THIRD PARTY DEPENDENCIES -->
+ <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>
+
<!-- provides @Nullable -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -1143,18 +1145,17 @@
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-core</artifactId>
- <version>${swagger-core.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>com.github.javafaker</groupId>
+ <artifactId>javafaker</artifactId>
+ <version>${javafaker.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ullink.slack</groupId>
+ <artifactId>simpleslackapi</artifactId>
+ <version>${simpleslackapi.version}</version>
</dependency>
- <!-- JDK11+ LEGACY SUPPORT -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
@@ -1170,140 +1171,75 @@
<artifactId>jaxws-ri</artifactId>
<version>${jaxws-ri.version}</version>
<type>pom</type>
- <exclusions>
- <exclusion>
- <!-- version clash with spring, we pull in the newer 1.3.5 below -->
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-core</artifactId>
- <version>${wicket-bootstrap.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- </exclusion>
- </exclusions>
+ <version>${wicket-bootstrap-core.version}</version>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
<version>${wicket-bootstrap.version}</version>
- <exclusions>
- <!-- exclude unused extensions -->
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>jquerypp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>jquery-ui</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>typeaheadjs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>x-editable-bootstrap</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>spin-js</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.javascript</groupId>
- <artifactId>closure-compiler</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId>
<version>${wicket-bootstrap.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket.webjars</groupId>
<artifactId>wicket-webjars</artifactId>
<version>${wicket-webjars.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <dependency>
+ <groupId>fr.opensagres.xdocreport</groupId>
+ <artifactId>fr.opensagres.xdocreport.document.docx</artifactId>
+ <version>${xdocreport.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>fr.opensagres.xdocreport</groupId>
+ <artifactId>fr.opensagres.xdocreport.template.freemarker</artifactId>
+ <version>${xdocreport.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>fr.opensagres.xdocreport</groupId>
+ <artifactId>fr.opensagres.xdocreport.converter.docx.xwpf</artifactId>
+ <version>${xdocreport.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-core</artifactId>
+ <version>${swagger-core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation-api.version}</version>
+ </dependency>
- <!-- JEE API -->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee.version}</version>
</dependency>
- <!-- JDO API -->
- <!-- not managed, because scope=provided can not be overwritten by plugins
- that are responsible for providing jdo-api -->
- <!--
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax-servlet.version}</version>
+ </dependency>
+
<dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
<version>${jdo-api.version}</version>
- <scope>provided</scope>
</dependency>
- -->
<dependency>
<groupId>net.sf.jopt-simple</groupId>
@@ -1312,20 +1248,132 @@
</dependency>
<dependency>
+ <groupId>net.ftlines.wicket-fullcalendar</groupId>
+ <artifactId>wicket-fullcalendar-core</artifactId>
+ <version>${wicket-fullcalendar.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>net.ftlines.wicket-source</groupId>
<!-- <groupId>com.github.jennybrown8.wicket-source</groupId> -->
<artifactId>wicket-source</artifactId>
<version>${wicket-source.version}</version>
+ </dependency>
+
+ <!-- TODO: when used, move exclusions down -->
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>${ognl.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <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.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>${pdfbox.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-schemas</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>${shiro.version}</version>
@@ -1346,22 +1394,14 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
<version>${wicket.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
</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>
@@ -1373,6 +1413,8 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
@@ -1384,17 +1426,14 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</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-datetime</artifactId>
@@ -1406,34 +1445,59 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</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-spring</artifactId>
<version>${wicket.version}</version>
- <exclusions>
- <!-- TODO[2112] exclusions might no longer be relevant -->
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <!-- for Java7 compatibility (we don't use the proxying capability
- of this component) -->
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
+ </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-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</artifactId>
+ <version>${docx4j.version}</version>
</dependency>
<dependency>
@@ -1442,6 +1506,7 @@
<version>${easymock.version}</version>
</dependency>
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>org.htmlparser</groupId>
<artifactId>htmlparser</artifactId>
@@ -1455,12 +1520,42 @@
</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.0_spec</artifactId>
<version>${jboss-jaxrs-api_2.0_spec.version}</version>
</dependency>
<dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson-provider</artifactId>
+ <version>${resteasy4-jaxrs.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy4-jaxrs.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ <version>${resteasy4-jaxrs.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<version>${jmock.version}</version>
@@ -1469,13 +1564,6 @@
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<version>${jmock.version}</version>
- <exclusions>
- <exclusion>
- <!-- for dependency convergence -->
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -1485,45 +1573,69 @@
</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.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
<version>${picocontainer.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <version>${spring-boot.version}</version>
- <exclusions>
- <!-- version clash with org.jmock:jmock:2.11.0, which requires org.ow2.asm:asm:6.2.1 -->
- <exclusion>
- <artifactId>org.ow2.asm</artifactId>
- <groupId>asm</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- <exclusion>
- <!-- we use log4j-2 instead -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
+ <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>jquery-ui</artifactId>
<version>${jquery-ui.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <!-- TODO: when used, move exclusions down -->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>Eonasdan-bootstrap-datetimepicker</artifactId>
@@ -1543,15 +1655,21 @@
</dependency>
<dependency>
+ <groupId>org.webjars.bower</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>
- <exclusions>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
@@ -1565,6 +1683,12 @@
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index 30f093d..4368f91 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -70,6 +70,13 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
index ca5007d..e361635 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/testsupport/unittestsupport/pom.xml
@@ -156,6 +156,10 @@
<artifactId>jmock-junit4</artifactId>
<exclusions>
<exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
diff --git a/core/viewer-wicket/impl/pom.xml b/core/viewer-wicket/impl/pom.xml
index 20028c7..568d894 100644
--- a/core/viewer-wicket/impl/pom.xml
+++ b/core/viewer-wicket/impl/pom.xml
@@ -70,33 +70,72 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
+ <!-- TODO[2112] exclusions might no longer be relevant -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- for Java7 compatibility (we don't use the proxying capability
+ of this component) -->
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-core</artifactId>
<exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>net.ftlines.wicket-source</groupId>
+ <!-- <groupId>com.github.jennybrown8.wicket-source</groupId> -->
<artifactId>wicket-source</artifactId>
<exclusions>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -133,7 +172,12 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/core/viewer-wicket/model/pom.xml b/core/viewer-wicket/model/pom.xml
index d3c94a0..7c1bff2 100644
--- a/core/viewer-wicket/model/pom.xml
+++ b/core/viewer-wicket/model/pom.xml
@@ -41,11 +41,28 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-runtime-web</artifactId>
diff --git a/core/viewer-wicket/ui/pom.xml b/core/viewer-wicket/ui/pom.xml
index 5756159..378c9fb 100644
--- a/core/viewer-wicket/ui/pom.xml
+++ b/core/viewer-wicket/ui/pom.xml
@@ -72,6 +72,16 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -93,30 +103,60 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <!-- TODO[2112] exclusions might no longer be relevant-->
<exclusions>
- <!-- already provided by JEE API -->
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
+ <!-- already provided by JEE API -->
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <!-- TODO[2112] exclusions might no longer be relevant -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- for Java7 compatibility (we don't use the proxying capability
+ of this component) -->
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -127,13 +167,26 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!-- WEBJARS -->
<dependency>
<groupId>de.agilecoders.wicket.webjars</groupId>
<artifactId>wicket-webjars</artifactId>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -145,6 +198,22 @@
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-core</artifactId>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -160,6 +229,55 @@
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
<exclusions>
+ <!-- exclude unused extensions -->
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquerypp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>typeaheadjs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>x-editable-bootstrap</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>spin-js</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.webjars.bower</groupId>
<artifactId>summernote</artifactId>
@@ -173,12 +291,17 @@
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>summernote</artifactId>
- <version>${summernote.version}</version>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- JDO API (non transient, provided by plugin) -->
@@ -217,7 +340,12 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/apps/simpleapp/module-simple/pom.xml b/examples/apps/simpleapp/module-simple/pom.xml
index 72fc09e..c23dd3d 100644
--- a/examples/apps/simpleapp/module-simple/pom.xml
+++ b/examples/apps/simpleapp/module-simple/pom.xml
@@ -92,7 +92,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet.version}</version>
<scope>test</scope>
</dependency>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index fce1277..ca5b06a 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -214,13 +214,11 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
- <version>${poi.version}</version>
</dependency>
diff --git a/extensions/security/secman/encryption-jbcrypt/pom.xml b/extensions/security/secman/encryption-jbcrypt/pom.xml
index 885c6d8..df43b63 100644
--- a/extensions/security/secman/encryption-jbcrypt/pom.xml
+++ b/extensions/security/secman/encryption-jbcrypt/pom.xml
@@ -49,14 +49,12 @@
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman-api</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
- <version>${jbcrypt.version}</version>
</dependency>
</dependencies>
diff --git a/mavendeps/jdk11/pom.xml b/mavendeps/jdk11/pom.xml
index a552489..08b7dc5 100644
--- a/mavendeps/jdk11/pom.xml
+++ b/mavendeps/jdk11/pom.xml
@@ -35,6 +35,13 @@
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
<type>pom</type>
+ <exclusions>
+ <exclusion>
+ <!-- version clash with spring, we pull in the newer 1.3.5 below -->
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>