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 2022/07/12 14:45:06 UTC
[isis] branch ISIS-3002 updated: ISIS-3002: fixes compile issue
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3002
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3002 by this push:
new 03e6dfe701 ISIS-3002: fixes compile issue
03e6dfe701 is described below
commit 03e6dfe7010a5316f5ed2102eb8f373b99c22d06
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jul 12 15:42:51 2022 +0100
ISIS-3002: fixes compile issue
---
build.sh | 8 +-
examples/demo/domain/pom.xml | 19 +----
examples/demo/pom.xml | 92 +++++-----------------
examples/demo/wicket/common/pom.xml | 9 +--
examples/demo/wicket/jdo/pom.xml | 21 +++++
examples/demo/wicket/jpa/pom.xml | 24 +++++-
.../applib/IsisModuleExtExecutionLogApplib.java | 1 -
.../core/executionlog/persistence-jdo/pom.xml | 4 -
.../.gitkeep | 0
.../jdo/IsisModuleExtExecutionLogJdo.java | 5 +-
10 files changed, 71 insertions(+), 112 deletions(-)
diff --git a/build.sh b/build.sh
index e4acb48cd8..d6eb300e70 100644
--- a/build.sh
+++ b/build.sh
@@ -18,10 +18,10 @@ usage() {
echo "" >&2
echo " -p run 'git pull --ff-only' first" >&2
echo " -c include 'clean' goal" >&2
- echo " -s specify settings" >&2
echo " -t add '-Dmaven-timeline.version=1.8-SNAPSHOT' for improved timeline output" >&2
- echo " -y use 'verify' rather than 'install'. Cannot combine with '-k'" >&2
+ echo " -l single threaded, do NOT add '-T1C' flag" >&2
echo " -k use 'package' rather than 'install'. Does not run integ tests. Cannot combine with '-y'" >&2
+ echo " -y use 'verify' rather than 'install'. Cannot combine with '-k'" >&2
echo " -O do NOT add '-o' (offline) flag, ie bring down any new dependencies" >&2
echo " -F do NOT search for Failures and Errors at the end" >&2
echo " -S do NOT print summary or last 50 lines at the end" >&2
@@ -32,7 +32,6 @@ usage() {
GIT_PULL=false
CLEAN=false
-SETTINGS=false
TIMELINE=false
SKIP_OFFLINE=false
PACKAGE_ONLY=false
@@ -45,12 +44,11 @@ VERBOSE=false
MVN_LOG=/tmp/$BASENAME_0.$$.log
-while getopts 'prcstlkyOFSwvh' opt
+while getopts 'prctlkyOFSwvh' opt
do
case $opt in
p) export GIT_PULL=true ;;
c) export CLEAN=true ;;
- s) export SETTINGS=true ;;
t) export TIMELINE=true ;;
O) export SKIP_OFFLINE=true ;;
l) export SINGLE_THREADED=true ;;
diff --git a/examples/demo/domain/pom.xml b/examples/demo/domain/pom.xml
index 8882f3bc5d..b83d5a7e95 100644
--- a/examples/demo/domain/pom.xml
+++ b/examples/demo/domain/pom.xml
@@ -72,14 +72,6 @@
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman-encryption-spring</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jpa</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman-shiro-realm</artifactId>
@@ -89,6 +81,7 @@
<artifactId>isis-testing-h2console-ui</artifactId>
</dependency>
+
<!-- OTHER DEPENDENCIES -->
<dependency>
@@ -112,16 +105,6 @@
<artifactId>isis-extensions-fullcalendar-applib</artifactId>
</dependency>
- <!-- Extensions -->
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-commandlog-persistence-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-commandlog-persistence-jpa</artifactId>
- </dependency>
-
<!-- test -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 145b406e6a..fd97e0d32f 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -156,77 +156,27 @@
</plugins>
</build>
- <dependencies>
-
- <!-- EXTENSIONS -->
-
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc-metamodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc-persistence-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc-persistence-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-markdown-metamodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-markdown-persistence-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-markdown-persistence-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-sse-applib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-exceldownload-wicket-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-integration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-shiro-realm</artifactId>
- </dependency>
-
- <!-- OTHER DEPENDENCIES -->
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-exceldownload</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
<profiles>
<profile>
diff --git a/examples/demo/wicket/common/pom.xml b/examples/demo/wicket/common/pom.xml
index d4ef904306..7e77ced003 100644
--- a/examples/demo/wicket/common/pom.xml
+++ b/examples/demo/wicket/common/pom.xml
@@ -62,13 +62,6 @@
<version>${project.version}</version>
</dependency>
- <!-- WEB APPLICATION DEPENDENCY BUNDLE -->
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-webapp</artifactId>
- <type>pom</type>
- </dependency>
<!-- Wicket viewer components -->
@@ -103,7 +96,7 @@
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-pdfjs-wicket-ui</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-fullcalendar-wicket-ui</artifactId>
diff --git a/examples/demo/wicket/jdo/pom.xml b/examples/demo/wicket/jdo/pom.xml
index 176e57caa8..bbb5bd4a35 100644
--- a/examples/demo/wicket/jdo/pom.xml
+++ b/examples/demo/wicket/jdo/pom.xml
@@ -50,6 +50,27 @@
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
+ <!-- Extensions -->
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-commandlog-persistence-jdo</artifactId>
+ </dependency>
+
+ <!-- Value types -->
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc-persistence-jdo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-markdown-persistence-jdo</artifactId>
+ </dependency>
+
+
</dependencies>
<profiles>
diff --git a/examples/demo/wicket/jpa/pom.xml b/examples/demo/wicket/jpa/pom.xml
index b4d65911c4..0946a641b2 100644
--- a/examples/demo/wicket/jpa/pom.xml
+++ b/examples/demo/wicket/jpa/pom.xml
@@ -30,7 +30,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<sonar.skip>true</sonar.skip>
- <spring.profiles.active>demo-jpa</spring.profiles.active>
+ <spring.profiles.active>demo-jpa</spring.profiles.active>
</properties>
<dependencies>
@@ -42,7 +42,7 @@
<artifactId>demo-wicket-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<!-- PERSISTENCE -->
<dependency>
@@ -50,6 +50,26 @@
<artifactId>isis-persistence-jpa-eclipselink</artifactId>
</dependency>
+ <!-- Extensions -->
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman-persistence-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-commandlog-persistence-jpa</artifactId>
+ </dependency>
+
+ <!-- Value types -->
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc-persistence-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-markdown-persistence-jpa</artifactId>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/IsisModuleExtExecutionLogApplib.java b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/IsisModuleExtExecutionLogApplib.java
index f3e5013d31..6ed111ee77 100644
--- a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/IsisModuleExtExecutionLogApplib.java
+++ b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/IsisModuleExtExecutionLogApplib.java
@@ -21,7 +21,6 @@ package org.apache.isis.extensions.executionlog.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.config.util.SpringProfileUtil;
import org.apache.isis.extensions.executionlog.applib.app.ExecutionLogMenu;
import org.apache.isis.extensions.executionlog.applib.dom.ExecutionLogEntry;
import org.apache.isis.extensions.executionlog.applib.spiimpl.ExecutionSubscriberForLog;
diff --git a/extensions/core/executionlog/persistence-jdo/pom.xml b/extensions/core/executionlog/persistence-jdo/pom.xml
index 38db4e80e2..b29eb3fff5 100644
--- a/extensions/core/executionlog/persistence-jdo/pom.xml
+++ b/extensions/core/executionlog/persistence-jdo/pom.xml
@@ -73,10 +73,6 @@
<artifactId>isis-testing-integtestsupport-applib</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-executionlog-applib</artifactId>
- </dependency>
</dependencies>
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org.apache.isis.extensions.executionlog.jdo/.gitkeep b/extensions/core/executionlog/persistence-jdo/src/main/java/org.apache.isis.extensions.executionlog.jdo/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/IsisModuleExtExecutionLogJdo.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/IsisModuleExtExecutionLogJdo.java
index 288bdd2b1f..f66f4a7f7d 100644
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/IsisModuleExtExecutionLogJdo.java
+++ b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/IsisModuleExtExecutionLogJdo.java
@@ -21,7 +21,6 @@ package org.apache.isis.extensions.executionlog.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.executionlog.applib.IsisModuleExtExecutionLogApplib;
import org.apache.isis.extensions.executionlog.applib.dom.ExecutionLogEntry;
import org.apache.isis.extensions.executionlog.applib.dom.ExecutionLogEntryRepository;
@@ -44,8 +43,8 @@ import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAb
})
public class IsisModuleExtExecutionLogJdo {
- public static final String NAMESPACE = IsisModuleExtCommandLogApplib.NAMESPACE;
- public static final String SCHEMA = IsisModuleExtCommandLogApplib.SCHEMA;
+ public static final String NAMESPACE = IsisModuleExtExecutionLogApplib.NAMESPACE;
+ public static final String SCHEMA = IsisModuleExtExecutionLogApplib.SCHEMA;
/**
* For tests that need to delete the command table first.