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:48 UTC
[isis] branch master updated (095ab4ed0d -> d530bd8b2c)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from 095ab4ed0d ISIS-3004: more mignotes
new c168931653 ISIS-3003: pom convergence fixes
new d530bd8b2c ISIS-3003: harmonize logical type names
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bom/pom.xml | 136 ++++++++++++++++-
core/config/pom.xml | 20 ++-
core/jdk-supplemental/pom.xml | 53 +++++++
core/metamodel/pom.xml | 6 -
core/pom.xml | 163 ++-------------------
.../model/IsisModuleExtCommandLogApplib.java | 3 +
.../primary/IsisModuleExtCommandReplayPrimary.java | 2 +-
extensions/core/command-replay/secondary/pom.xml | 151 ++++++++++---------
.../IsisModuleExtCommandReplaySecondary.java | 4 +-
.../analyser/CommandReplayAnalyserException.java | 3 +-
.../analyser/CommandReplayAnalyserResult.java | 3 +-
.../analysis/CommandReplayAnalysisService.java | 3 +-
.../secondary/fetch/CommandFetcher.java | 21 ++-
.../ui/CommandReplayOnSecondaryService.java | 18 ++-
incubator/viewers/vaadin/pom.xml | 1 +
incubator/viewers/vaadin/ui/pom.xml | 1 +
persistence/jpa/eclipselink/pom.xml | 6 +
.../testdomain/rest/RestServiceStressTest.java | 5 +-
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 +
26 files changed, 344 insertions(+), 263 deletions(-)
[isis] 01/02: ISIS-3003: pom convergence fixes
Posted by ah...@apache.org.
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>
[isis] 02/02: ISIS-3003: harmonize logical type names
Posted by ah...@apache.org.
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 d530bd8b2c33cd3af7a2182dea2ac5a9382e363d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 13 11:31:42 2022 +0200
ISIS-3003: harmonize logical type names
---
.../model/IsisModuleExtCommandLogApplib.java | 3 +++
.../primary/IsisModuleExtCommandReplayPrimary.java | 2 +-
.../IsisModuleExtCommandReplaySecondary.java | 4 ++--
.../analyser/CommandReplayAnalyserException.java | 3 ++-
.../analyser/CommandReplayAnalyserResult.java | 3 ++-
.../analysis/CommandReplayAnalysisService.java | 3 ++-
.../secondary/fetch/CommandFetcher.java | 21 +++++++++++++--------
.../ui/CommandReplayOnSecondaryService.java | 18 +++++++++++-------
.../isis/testdomain/rest/RestServiceStressTest.java | 5 +++--
9 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
index f6a9576baa..1ef3cdad46 100644
--- a/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
+++ b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
@@ -44,4 +44,7 @@ extends ModuleWithFixtures {
public abstract static class PropertyDomainEvent<S,T>
extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> { }
+ public static final String NAMESPACE_PRIMARY = "isis.ext.commandReplayPrimary";
+ public static final String NAMESPACE_SECONDARY = "isis.ext.commandReplaySecondary";
+
}
diff --git a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java
index 3b78177d29..e27ac96411 100644
--- a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java
+++ b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.java
@@ -50,7 +50,7 @@ import org.apache.isis.extensions.commandreplay.primary.ui.CommandReplayOnPrimar
@Profile("primary")
public class IsisModuleExtCommandReplayPrimary {
- public static final String NAMESPACE = "isis.ext.commandReplayPrimary";
+ public static final String NAMESPACE = IsisModuleExtCommandLogApplib.NAMESPACE_PRIMARY;
public abstract static class ActionDomainEvent<S>
extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> { }
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java
index f8e52459f6..c48fa2810c 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.java
@@ -78,7 +78,7 @@ import lombok.val;
@Profile("secondary")
public class IsisModuleExtCommandReplaySecondary {
- public static final String NAMESPACE = "isis.ext.commandReplaySecondary";
+ public static final String NAMESPACE = IsisModuleExtCommandLogApplib.NAMESPACE_SECONDARY;
public abstract static class ActionDomainEvent<S>
extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> { }
@@ -102,7 +102,7 @@ public class IsisModuleExtCommandReplaySecondary {
}
@Bean(name = "ReplicateAndReplayTrigger" )
- public SimpleTriggerFactoryBean replicateAndReplayTriggerFactory(@Qualifier("ReplicateAndReplayJob") JobDetail job) {
+ public SimpleTriggerFactoryBean replicateAndReplayTriggerFactory(@Qualifier("ReplicateAndReplayJob") final JobDetail job) {
val triggerFactory = new SimpleTriggerFactoryBean();
triggerFactory.setJobDetail(job);
val config = isisConfiguration.getExtensions().getCommandReplay().getQuartzReplicateAndReplayJob();
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
index 1bbd919ee1..c7dac55636 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
@@ -31,6 +31,7 @@ import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.schema.common.v2.InteractionType;
import lombok.RequiredArgsConstructor;
@@ -40,7 +41,7 @@ import lombok.val;
* @since 2.0 {@index}
*/
@Service
-@Named("isis.ext.commandReplaySecondary.CommandReplayAnalyserException")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalyserException")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor
public class CommandReplayAnalyserException implements CommandReplayAnalyser {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
index 063cce71d8..88a73fd7b0 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.services.commanddto.conmap.UserDataKeys;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.schema.common.v2.InteractionType;
import lombok.RequiredArgsConstructor;
@@ -39,7 +40,7 @@ import lombok.val;
* @since 2.0 {@index}
*/
@Service
-@Named("isis.ext.commandReplaySecondary.CommandReplayAnalyserResult")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalyserResult")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor
public class CommandReplayAnalyserResult implements CommandReplayAnalyser {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
index 4e99d85854..335129802e 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.extensions.commandreplay.secondary.analyser.CommandReplayAnalyser;
import lombok.extern.log4j.Log4j2;
@@ -35,7 +36,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Service
-@Named("isis.ext.commandReplaySecondary.CommandReplayAnalysisService")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalysisService")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Log4j2
public class CommandReplayAnalysisService {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
index 758a42426f..87f469d496 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
@@ -33,7 +33,9 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.client.SuppressionType;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.jaxb.JaxbService.Simple;
+import org.apache.isis.extensions.commandlog.model.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
+import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.extensions.commandreplay.secondary.SecondaryStatus;
import org.apache.isis.extensions.commandreplay.secondary.StatusException;
import org.apache.isis.extensions.commandreplay.secondary.config.SecondaryConfig;
@@ -50,15 +52,15 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Service()
-@Named("isis.ext.commandReplaySecondary.CommandFetcher")
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandFetcher")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Log4j2
public class CommandFetcher {
static final String URL_SUFFIX =
- "services/isisExtensionsCommandReplayPrimary."
- + "CommandRetrievalService/actions/findCommandsOnPrimaryFrom/invoke";
-
+ "services/"
+ + IsisModuleExtCommandLogApplib.NAMESPACE_PRIMARY
+ + ".CommandRetrievalService/actions/findCommandsOnPrimaryFrom/invoke";
/**
* Replicates a single command.
@@ -99,8 +101,12 @@ public class CommandFetcher {
return commandsDto;
}
-
+ //TODO simplify
private String buildUri(final UUID interactionId) {
+
+// val args = client.arguments()
+// .build();
+
val uri =
interactionId != null
? String.format(
@@ -153,7 +159,7 @@ public class CommandFetcher {
final SecondaryConfig secondaryConfig,
final boolean useRequestDebugLogging) {
- RestfulClientConfig clientConfig = new RestfulClientConfig();
+ val clientConfig = new RestfulClientConfig();
clientConfig.setRestfulBase(secondaryConfig.getPrimaryBaseUrlRestful());
// setup basic-auth
clientConfig.setUseBasicAuth(true);
@@ -162,8 +168,7 @@ public class CommandFetcher {
// setup request/response debug logging
clientConfig.setUseRequestDebugLogging(useRequestDebugLogging);
- RestfulClient client = RestfulClient.ofConfig(clientConfig);
-
+ val client = RestfulClient.ofConfig(clientConfig);
return client;
}
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
index dc5bcb1bee..cc80224022 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
@@ -24,7 +24,14 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.annotation.*;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
@@ -40,23 +47,20 @@ import lombok.val;
* @since 2.0 {@index}
*/
@DomainService(
- nature = NatureOfService.VIEW,
- logicalTypeName = CommandReplayOnSecondaryService.LOGICAL_TYPE_NAME
+ nature = NatureOfService.VIEW
)
+@Named(IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayOnSecondaryService")
@DomainServiceLayout(
named = "Activity",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
)
-@Named(CommandReplayOnSecondaryService.LOGICAL_TYPE_NAME)
@javax.annotation.Priority(PriorityPrecedence.EARLY)
@RequiredArgsConstructor
//@Log4j2
public class CommandReplayOnSecondaryService {
- public static final String LOGICAL_TYPE_NAME = IsisModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayOnSecondaryService";
-
@Inject CommandModelRepository<? extends CommandModel> commandModelRepository;
- @Inject final JaxbService jaxbService;
+ @Inject JaxbService jaxbService;
public static abstract class ActionDomainEvent<T> extends IsisModuleExtCommandReplaySecondary.ActionDomainEvent<T> { }
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java b/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
index 5baa51396d..37238d1cbd 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/isis/testdomain/rest/RestServiceStressTest.java
@@ -23,8 +23,8 @@ import java.util.stream.IntStream;
import javax.inject.Inject;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
@@ -52,13 +52,14 @@ import lombok.extern.log4j.Log4j2;
Configuration_usingJdo.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
})
+@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
@Log4j2
class RestServiceStressTest {
@LocalServerPort int port; // just for reference (not used)
@Inject RestEndpointService restService;
- @Test @Disabled("test works, though don't enable when building")
+ @Test
void bookOfTheWeek_stressTest() {
assertTrue(restService.getPort()>0);