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/04/13 09:31:49 UTC
[isis] 01/02: ISIS-3003: pom convergence fixes
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
commit c168931653bda1d06695e115813649fd26172e5b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 13 11:31:01 2022 +0200
ISIS-3003: pom convergence fixes
- also move all version vars from core to bom
---
bom/pom.xml | 136 ++++++++++++++++++-
core/config/pom.xml | 20 ++-
core/jdk-supplemental/pom.xml | 53 ++++++++
core/metamodel/pom.xml | 6 -
core/pom.xml | 163 ++---------------------
extensions/core/command-replay/secondary/pom.xml | 151 +++++++++++----------
incubator/viewers/vaadin/pom.xml | 1 +
incubator/viewers/vaadin/ui/pom.xml | 1 +
persistence/jpa/eclipselink/pom.xml | 6 +
tooling/c4modeling/pom.xml | 1 +
tooling/cli/pom.xml | 1 +
tooling/dsl/pom.xml | 1 +
tooling/java2adoc/pom.xml | 1 +
tooling/javamodel/pom.xml | 1 +
tooling/model4adoc/pom.xml | 1 +
tooling/projectmodel/pom.xml | 1 +
valuetypes/asciidoc/ui/pom.xml | 1 +
17 files changed, 305 insertions(+), 240 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 40546c1dcb..cb478516fa 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -333,7 +333,7 @@ under the License.
<maven.compiler.release>11</maven.compiler.release>
<!-- overriding Spring, since v3.0.0 breaks artifact retrieval of org.jruby:jruby (of any version) -->
- <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
<lombok.version>1.18.22</lombok.version> <!-- overriding Spring -->
<delombok.output>${project.build.directory}/delombok</delombok.output>
@@ -345,6 +345,113 @@ under the License.
<!-- set this property for all derived projects:
-->
<project.build.outputTimestamp>1</project.build.outputTimestamp>
+
+ <!-- LIBRARY DEPENDENCIES -->
+ <archunit.version>0.23.1</archunit.version>
+ <asm.version>9.3</asm.version> <!-- keep in sync with org.eclipse.persistence:org.eclipse.persistence.asm -->
+ <approvaltests.version>15.1.2</approvaltests.version>
+
+ <assertj-guava.version>3.4.0</assertj-guava.version>
+
+ <camel.version>3.14.2</camel.version>
+
+ <commons-email.version>1.5</commons-email.version>
+ <commons-httpclient.version>4.5.12</commons-httpclient.version>
+ <commons-io.version>2.11.0</commons-io.version>
+
+ <cucumber.version>7.2.3</cucumber.version>
+
+ <cxf-rt-rs-client.version>3.5.1</cxf-rt-rs-client.version>
+
+ <danhaywood-java-assertjext.version>0.1.0</danhaywood-java-assertjext.version>
+ <danhaywood-java-testsupport.version>1.0.0</danhaywood-java-testsupport.version>
+
+ <datanucleus-api-jdo.version>6.0.0-m4</datanucleus-api-jdo.version>
+ <datanucleus-core.version>6.0.0-m4</datanucleus-core.version>
+ <datanucleus-jdo-api.version>3.2.0-release</datanucleus-jdo-api.version>
+ <datanucleus-jdo-query.version>6.0.0-m1</datanucleus-jdo-query.version>
+ <datanucleus-jodatime.version>6.0.0-m4</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>6.0.0-m1</datanucleus-maven-plugin.version>
+ <datanucleus-rdbms.version>6.0.0-m4</datanucleus-rdbms.version>
+
+ <docx4j.version>11.3.2</docx4j.version>
+
+ <easymock.version>4.3</easymock.version>
+ <error_prone_annotations.version>2.12.1</error_prone_annotations.version>
+
+ <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
+ <guava.version>31.1-jre</guava.version>
+
+ <htmlparser.version>2.1</htmlparser.version>
+
+ <jakarta.annotation-api.version>2.1.0</jakarta.annotation-api.version>
+ <jakartaee.version>8.0.0</jakartaee.version>
+ <javafaker.version>1.0.2</javafaker.version>
+ <javassist.version>3.28.0-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>
+
+ <jbcrypt.version>0.4</jbcrypt.version>
+ <jboss-jaxrs-api_2.0_spec.version>1.0.1.Final</jboss-jaxrs-api_2.0_spec.version>
+
+ <!-- v3.2 not available yet, use datanucleus staging for now -->
+ <!-- <jdo-api.version>3.2</jdo-api.version> -->
+
+ <jdom.version>2.0.6.1</jdom.version>
+ <jmock.version>2.12.0</jmock.version>
+ <joda-time.version>2.10.14</joda-time.version>
+ <jopt-simple.version>6.0-alpha-3</jopt-simple.version>
+
+ <jquery-ui.version>1.13.1</jquery-ui.version> <!-- org.webjars:jquery-ui -->
+
+ <jsr305.version>3.0.2</jsr305.version>
+ <junit-jupiter.version>5.8.2</junit-jupiter.version> <!-- overrides spring -->
+ <junit-platform.version>1.8.2</junit-platform.version>
+
+ <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
+
+ <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+ <maven-release-plugin.version>2.5.3</maven-release-plugin.version> <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
+ <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+
+ <!-- See https://nodejs.org/en/download/ for latest node and npm (lts)
+ versions -->
+ <node.version>v16.14.0</node.version>
+ <npm.version>8.3.1</npm.version>
+
+ <objenesis.version>3.2</objenesis.version>
+ <ognl.version>3.3.2</ognl.version>
+
+ <picocontainer.version>2.15</picocontainer.version>
+ <poi.version>5.2.1</poi.version>
+
+ <quartz-scheduler.version>2.3.2</quartz-scheduler.version>
+
+ <resteasy-spring-boot-starter.version>5.0.0.Final</resteasy-spring-boot-starter.version>
+ <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
+
+ <select2.version>4.0.13</select2.version>
+ <shiro.version>1.9.0</shiro.version>
+ <simpleslackapi.version>1.3.0</simpleslackapi.version>
+ <slf4j-api.version>1.7.36</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
+ <spring-boot.version>2.6.6</spring-boot.version> <!-- has no effect here, needs to be set in bom/pom.xml -->
+ <summernote.version>0.8.11</summernote.version>
+ <swagger-core.version>1.6.5</swagger-core.version>
+
+ <togglz.version>3.1.1</togglz.version>
+
+ <vaadin.version>23.0.4</vaadin.version>
+
+ <wicket.version>9.8.0</wicket.version>
+ <wicket-bootstrap.version>6.0.0-M6</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... -->
+ <wicket-fullcalendar.version>4.2</wicket-fullcalendar.version>
+ <wicket-webjars.version>3.0.4</wicket-webjars.version>
+ <wicket-viewer-jquery.version>3.5.1</wicket-viewer-jquery.version> <!-- as served by wicket via webjars -->
+
+ <wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
+ <wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
+
</properties>
<!-- breaks dependabot run: timeout due to repo not accessible
@@ -810,10 +917,34 @@ under the License.
</execution>
</executions>
</plugin>
+ <!-- APACHE ISIS customisation 8/15: start -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.6,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[11,)</version>
+ </requireJavaVersion>
+ <!-- seemingly not compatible with use of 2.0.0-SNAPSHOT placeholders
+ <requirePluginVersions> <message>All plugin versions must be defined!</message>
+ <banLatest>true</banLatest> <banRelease>true</banRelease> </requirePluginVersions> -->
+ <DependencyConvergence />
+ </rules>
+ </configuration>
+ <!-- goal:enforce supposedly binds to phase:validate, but explicit binding
+ seems to be required -->
<executions>
+ <execution>
+ <id>validate-enforce</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
<execution>
<id>enforce-maven-version</id>
<goals>
@@ -842,6 +973,7 @@ under the License.
</execution>
</executions>
</plugin>
+ <!-- APACHE ISIS customisation 8/15: end -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -854,8 +986,6 @@ under the License.
</execution>
</executions>
</plugin>
- <!-- APACHE ISIS customisation 8/15: start -->
- <!-- APACHE ISIS customisation 8/15: end -->
</plugins>
</build>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index dea65a82ce..c4563a32e0 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -70,16 +70,24 @@
</dependency>
<dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator</artifactId>
- <exclusions>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <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>
- <!-- version clash -->
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
- </exclusions>
- </dependency>
+ </exclusions>
+ </dependency>
+
<!-- IDE support (optional) -->
<dependency>
diff --git a/core/jdk-supplemental/pom.xml b/core/jdk-supplemental/pom.xml
index f7f1a35f3c..10c5119964 100644
--- a/core/jdk-supplemental/pom.xml
+++ b/core/jdk-supplemental/pom.xml
@@ -67,12 +67,41 @@
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
<version>2.7.10</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.10</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>
@@ -80,8 +109,17 @@
<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>
@@ -123,6 +161,10 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind.external</groupId>
+ <artifactId>rngom</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -147,6 +189,17 @@
<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>
+
<!-- v8.0.0 provides @Inject, @Qualifier, ... that's required by Spring 5.x -->
<dependency>
<groupId>jakarta.platform</groupId>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 035f94a75a..2903f9652c 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -130,12 +130,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index fa6387bf42..c24b149e13 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -80,113 +80,6 @@
https://github.com/Eonasdan/bootstrap-datetimepicker/blob/master/LICENSE
[6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
-
- <!-- LIBRARY DEPENDENCIES -->
- <archunit.version>0.23.1</archunit.version>
- <asm.version>9.3</asm.version> <!-- keep in sync with org.eclipse.persistence:org.eclipse.persistence.asm -->
- <approvaltests.version>15.1.2</approvaltests.version>
-
- <assertj-guava.version>3.4.0</assertj-guava.version>
-
- <camel.version>3.14.2</camel.version>
-
- <commons-email.version>1.5</commons-email.version>
- <commons-httpclient.version>4.5.12</commons-httpclient.version>
- <commons-io.version>2.11.0</commons-io.version>
-
- <cucumber.version>7.2.3</cucumber.version>
-
- <cxf-rt-rs-client.version>3.5.1</cxf-rt-rs-client.version>
-
- <danhaywood-java-assertjext.version>0.1.0</danhaywood-java-assertjext.version>
- <danhaywood-java-testsupport.version>1.0.0</danhaywood-java-testsupport.version>
-
- <datanucleus-api-jdo.version>6.0.0-m4</datanucleus-api-jdo.version>
- <datanucleus-core.version>6.0.0-m4</datanucleus-core.version>
- <datanucleus-jdo-api.version>3.2.0-release</datanucleus-jdo-api.version>
- <datanucleus-jdo-query.version>6.0.0-m1</datanucleus-jdo-query.version>
- <datanucleus-jodatime.version>6.0.0-m4</datanucleus-jodatime.version>
- <datanucleus-maven-plugin.version>6.0.0-m1</datanucleus-maven-plugin.version>
- <datanucleus-rdbms.version>6.0.0-m4</datanucleus-rdbms.version>
-
- <docx4j.version>11.3.2</docx4j.version>
-
- <easymock.version>4.3</easymock.version>
- <error_prone_annotations.version>2.12.1</error_prone_annotations.version>
-
- <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
- <guava.version>31.1-jre</guava.version>
-
- <htmlparser.version>2.1</htmlparser.version>
-
- <jakarta.annotation-api.version>2.1.0</jakarta.annotation-api.version>
- <jakartaee.version>8.0.0</jakartaee.version>
- <javafaker.version>1.0.2</javafaker.version>
- <javassist.version>3.28.0-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>
-
- <jbcrypt.version>0.4</jbcrypt.version>
- <jboss-jaxrs-api_2.0_spec.version>1.0.1.Final</jboss-jaxrs-api_2.0_spec.version>
-
- <!-- v3.2 not available yet, use datanucleus staging for now -->
- <!-- <jdo-api.version>3.2</jdo-api.version> -->
-
- <jdom.version>2.0.6.1</jdom.version>
- <jmock.version>2.12.0</jmock.version>
- <joda-time.version>2.10.14</joda-time.version>
- <jopt-simple.version>6.0-alpha-3</jopt-simple.version>
-
- <jquery-ui.version>1.13.1</jquery-ui.version> <!-- org.webjars:jquery-ui -->
-
- <jsr305.version>3.0.2</jsr305.version>
- <junit-jupiter.version>5.8.2</junit-jupiter.version> <!-- overrides spring -->
- <junit-platform.version>1.8.2</junit-platform.version>
-
- <log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
-
- <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
- <maven-release-plugin.version>2.5.3</maven-release-plugin.version> <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
- <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-
- <!-- See https://nodejs.org/en/download/ for latest node and npm (lts)
- versions -->
- <node.version>v16.14.0</node.version>
- <npm.version>8.3.1</npm.version>
-
- <objenesis.version>3.2</objenesis.version>
- <ognl.version>3.3.2</ognl.version>
-
- <picocontainer.version>2.15</picocontainer.version>
- <poi.version>5.2.1</poi.version>
-
- <quartz-scheduler.version>2.3.2</quartz-scheduler.version>
-
- <resteasy-spring-boot-starter.version>5.0.0.Final</resteasy-spring-boot-starter.version>
- <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
-
- <select2.version>4.0.13</select2.version>
- <shiro.version>1.9.0</shiro.version>
- <simpleslackapi.version>1.3.0</simpleslackapi.version>
- <slf4j-api.version>1.7.36</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
- <spring-boot.version>2.6.6</spring-boot.version> <!-- has no effect here, needs to be set in bom/pom.xml -->
- <summernote.version>0.8.11</summernote.version>
- <swagger-core.version>1.6.5</swagger-core.version>
-
- <togglz.version>3.1.1</togglz.version>
-
- <vaadin.version>23.0.4</vaadin.version>
-
- <wicket.version>9.8.0</wicket.version>
- <wicket-bootstrap.version>6.0.0-M6</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... -->
- <wicket-fullcalendar.version>4.2</wicket-fullcalendar.version>
- <wicket-webjars.version>3.0.4</wicket-webjars.version>
- <wicket-viewer-jquery.version>3.5.1</wicket-viewer-jquery.version> <!-- as served by wicket via webjars -->
-
- <wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
- <wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
-
</properties>
<pluginRepositories>
@@ -470,38 +363,6 @@
<!-- etc; none of the goals has a binding. -->
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>[11,)</version>
- </requireJavaVersion>
- <!-- seemingly not compatible with use of 2.0.0-SNAPSHOT placeholders
- <requirePluginVersions> <message>All plugin versions must be defined!</message>
- <banLatest>true</banLatest> <banRelease>true</banRelease> </requirePluginVersions> -->
- <DependencyConvergence />
- </rules>
- </configuration>
- <!-- goal:enforce supposedly binds to phase:validate, but explicit binding
- seems to be required -->
- <executions>
- <execution>
- <id>validate-enforce</id>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
@@ -544,10 +405,6 @@
and deploy plugins are automatically included because they provide the default
bindings. For the 'site' lifecycle, the site plugin is automatically included. -->
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
<!-- run using: mvn org.apache.rat:apache-rat-plugin:check -->
<plugin>
@@ -822,6 +679,20 @@
<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>
@@ -906,12 +777,6 @@
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-ri</artifactId>
- <version>${jaxws-ri.version}</version>
- <type>pom</type>
- </dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
diff --git a/extensions/core/command-replay/secondary/pom.xml b/extensions/core/command-replay/secondary/pom.xml
index d166e0461e..57ceb79bdf 100644
--- a/extensions/core/command-replay/secondary/pom.xml
+++ b/extensions/core/command-replay/secondary/pom.xml
@@ -1,91 +1,90 @@
<?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
+<!-- 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>
+<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.isis.extensions</groupId>
- <artifactId>isis-extensions-command-replay</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-command-replay</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
- <artifactId>isis-extensions-command-replay-secondary</artifactId>
- <name>Apache Isis Ext - Command Replay for Secondary</name>
+ <artifactId>isis-extensions-command-replay-secondary</artifactId>
+ <name>Apache Isis Ext - Command Replay for Secondary</name>
- <packaging>jar</packaging>
+ <packaging>jar</packaging>
- <description>
+ <description>
A module providing a Quartz Job to run on a secondary system,
for obtaining commands from a primary and saving them so that they are replayed.
</description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.commandreplay.secondary</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/commandreplay/secondary</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-schema</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-restfulobjects-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-command-log-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-quartz-impl</artifactId>
- </dependency>
-
- <!-- TESTING -->
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- TOOO convergence issues, disable for now
- <dependency>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.commandreplay.secondary</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/commandreplay/secondary</git-plugin.propertiesDir>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-schema</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-restfulobjects-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-command-log-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-quartz-impl</artifactId>
+ </dependency>
+
+ <!-- TESTING -->
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-internaltestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring5</artifactId>
<scope>test</scope>
</dependency>
- -->
-
- </dependencies>
-</project>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/incubator/viewers/vaadin/pom.xml b/incubator/viewers/vaadin/pom.xml
index 70056ced5f..ef4e1174b4 100644
--- a/incubator/viewers/vaadin/pom.xml
+++ b/incubator/viewers/vaadin/pom.xml
@@ -32,6 +32,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.incubator.viewer.vaadin</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/incubator/viewer/vaadin</git-plugin.propertiesDir>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<packaging>pom</packaging>
diff --git a/incubator/viewers/vaadin/ui/pom.xml b/incubator/viewers/vaadin/ui/pom.xml
index 6e12bbada5..fd0044d357 100644
--- a/incubator/viewers/vaadin/ui/pom.xml
+++ b/incubator/viewers/vaadin/ui/pom.xml
@@ -27,6 +27,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.incubator.viewer.vaadin.ui</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/incubator/viewer/vaadin/ui</git-plugin.propertiesDir>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<!-- IN CASE WE WANT TO USE VAADIN ADDONS -->
diff --git a/persistence/jpa/eclipselink/pom.xml b/persistence/jpa/eclipselink/pom.xml
index 10590a25d3..04d79fcefa 100644
--- a/persistence/jpa/eclipselink/pom.xml
+++ b/persistence/jpa/eclipselink/pom.xml
@@ -85,6 +85,12 @@
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>2.7.10</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/tooling/c4modeling/pom.xml b/tooling/c4modeling/pom.xml
index 63007b0874..f58a85409b 100644
--- a/tooling/c4modeling/pom.xml
+++ b/tooling/c4modeling/pom.xml
@@ -30,6 +30,7 @@
</description>
<properties>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
diff --git a/tooling/cli/pom.xml b/tooling/cli/pom.xml
index 53111369ca..79f18711f7 100644
--- a/tooling/cli/pom.xml
+++ b/tooling/cli/pom.xml
@@ -28,6 +28,7 @@
</description>
<properties>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<build>
diff --git a/tooling/dsl/pom.xml b/tooling/dsl/pom.xml
index 4e5364f6ec..c7895692b7 100644
--- a/tooling/dsl/pom.xml
+++ b/tooling/dsl/pom.xml
@@ -31,6 +31,7 @@
<graphql-java.version>17.3</graphql-java.version>
<javapoet.version>1.13.0</javapoet.version>
<skipTests>true</skipTests>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
diff --git a/tooling/java2adoc/pom.xml b/tooling/java2adoc/pom.xml
index 9ad24651c2..2407c23cf1 100644
--- a/tooling/java2adoc/pom.xml
+++ b/tooling/java2adoc/pom.xml
@@ -29,6 +29,7 @@
<properties>
<skipTests>true</skipTests>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
diff --git a/tooling/javamodel/pom.xml b/tooling/javamodel/pom.xml
index 248b2eff69..d160a022a7 100644
--- a/tooling/javamodel/pom.xml
+++ b/tooling/javamodel/pom.xml
@@ -31,6 +31,7 @@
<code-assert.version>0.9.14</code-assert.version>
<javaparser.version>3.24.2</javaparser.version>
<skipTests>true</skipTests>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<repositories>
diff --git a/tooling/model4adoc/pom.xml b/tooling/model4adoc/pom.xml
index 222d8b3cd1..0001a7cb9a 100644
--- a/tooling/model4adoc/pom.xml
+++ b/tooling/model4adoc/pom.xml
@@ -35,6 +35,7 @@
</description>
<properties>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
diff --git a/tooling/projectmodel/pom.xml b/tooling/projectmodel/pom.xml
index 9ed1b486a2..b35a37da65 100644
--- a/tooling/projectmodel/pom.xml
+++ b/tooling/projectmodel/pom.xml
@@ -29,6 +29,7 @@
<properties>
<skipTests>true</skipTests>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index 4dd6a48f35..22493ac495 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -27,6 +27,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.ui</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/ui</git-plugin.propertiesDir>
+ <enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>