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/27 20:01:42 UTC
[isis] branch ISIS-2186 updated (27a2974 -> 5df9762)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 27a2974 ISIS-2186: adds log4j2-test.xml for simpleapp
new e34b9ef ISIS-2186: makes simpleapp's configuration more consistent.
new fb74e9e ISIS-2186: removes flatten-maven-plugin
new 86e6509 ISIS-2186: removes plugin from isis-extensions that is already inherited from isis-core
new 6208c5c ISIS-2186: moves menubars.layout.xml
new 5df9762 ISIS-2186: fake data integ tests, simplifying simpleapp integ tests also
The 5 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:
core-parent/pom.xml | 2 +-
.../{ => bypass}/IsisBootSecurityBypass.java | 8 +-
.../authentication}/AuthenticatorBypass.java | 2 +-
.../authorization}/AuthorizorBypass.java | 2 +-
core/testsupport/integtestsupport/pom.xml | 141 +++++++++++++++++----
core/testsupport/unittestsupport/pom.xml | 125 +++++++++---------
.../testdomain/conf/Configuration_headless.java | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 2 +-
.../testdomain/bootstrapping/builtin-IsisBoot.list | 4 +-
.../bootstrapping/builtin-singleton.list | 4 +-
examples/vanilla/pom.xml | 2 +-
.../fakedata/fixture/FakeDataFixturesModule.java | 7 +
.../dom/FakeDataDemoObjectWithAllMenu.java | 5 +-
.../isisaddons/module/fakedata/FakeDataModule.java | 2 +
.../lib/fakedata/integtests}/log4j2-test.xml | 0
.../integtests/logging-integtest.properties | 93 --------------
extensions/lib/fakedata/integtests/pom.xml | 6 +
...va => FakeDataModuleAppManifestForTesting.java} | 26 ++--
.../FakeDataModuleIntegTestAbstract.java | 26 ++--
.../integtests/FakeDataModuleIntegTestModule.java | 8 +-
.../Bootstrap_IntegTest.java} | 19 +--
...Objects_IntegTest.java => Smoke_IntegTest.java} | 70 +++++-----
extensions/pom.xml | 82 ------------
mavendeps/pom.xml | 31 -----
.../LockDownMavenDeps_Test.list.approved.txt | 21 +--
.../LockDownMavenDeps_Test.tree.approved.txt | 39 +++---
starters/pom.xml | 4 +-
starters/simpleapp/application/pom.xml | 6 +
...plicationModule.java => ApplicationModule.java} | 2 +-
.../fixture/scenarios/DomainAppDemo.java | 1 -
.../integtests/SpringIntegrationTest.java | 4 +-
...sting.java => SimpleAppManifestForTesting.java} | 18 +--
.../test/resources/cucumber.properties~deprecated | 1 -
.../integtests/SimpleModuleManifestForTesting.java | 9 +-
starters/simpleapp/webapp/pom.xml | 4 +-
.../{application => webapp}/SimpleApp.java | 4 +-
.../java/domainapp/webapp}/SimpleAppManifest.java | 13 +-
.../domainapp/webapp/layout}/menubars.layout.xml | 0
.../webapp/src/main/resources/application.yml | 2 +-
.../{application => webapp}/lockdown/.gitignore | 0
.../lockdown/LockDownMavenDeps_Test.java | 12 +-
.../LockDownMavenDeps_Test.list.approved.txt | 61 ++++-----
.../LockDownMavenDeps_Test.tree.approved.txt | 105 +++++++--------
43 files changed, 432 insertions(+), 543 deletions(-)
rename core/security/bypass/src/main/java/org/apache/isis/security/{ => bypass}/IsisBootSecurityBypass.java (89%)
rename core/security/bypass/src/main/java/org/apache/isis/security/{authentication/bypass => bypass/authentication}/AuthenticatorBypass.java (96%)
rename core/security/bypass/src/main/java/org/apache/isis/security/{authorization/bypass => bypass/authorization}/AuthorizorBypass.java (96%)
copy {starters/simpleapp/application => extensions/lib/fakedata/integtests}/log4j2-test.xml (100%)
delete mode 100644 extensions/lib/fakedata/integtests/logging-integtest.properties
rename extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/{AppConfigurationForTesting.java => FakeDataModuleAppManifestForTesting.java} (69%)
rename extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/{FakeDataModuleBootstrapIntegTest.java => tests/Bootstrap_IntegTest.java} (59%)
rename extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/{FakeDataDemoObjects_IntegTest.java => Smoke_IntegTest.java} (93%)
rename starters/simpleapp/application/src/main/java/domainapp/application/{DomainAppApplicationModule.java => ApplicationModule.java} (95%)
rename starters/simpleapp/application/src/test/java/domainapp/conf/{SimpleAppConfigurationForTesting.java => SimpleAppManifestForTesting.java} (78%)
delete mode 100644 starters/simpleapp/application/src/test/resources/cucumber.properties~deprecated
rename starters/simpleapp/webapp/src/main/java/domainapp/{application => webapp}/SimpleApp.java (95%)
rename starters/simpleapp/{application/src/main/java/domainapp/conf => webapp/src/main/java/domainapp/webapp}/SimpleAppManifest.java (86%)
rename starters/simpleapp/{application/src/main/java/domainapp/conf => webapp/src/main/java/domainapp/webapp/layout}/menubars.layout.xml (100%)
rename starters/simpleapp/webapp/src/test/java/domain/{application => webapp}/lockdown/.gitignore (100%)
rename starters/simpleapp/webapp/src/test/java/domain/{application => webapp}/lockdown/LockDownMavenDeps_Test.java (82%)
rename starters/simpleapp/webapp/src/test/java/domain/{application => webapp}/lockdown/LockDownMavenDeps_Test.list.approved.txt (87%)
rename starters/simpleapp/webapp/src/test/java/domain/{application => webapp}/lockdown/LockDownMavenDeps_Test.tree.approved.txt (84%)
[isis] 01/05: ISIS-2186: makes simpleapp's configuration more
consistent.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e34b9efb079ad2bbf9a10106b3e39f4bd8c0fbf4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 27 12:25:43 2019 +0000
ISIS-2186: makes simpleapp's configuration more consistent.
---
.../application/fixture/scenarios/DomainAppDemo.java | 1 -
.../src/main/java/domainapp/conf/SimpleAppManifest.java | 7 +------
.../application/integtests/SpringIntegrationTest.java | 4 ++--
...ationForTesting.java => SimpleAppManifestForTesting.java} | 12 ++++--------
4 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java b/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
index 2a675a2..ecb0104 100644
--- a/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
@@ -35,7 +35,6 @@ public class DomainAppDemo extends FixtureScript {
@Override
protected void execute(final ExecutionContext ec) {
- // TODO: use Module support instead...
ec.executeChild(this, new TeardownFixtureAbstract2() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java b/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
index 3d32c85..34dd4c9 100644
--- a/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
+++ b/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
@@ -40,7 +40,7 @@ import domainapp.application.fixture.scenarios.DomainAppDemo;
@Configuration
@PropertySources({
@PropertySource(IsisPresets.H2InMemory),
- //@PropertySource(IsisPresets.NoTranslations),
+ @PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
@@ -55,11 +55,6 @@ import domainapp.application.fixture.scenarios.DomainAppDemo;
DomainAppDemo.class // register this fixture
})
-//@ComponentScan(
-// basePackageClasses= {
-// DomainAppApplicationModule.class,
-// SimpleModule.class
-// })
public class SimpleAppManifest {
diff --git a/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java b/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java
index c69e6b8..8aad1bf 100644
--- a/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java
+++ b/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java
@@ -25,10 +25,10 @@ import org.springframework.test.context.ContextConfiguration;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import domainapp.conf.SimpleAppConfigurationForTesting;
+import domainapp.conf.SimpleAppManifestForTesting;
@SpringBootTest(
- classes = SimpleAppConfigurationForTesting.class,
+ classes = SimpleAppManifestForTesting.class,
properties = {
"logging.config=log4j2-test.xml",
})
diff --git a/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java b/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
similarity index 89%
rename from starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java
rename to starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
index 7302a16..fc8a742 100644
--- a/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java
+++ b/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
@@ -44,15 +44,11 @@ import domainapp.modules.simple.SimpleModule;
})
@Import({
IsisBoot.class,
- IsisBootSecurityBypass.class,
IsisBootDataNucleus.class,
- IsisExtFixturesModule.class
+ IsisBootSecurityBypass.class,
+ IsisExtFixturesModule.class,
+ DomainAppApplicationModule.class
})
-@ComponentScan(
- basePackageClasses= {
- DomainAppApplicationModule.class,
- SimpleModule.class
- })
-public class SimpleAppConfigurationForTesting {
+public class SimpleAppManifestForTesting {
}
[isis] 03/05: ISIS-2186: removes plugin from isis-extensions that
is already inherited from isis-core
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 86e6509fe88b6879776265ccc682b0ea7302b075
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 27 13:02:09 2019 +0000
ISIS-2186: removes plugin from isis-extensions that is already inherited from isis-core
---
extensions/pom.xml | 51 ---------------------------------------------------
1 file changed, 51 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index c68d76d..338870b 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -56,57 +56,6 @@
</excludes>
</resource>
</resources>
-
- <plugins>
-
- <plugin>
- <!-- This is a duplicate of core's pom.xml entry -->
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>process-remote-resources</id>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
-
- <!-- Reference the supplemental-model artifact from module supplemental-model -->
- <supplementalModelArtifacts>
- <supplementalModelArtifact>org.apache.isis:supplemental-model:1.0</supplementalModelArtifact>
- </supplementalModelArtifacts>
-
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-
- <!-- Specify the path, relative to the JAR root, where the supplemental
- model file is located -->
- <supplementalModels>
- <supplementalModel>supplemental-models.xml</supplementalModel>
- </supplementalModels>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <projectTimespan>2010~2019</projectTimespan>
- <postDepListText>
- The above (auto-generated) list aggregates the
- dependencies
- (either directly
- or transitively) of all the modules
- that make up ${project.name}.
- You can use
- mvn dependency:list or
- mvn dependency:tree to view dependencies by
- submodule.
-
- ${license.additional-notes}
- </postDepListText>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
</build>
<dependencyManagement>
[isis] 04/05: ISIS-2186: moves menubars.layout.xml
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6208c5c31ded36d2c032e3fd943e4fb19e9effd3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 27 13:05:14 2019 +0000
ISIS-2186: moves menubars.layout.xml
---
.../java/domainapp/{conf => application}/SimpleAppManifest.java | 2 +-
.../java/domainapp/{conf => application/layout}/menubars.layout.xml | 0
.../src/main/java/domainapp/{application => webapp}/SimpleApp.java | 6 +++---
starters/simpleapp/webapp/src/main/resources/application.yml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java b/starters/simpleapp/application/src/main/java/domainapp/application/SimpleAppManifest.java
similarity index 98%
rename from starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
rename to starters/simpleapp/application/src/main/java/domainapp/application/SimpleAppManifest.java
index 34dd4c9..ee1e92d 100644
--- a/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
+++ b/starters/simpleapp/application/src/main/java/domainapp/application/SimpleAppManifest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.conf;
+package domainapp.application;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/starters/simpleapp/application/src/main/java/domainapp/conf/menubars.layout.xml b/starters/simpleapp/application/src/main/java/domainapp/application/layout/menubars.layout.xml
similarity index 100%
rename from starters/simpleapp/application/src/main/java/domainapp/conf/menubars.layout.xml
rename to starters/simpleapp/application/src/main/java/domainapp/application/layout/menubars.layout.xml
diff --git a/starters/simpleapp/webapp/src/main/java/domainapp/application/SimpleApp.java b/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApp.java
similarity index 95%
rename from starters/simpleapp/webapp/src/main/java/domainapp/application/SimpleApp.java
rename to starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index 412724e..8ffb02a 100644
--- a/starters/simpleapp/webapp/src/main/java/domainapp/application/SimpleApp.java
+++ b/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application;
+package domainapp.webapp;
+
+import domainapp.application.SimpleAppManifest;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -25,8 +27,6 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.config.IsisPresets;
-import domainapp.conf.SimpleAppManifest;
-
/**
* Bootstrap the application.
*/
diff --git a/starters/simpleapp/webapp/src/main/resources/application.yml b/starters/simpleapp/webapp/src/main/resources/application.yml
index 246021b..f8b3761 100644
--- a/starters/simpleapp/webapp/src/main/resources/application.yml
+++ b/starters/simpleapp/webapp/src/main/resources/application.yml
@@ -90,7 +90,7 @@ isis:
viewer:
wicket:
application:
- menubarsLayoutXml: domainapp/conf/menubars.layout.xml
+ menubarsLayoutXml: domainapp/application/layout/menubars.layout.xml
brandLogoHeader: /images/apache-isis/logo-48x48.png")
faviconUrl: /images/favicon.png")
name: Simple App
[isis] 02/05: ISIS-2186: removes flatten-maven-plugin
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fb74e9e75ac727b4c01c5b9a3420d19c716fcfb5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 27 13:01:26 2019 +0000
ISIS-2186: removes flatten-maven-plugin
---
extensions/pom.xml | 29 -----------------------------
mavendeps/pom.xml | 31 -------------------------------
2 files changed, 60 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index e79529b..c68d76d 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -60,35 +60,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <version>1.0.0</version>
- <configuration>
- <updatePomFile>true</updatePomFile>
- <pomElements>
- <dependencyManagement>resolve</dependencyManagement>
- <dependencies>resolve</dependencies>
- </pomElements>
- </configuration>
- <executions>
- <execution>
- <id>flatten</id>
- <phase>process-resources</phase>
- <goals>
- <goal>flatten</goal>
- </goals>
- </execution>
- <execution>
- <id>flatten.clean</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<!-- This is a duplicate of core's pom.xml entry -->
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
diff --git a/mavendeps/pom.xml b/mavendeps/pom.xml
index 180c0e5..e3df417 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -65,37 +65,6 @@
</resource>
</resources>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <version>1.0.0</version>
- <configuration>
- <updatePomFile>true</updatePomFile>
- <pomElements>
- <dependencyManagement>resolve</dependencyManagement>
- <dependencies>resolve</dependencies>
- </pomElements>
- </configuration>
- <executions>
- <execution>
- <id>flatten</id>
- <phase>process-resources</phase>
- <goals>
- <goal>flatten</goal>
- </goals>
- </execution>
- <execution>
- <id>flatten.clean</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<dependencyManagement>
[isis] 05/05: ISIS-2186: fake data integ tests,
simplifying simpleapp integ tests also
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5df9762b7b50026e2774712a63494385da6e1d9a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 27 20:01:18 2019 +0000
ISIS-2186: fake data integ tests, simplifying simpleapp integ tests also
---
core-parent/pom.xml | 2 +-
.../{ => bypass}/IsisBootSecurityBypass.java | 8 +-
.../authentication}/AuthenticatorBypass.java | 2 +-
.../authorization}/AuthorizorBypass.java | 2 +-
core/testsupport/integtestsupport/pom.xml | 141 +++++++++++++++++----
core/testsupport/unittestsupport/pom.xml | 125 +++++++++---------
.../testdomain/conf/Configuration_headless.java | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 2 +-
.../testdomain/bootstrapping/builtin-IsisBoot.list | 4 +-
.../bootstrapping/builtin-singleton.list | 4 +-
examples/vanilla/pom.xml | 2 +-
.../fakedata/fixture/FakeDataFixturesModule.java | 7 +
.../dom/FakeDataDemoObjectWithAllMenu.java | 5 +-
.../isisaddons/module/fakedata/FakeDataModule.java | 2 +
extensions/lib/fakedata/integtests/log4j2-test.xml | 60 +++++++++
.../integtests/logging-integtest.properties | 93 --------------
extensions/lib/fakedata/integtests/pom.xml | 6 +
...va => FakeDataModuleAppManifestForTesting.java} | 26 ++--
.../FakeDataModuleIntegTestAbstract.java | 26 ++--
.../integtests/FakeDataModuleIntegTestModule.java | 8 +-
.../Bootstrap_IntegTest.java} | 19 +--
...Objects_IntegTest.java => Smoke_IntegTest.java} | 70 +++++-----
extensions/pom.xml | 2 -
.../LockDownMavenDeps_Test.list.approved.txt | 21 +--
.../LockDownMavenDeps_Test.tree.approved.txt | 39 +++---
starters/pom.xml | 4 +-
starters/simpleapp/application/pom.xml | 6 +
...plicationModule.java => ApplicationModule.java} | 2 +-
.../conf/SimpleAppManifestForTesting.java | 8 +-
.../test/resources/cucumber.properties~deprecated | 1 -
.../integtests/SimpleModuleManifestForTesting.java | 9 +-
starters/simpleapp/webapp/pom.xml | 4 +-
.../src/main/java/domainapp/webapp/SimpleApp.java | 2 -
.../java/domainapp/webapp}/SimpleAppManifest.java | 6 +-
.../domainapp/webapp}/layout/menubars.layout.xml | 0
.../webapp/src/main/resources/application.yml | 2 +-
.../{application => webapp}/lockdown/.gitignore | 0
.../lockdown/LockDownMavenDeps_Test.java | 12 +-
.../LockDownMavenDeps_Test.list.approved.txt | 61 ++++-----
.../LockDownMavenDeps_Test.tree.approved.txt | 105 +++++++--------
40 files changed, 485 insertions(+), 415 deletions(-)
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index c2ecf3c..df8696d 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -47,7 +47,7 @@ under the License.
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.0.RELEASE</version>
+ <version>2.2.1.RELEASE</version>
<relativePath/>
</parent>
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisBootSecurityBypass.java
similarity index 89%
rename from core/security/bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
rename to core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisBootSecurityBypass.java
index efdb897..9cc4b3d 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisBootSecurityBypass.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security;
+package org.apache.isis.security.bypass;
import javax.inject.Singleton;
@@ -25,10 +25,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.runtime.services.auth.AuthorizationManagerStandard;
-import org.apache.isis.security.authentication.bypass.AuthenticatorBypass;
+import org.apache.isis.security.bypass.authentication.AuthenticatorBypass;
import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authorization.bypass.AuthorizorBypass;
+import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
import org.apache.isis.security.authorization.standard.Authorizor;
/**
@@ -49,7 +49,7 @@ public class IsisBootSecurityBypass {
}
@Bean @Singleton
- public Authorizor autorizor() {
+ public Authorizor authorizor() {
return new AuthorizorBypass();
}
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
similarity index 96%
rename from core/security/bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
rename to core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index 29c5112..d55179a 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication.bypass;
+package org.apache.isis.security.bypass.authentication;
import org.apache.isis.security.authentication.AuthenticationRequest;
import org.apache.isis.security.authentication.standard.AuthenticatorAbstract;
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
similarity index 96%
rename from core/security/bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
rename to core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
index 5efbe27..461df18 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authorization.bypass;
+package org.apache.isis.security.bypass.authorization;
import org.apache.isis.applib.Identifier;
import org.apache.isis.security.authorization.standard.Authorizor;
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index bf2c572..e596b2a 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -29,57 +29,114 @@
<git-plugin.propertiesDir>org/apache/isis/integtestsupport</git-plugin.propertiesDir>
</properties>
+ <description>
+ Support for writing integ tests in JUnit 5; should be added as a dependency with scope=test only
+ </description>
+
<dependencies>
- <!-- JDO API (non transient, provided by plugin) -->
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
</dependency>
- <!-- JUPITER -->
<dependency>
- <!-- JUnit API for writing tests and extensions -->
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
</dependency>
+
<dependency>
- <!-- implementation of the JUnit Jupiter test engine -->
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- framework default codegen for tests -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-codegen-bytebuddy</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- JDO API (non transient, provided by plugin) -->
<dependency>
- <!-- support for unit tests that use JUnit 4 or JUnit 3 -->
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <!-- convergence issues from spring-boot-starter-log4j2 -->
+ <version>${slf4j-api.version}</version>
</dependency>
+
+ <!-- SPRING -->
<dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- when spring-boot release lags behind spring-core release explicitly
+ spring-test added below -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- when spring-boot release lags behind spring-core release explicitly
+ spring-test added below -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- we use log4j-2 instead -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-security</artifactId>
</dependency>
@@ -103,8 +160,38 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-runtime-extensions</artifactId>
</dependency>
-
-
</dependencies>
+ <profiles>
+
+ <profile>
+ <id>jdk11-supplemental</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <!--
+ These dependencies are required in order to build on jdk11
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
index 44ee869..7d1bc5d 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/testsupport/unittestsupport/pom.xml
@@ -30,61 +30,14 @@
</properties>
<description>
- Support for writing unit tests; should be added as a dependency with scope=test only
+ Support for writing unit tests in either JUnit 4 or JUnit 5; should be added as a dependency with scope=test only
</description>
<dependencies>
- <!-- core plugin loading -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <!-- convergence issues from spring-boot-starter-log4j2 -->
- <version>${slf4j-api.version}</version>
- </dependency>
-
- <!-- framework default core-codegen-plugin for tests -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-codegen-bytebuddy</artifactId>
- </dependency>
-
- <!-- SPRING -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <!-- when spring-boot release lags behind spring-core release explicitly
- spring-test added below -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </exclusion>
- <exclusion>
- <!-- when spring-boot release lags behind spring-core release explicitly
- spring-test added below -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <!-- we use log4j-2 instead -->
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <artifactId>isis-commons</artifactId>
</dependency>
<dependency>
@@ -101,6 +54,11 @@
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</dependency>
@@ -120,12 +78,73 @@
</exclusions>
</dependency>
+ <!-- framework default codegen for tests -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-codegen-bytebuddy</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>compile</scope>
</dependency>
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <!-- convergence issues from spring-boot-starter-log4j2 -->
+ <version>${slf4j-api.version}</version>
+ </dependency>
+
+
+ <!-- SPRING -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- when spring-boot release lags behind spring-core release explicitly
+ spring-test added below -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- when spring-boot release lags behind spring-core release explicitly
+ spring-test added below -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- we use log4j-2 instead -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
@@ -161,14 +180,6 @@
</exclusions>
</dependency>
- <!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index 0d9b080..f4580c6 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -39,7 +39,7 @@ import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.extensions.incubator.IsisBootIncubator;
import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.IsisBootSecurityBypass;
+import org.apache.isis.security.bypass.IsisBootSecurityBypass;
@Configuration
@Import({
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index 8e91611..fead143 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -28,7 +28,7 @@ import org.apache.isis.config.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.IsisBootSecurityBypass;
+import org.apache.isis.security.bypass.IsisBootSecurityBypass;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
@Configuration
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
index d7e85cb..d798be6 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
@@ -82,9 +82,9 @@ org.apache.isis.runtime.system.session.IsisSessionFactoryDefault
org.apache.isis.runtime.system.transaction.AuditingServiceInternal
org.apache.isis.runtime.system.transaction.ChangedObjectsServiceInternal
org.apache.isis.runtime.system.transaction.PersistenceSessionServiceInternalDefault
-org.apache.isis.security.authentication.bypass.AuthenticatorBypass
+org.apache.isis.security.bypass.authentication.AuthenticatorBypass
org.apache.isis.security.authentication.manager.AuthorizationManagerStandard
org.apache.isis.security.authentication.standard.AuthenticationManagerStandard
-org.apache.isis.security.authorization.bypass.AuthorizorBypass
+org.apache.isis.security.bypass.authorization.AuthorizorBypass
org.apache.isis.testdomain.jdo.InventoryResource
org.apache.isis.wrapper.WrapperFactoryDefault
\ No newline at end of file
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
index 499e537..2d6ed00 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
@@ -82,9 +82,9 @@ org.apache.isis.runtime.system.session.IsisSessionFactoryDefault
org.apache.isis.runtime.system.transaction.AuditingServiceInternal
org.apache.isis.runtime.system.transaction.ChangedObjectsServiceInternal
org.apache.isis.runtime.system.transaction.PersistenceSessionServiceInternalDefault
-#org.apache.isis.security.authentication.bypass.AuthenticatorBypass
+#org.apache.isis.security.bypass.authentication.AuthenticatorBypass
org.apache.isis.security.authentication.manager.AuthorizationManagerStandard
org.apache.isis.security.authentication.standard.AuthenticationManagerStandard
-#org.apache.isis.security.authorization.bypass.AuthorizorBypass
+#org.apache.isis.security.bypass.authorization.AuthorizorBypass
org.apache.isis.testdomain.jdo.InventoryResource
org.apache.isis.wrapper.WrapperFactoryDefault
\ No newline at end of file
diff --git a/examples/vanilla/pom.xml b/examples/vanilla/pom.xml
index 7b83d39..302c70e 100644
--- a/examples/vanilla/pom.xml
+++ b/examples/vanilla/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.0.RELEASE</version>
+ <version>2.2.1.RELEASE</version>
</parent>
</project>
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java
index aaec713..71eeb5f 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java
@@ -2,10 +2,17 @@ package org.isisaddons.module.fakedata.fixture;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.modules.Module;
+import org.isisaddons.module.fakedata.FakeDataModule;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
@Configuration
+@Import({
+ FakeDataModule.class
+})
+@ComponentScan
public class FakeDataFixturesModule implements Module {
@Override public FixtureScript getTeardownFixture() {
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
index 32f9de1..2df0391 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
@@ -20,9 +20,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
nature = NatureOfService.VIEW,
objectType = "libFakeDataFixture.FakeDataDemoObjectWithAllMenu"
)
-@DomainServiceLayout(
- named = "Demo"
-)
+@DomainServiceLayout(named = "Demo")
public class FakeDataDemoObjectWithAllMenu {
@@ -58,7 +56,6 @@ public class FakeDataDemoObjectWithAllMenu {
return obj;
}
-
@Inject RepositoryService repositoryService;
}
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/FakeDataModule.java b/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/FakeDataModule.java
index 11cff57..417f08f 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/FakeDataModule.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/FakeDataModule.java
@@ -1,9 +1,11 @@
package org.isisaddons.module.fakedata;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@Configuration
+@ComponentScan
public class FakeDataModule {
public abstract static class ActionDomainEvent<S> extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> {}
diff --git a/extensions/lib/fakedata/integtests/log4j2-test.xml b/extensions/lib/fakedata/integtests/log4j2-test.xml
new file mode 100644
index 0000000..56e8ad6
--- /dev/null
+++ b/extensions/lib/fakedata/integtests/log4j2-test.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+ <Properties>
+ <Property name="PID">????</Property>
+ <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
+ <Property name="LOG_LEVEL_PATTERN">%5p</Property>
+ <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
+ <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+ <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+ </Properties>
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT" follow="true">
+ <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
+ <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
+ <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
+ <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
+ <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
+ <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
+ <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
+ <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
+
+ <logger name="org.apache.directory" level="warn"/>
+ <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
+
+ <logger name="DataNucleus.Persistence" level="info"/>
+ <logger name="DataNucleus.Transaction" level="info"/>
+ <logger name="DataNucleus.Datastore.Schema" level="info"/>
+ <logger name="DataNucleus.Datastore.Native" level="info"/>
+
+ <Root level="info">
+ <AppenderRef ref="Console" />
+ </Root>
+ </Loggers>
+</Configuration>
+
+<!-- # DataNucleus Logging Categories -->
+<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
+<!-- DataNucleus.Transaction - All messages relating to transactions -->
+<!-- DataNucleus.Connection - All messages relating to Connections. -->
+<!-- DataNucleus.Query - All messages relating to queries -->
+<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
+<!-- DataNucleus.MetaData - All messages relating to MetaData -->
+<!-- DataNucleus.Datastore - All general datastore messages -->
+<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
+<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
+<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
+<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
+<!-- DataNucleus.General - All general operational messages -->
+<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
+<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
+<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
+<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
+<!-- DataNucleus.JDO - All messages general to JDO -->
+<!-- DataNucleus.JPA - All messages general to JPA -->
+<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
+<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/lib/fakedata/integtests/logging-integtest.properties b/extensions/lib/fakedata/integtests/logging-integtest.properties
deleted file mode 100644
index 99c3365..0000000
--- a/extensions/lib/fakedata/integtests/logging-integtest.properties
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Isis uses log4j is used to provide system logging
-#
-log4j.rootCategory=INFO, Console
-
-# The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.translations-po=org.apache.log4j.FileAppender
-log4j.appender.translations-po.File=./translations.pot
-log4j.appender.translations-po.Append=false
-log4j.appender.translations-po.layout=org.apache.log4j.PatternLayout
-log4j.appender.translations-po.layout.ConversionPattern=%m%n
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-#log4j.debug=true
-
-
-# DataNucleus
-# the first two log the DML and DDL (if set to DEBUG)
-log4j.logger.DataNucleus.Datastore.Native=WARN, Console
-log4j.logger.DataNucleus.Datastore.Schema=DEBUG, Console
-# the remainder can probably be left to WARN
-log4j.logger.DataNucleus.Persistence=WARN, Console
-log4j.logger.DataNucleus.Transaction=WARN, Console
-log4j.logger.DataNucleus.Connection=WARN, Console
-log4j.logger.DataNucleus.Query=WARN, Console
-log4j.logger.DataNucleus.Cache=WARN, Console
-log4j.logger.DataNucleus.MetaData=WARN, Console
-log4j.logger.DataNucleus.Datastore=WARN, Console
-log4j.logger.DataNucleus.Datastore.Persist=WARN, Console
-log4j.logger.DataNucleus.Datastore.Retrieve=WARN, Console
-log4j.logger.DataNucleus.General=WARN, Console
-log4j.logger.DataNucleus.Lifecycle=WARN, Console
-log4j.logger.DataNucleus.ValueGeneration=WARN, Console
-log4j.logger.DataNucleus.Enhancer=WARN, Console
-log4j.logger.DataNucleus.SchemaTool=ERROR, Console
-log4j.logger.DataNucleus.JDO=WARN, Console
-log4j.logger.DataNucleus.JPA=ERROR, Console
-log4j.logger.DataNucleus.JCA=WARN, Console
-log4j.logger.DataNucleus.IDE=ERROR, Console
-
-log4j.additivity.DataNucleus.Datastore.Native=false
-log4j.additivity.DataNucleus.Datastore.Schema=false
-log4j.additivity.DataNucleus.Datastore.Persistence=false
-log4j.additivity.DataNucleus.Datastore.Transaction=false
-log4j.additivity.DataNucleus.Datastore.Connection=false
-log4j.additivity.DataNucleus.Datastore.Query=false
-log4j.additivity.DataNucleus.Datastore.Cache=false
-log4j.additivity.DataNucleus.Datastore.MetaData=false
-log4j.additivity.DataNucleus.Datastore.Datastore=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Persist=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Retrieve=false
-log4j.additivity.DataNucleus.Datastore.General=false
-log4j.additivity.DataNucleus.Datastore.Lifecycle=false
-log4j.additivity.DataNucleus.Datastore.ValueGeneration=false
-log4j.additivity.DataNucleus.Datastore.Enhancer=false
-log4j.additivity.DataNucleus.Datastore.SchemaTool=false
-log4j.additivity.DataNucleus.Datastore.JDO=false
-log4j.additivity.DataNucleus.Datastore.JPA=false
-log4j.additivity.DataNucleus.Datastore.JCA=false
-log4j.additivity.DataNucleus.Datastore.IDE=false
-
-
-
-
-# if using log4jdbc-remix as JDBC driver
-#log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-#log4j.additivity.jdbc.sqlonly=false
-#log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-#log4j.additivity.jdbc.resultsettable=false
-
-#log4j.logger.jdbc.audit=WARN,jdbc, Console
-#log4j.additivity.jdbc.audit=false
-#log4j.logger.jdbc.resultset=WARN,jdbc
-#log4j.additivity.jdbc.resultset=false
-#log4j.logger.jdbc.sqltiming=WARN,sqltiming
-#log4j.additivity.jdbc.sqltiming=false
-#log4j.logger.jdbc.connection=FATAL,connection
-#log4j.additivity.jdbc.connection=false
-
-
-log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po
-log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PoWriter=false
diff --git a/extensions/lib/fakedata/integtests/pom.xml b/extensions/lib/fakedata/integtests/pom.xml
index 0b19f08..4bf5f1d 100644
--- a/extensions/lib/fakedata/integtests/pom.xml
+++ b/extensions/lib/fakedata/integtests/pom.xml
@@ -61,6 +61,12 @@
<artifactId>isis-mavendeps-testing</artifactId>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-unittestsupport</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/AppConfigurationForTesting.java b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleAppManifestForTesting.java
similarity index 69%
rename from extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/AppConfigurationForTesting.java
rename to extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleAppManifestForTesting.java
index 41eb50d..02a1584 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/AppConfigurationForTesting.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleAppManifestForTesting.java
@@ -20,10 +20,10 @@ package org.isisaddons.module.fakedata.integtests;
import org.apache.isis.config.IsisPresets;
-import org.apache.isis.extensions.fixtures.ExtFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.IsisBootSecurityBypass;
+import org.apache.isis.security.bypass.IsisBootSecurityBypass;
import org.springframework.context.annotation.*;
/**
@@ -31,20 +31,18 @@ import org.springframework.context.annotation.*;
*/
@Configuration
@PropertySources({
- @PropertySource(IsisPresets.H2InMemory),
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.DataNucleusAutoCreate),
+ @PropertySource(IsisPresets.H2InMemory),
+ @PropertySource(IsisPresets.NoTranslations),
+ @PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityBypass.class,
- IsisBootDataNucleus.class,
- ExtFixturesModule.class
+ IsisBoot.class,
+ IsisBootSecurityBypass.class,
+ IsisBootDataNucleus.class,
+ IsisExtFixturesModule.class,
+
+ FakeDataModuleIntegTestModule.class
})
-@ComponentScan(
- basePackageClasses= {
- FakeDataModuleIntegTestModule.class
- })
-public class AppConfigurationForTesting {
+public class FakeDataModuleAppManifestForTesting {
}
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 605832d..aa16bae 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -1,22 +1,28 @@
package org.isisaddons.module.fakedata.integtests;
+import javax.inject.Inject;
+
+import org.apache.isis.applib.services.factory.FactoryService;
+import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
+import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
+import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.transaction.annotation.Transactional;
@SpringBootTest(
- classes = SimpleModuleManifestForTesting.class,
+ classes = FakeDataModuleAppManifestForTesting.class,
properties = {
- "isis.objects.editing=false"
+ "logging.config=log4j2-test.xml",
})
+@ContextConfiguration
+@Transactional
public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
- public static ModuleAbstract module() {
- return new FakeDataModuleIntegTestModule();
- }
-
- protected FakeDataModuleIntegTestAbstract() {
- super(module());
- }
-
}
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestModule.java b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestModule.java
index edc69df..aa5b22c 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestModule.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestModule.java
@@ -1,17 +1,13 @@
package org.isisaddons.module.fakedata.integtests;
-import java.util.Set;
-
-import org.isisaddons.module.fakedata.FakeDataModule;
import org.isisaddons.module.fakedata.fixture.FakeDataFixturesModule;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import com.google.common.collect.Sets;
-
@Configuration
@Import({
- FakeDataModule.class,
FakeDataFixturesModule.class
})
+@ComponentScan
public class FakeDataModuleIntegTestModule {}
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleBootstrapIntegTest.java b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Bootstrap_IntegTest.java
similarity index 59%
rename from extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleBootstrapIntegTest.java
rename to extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Bootstrap_IntegTest.java
index 651ff53..798ab68 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleBootstrapIntegTest.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Bootstrap_IntegTest.java
@@ -16,21 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.isisaddons.module.fakedata.integtests;
+package org.isisaddons.module.fakedata.integtests.tests;
-import javax.inject.Inject;
+import org.isisaddons.module.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.applib.services.jaxb.JaxbService;
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextConfiguration;
-
-@SpringBootTest(
- classes = AppConfigurationForTesting.class,
- properties = {
- })
-@ContextConfiguration
-public class FakeDataModuleBootstrapIntegTest extends FakeDataModuleIntegTestAbstract {
+@Transactional
+public class Bootstrap_IntegTest extends FakeDataModuleIntegTestAbstract {
@Test
public void bootstraps_ok() throws Exception {
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/FakeDataDemoObjects_IntegTest.java b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Smoke_IntegTest.java
similarity index 93%
rename from extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/FakeDataDemoObjects_IntegTest.java
rename to extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Smoke_IntegTest.java
index 9ea5d44..13768fd 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/FakeDataDemoObjects_IntegTest.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -9,13 +9,11 @@ import java.util.UUID;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.assertj.core.api.Assertions;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Money;
@@ -28,8 +26,11 @@ import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_create3;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_update_withFakeData;
import org.isisaddons.module.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
-public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstract {
+public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
@Inject
FixtureScripts fixtureScripts;
@@ -40,8 +41,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
@Inject
FakeDataService fakeDataService;
-
- public static class FakeDataDemoObjectsScenarioTest extends FakeDataDemoObjects_IntegTest {
+ public static class FakeDataDemoObjectsScenarioTest extends Smoke_IntegTest {
@Test
public void happyCase() throws Exception {
@@ -57,7 +57,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(scenario, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -101,12 +101,12 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
}
- public static class FakeDataDemoObjectUpdateTest extends FakeDataDemoObjects_IntegTest {
+ public static class FakeDataDemoObjectUpdateTest extends Smoke_IntegTest {
FakeDataDemoObjectWithAll fakeDataDemoObject;
FakeDataDemoObjectWithAll_update_withFakeData updateScript;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
//
@@ -119,7 +119,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(fs, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
final List<FakeDataDemoObjectWithAll> all = wrap(fakeDataDemoObjects).listAllDemoObjectsWithAll();
fakeDataDemoObject = all.get(0);
@@ -137,7 +137,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setFakeDataDemoObject(fakeDataDemoObject);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -191,7 +191,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeBoolean(true);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -209,7 +209,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeBoolean(false);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -240,7 +240,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeChar(theChar);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -270,7 +270,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeByte(theByte);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -301,7 +301,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeShort(theShort);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -333,7 +333,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeInt(theInt);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -364,7 +364,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeLong(theLong);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -394,7 +394,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeFloat(theFloat);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -426,7 +426,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeDouble(theDouble);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -457,7 +457,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeString(theString);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -487,7 +487,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomePassword(thePassword);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -518,7 +518,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeBigDecimal(theBigDecimal);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -548,7 +548,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
updateScript.setSomeBigInteger(theBigInteger);
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -578,7 +578,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -609,7 +609,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -639,7 +639,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -670,7 +670,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -701,7 +701,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -732,7 +732,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -762,7 +762,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -793,7 +793,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -824,7 +824,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -858,7 +858,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
@@ -891,7 +891,7 @@ public class FakeDataDemoObjects_IntegTest extends FakeDataModuleIntegTestAbstra
fixtureScripts.runFixtureScript(updateScript, null);
- transactionService.nextTransaction();
+ transactionService.flushTransaction();
//
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 338870b..b093f4b 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -201,9 +201,7 @@
<module>lib/excel/impl</module>
<module>lib/fakedata/impl</module>
<module>lib/fakedata/fixture</module>
-<!--
<module>lib/fakedata/integtests</module>
--->
<module>lib/unittestsupport/impl</module>
</modules>
diff --git a/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt b/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt
index 088978e..3e25f09 100644
--- a/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt
+++ b/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt
@@ -90,6 +90,7 @@
org.apache.isis.core:isis-viewer-wicket-impl:jar:2.0.0-M3-SNAPSHOT:compile
org.apache.isis.core:isis-viewer-wicket-model:jar:2.0.0-M3-SNAPSHOT:compile
org.apache.isis.core:isis-viewer-wicket-ui:jar:2.0.0-M3-SNAPSHOT:compile
+ org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:2.0.0-M3-SNAPSHOT:compile
org.apache.isis.mavendeps:isis-mavendeps-testing:pom:2.0.0-M3-SNAPSHOT:test
org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:2.0.0-M3-SNAPSHOT:compile
org.apache.logging.log4j:log4j-api:jar:2.12.1:compile
@@ -184,16 +185,16 @@
org.springframework.boot:spring-boot-test-autoconfigure:jar:2.2.0.RELEASE:test
org.springframework.boot:spring-boot-test:jar:2.2.0.RELEASE:test
org.springframework.boot:spring-boot:jar:2.2.0.RELEASE:compile
- org.springframework:spring-aop:jar:5.2.0.RELEASE:compile
- org.springframework:spring-beans:jar:5.2.0.RELEASE:compile
- org.springframework:spring-context:jar:5.2.0.RELEASE:compile
- org.springframework:spring-core:jar:5.2.0.RELEASE:compile
- org.springframework:spring-expression:jar:5.2.0.RELEASE:compile
- org.springframework:spring-jcl:jar:5.2.0.RELEASE:compile
- org.springframework:spring-test:jar:5.2.0.RELEASE:test
- org.springframework:spring-tx:jar:5.2.0.RELEASE:compile
- org.springframework:spring-web:jar:5.2.0.RELEASE:compile
- org.springframework:spring-webmvc:jar:5.2.0.RELEASE:compile
+ org.springframework:spring-aop:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-beans:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-context:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-core:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-expression:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-jcl:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-test:jar:5.2.1.RELEASE:test
+ org.springframework:spring-tx:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-web:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-webmvc:jar:5.2.1.RELEASE:compile
org.webjars.bower:momentjs:jar:2.24.0:compile
org.webjars.bower:summernote:jar:0.8.11:compile
org.webjars:Eonasdan-bootstrap-datetimepicker:jar:4.17.37-1:compile
diff --git a/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt b/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt
index 571945c..f6fac71 100644
--- a/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt
+++ b/starters/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt
@@ -16,8 +16,8 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
| | | \- org.hibernate.validator:hibernate-validator:jar:6.0.17.Final:compile
| | | +- org.jboss.logging:jboss-logging:jar:3.4.1.Final:compile
| | | \- com.fasterxml:classmate:jar:1.5.0:compile
-| | +- org.springframework:spring-web:jar:5.2.0.RELEASE:compile
-| | \- org.springframework:spring-webmvc:jar:5.2.0.RELEASE:compile
+| | +- org.springframework:spring-web:jar:5.2.1.RELEASE:compile
+| | \- org.springframework:spring-webmvc:jar:5.2.1.RELEASE:compile
| +- org.apache.isis.core:isis-applib:jar:2.0.0-M3-SNAPSHOT:compile
| | \- org.apache.isis.core:isis-commons:jar:2.0.0-M3-SNAPSHOT:compile
| | +- javax:javaee-api:jar:8.0:compile
@@ -25,7 +25,7 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
| | | \- javax.activation:activation:jar:1.1:compile
| | +- com.google.code.findbugs:annotations:jar:2.0.1:compile
| | +- org.projectlombok:lombok:jar:1.18.10:compile
-| | +- org.springframework:spring-tx:jar:5.2.0.RELEASE:compile
+| | +- org.springframework:spring-tx:jar:5.2.1.RELEASE:compile
| | \- org.springframework.boot:spring-boot-starter-log4j2:jar:2.2.0.RELEASE:compile
| | +- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.12.1:compile
| | | \- org.apache.logging.log4j:log4j-api:jar:2.12.1:compile
@@ -153,9 +153,19 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
| +- com.google.errorprone:error_prone_annotations:jar:2.3.2:compile
| +- com.google.j2objc:j2objc-annotations:jar:1.3:compile
| \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.18:compile
++- org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:2.0.0-M3-SNAPSHOT:compile
+- com.h2database:h2:jar:1.4.199:compile
+- org.apache.isis.mavendeps:isis-mavendeps-testing:pom:2.0.0-M3-SNAPSHOT:test
| +- org.apache.isis.core:isis-unittestsupport:jar:2.0.0-M3-SNAPSHOT:test
+| | +- org.junit.jupiter:junit-jupiter-api:jar:5.5.2:test
+| | | +- org.apiguardian:apiguardian-api:jar:1.1.0:test
+| | | +- org.opentest4j:opentest4j:jar:1.2.0:test
+| | | \- org.junit.platform:junit-platform-commons:jar:1.5.2:test
+| | +- org.junit.jupiter:junit-jupiter-engine:jar:5.5.2:test
+| | | \- org.junit.platform:junit-platform-engine:jar:1.5.2:test
+| | +- org.junit.vintage:junit-vintage-engine:jar:5.5.2:test
+| | | \- junit:junit:jar:4.12:test
+| | +- org.mockito:mockito-core:jar:3.1.0:test
| | +- org.slf4j:slf4j-api:jar:1.7.28:compile
| | +- org.springframework.boot:spring-boot-starter-test:jar:2.2.0.RELEASE:test
| | | +- org.springframework.boot:spring-boot-test:jar:2.2.0.RELEASE:test
@@ -170,16 +180,7 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
| | | +- org.skyscreamer:jsonassert:jar:1.5.0:test
| | | | \- com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:test
| | | \- org.xmlunit:xmlunit-core:jar:2.6.3:test
-| | +- org.springframework:spring-test:jar:5.2.0.RELEASE:test
-| | +- org.junit.jupiter:junit-jupiter-api:jar:5.5.2:test
-| | | +- org.apiguardian:apiguardian-api:jar:1.1.0:test
-| | | +- org.opentest4j:opentest4j:jar:1.2.0:test
-| | | \- org.junit.platform:junit-platform-commons:jar:1.5.2:test
-| | +- org.junit.jupiter:junit-jupiter-engine:jar:5.5.2:test
-| | | \- org.junit.platform:junit-platform-engine:jar:1.5.2:test
-| | +- org.junit.vintage:junit-vintage-engine:jar:5.5.2:test
-| | | \- junit:junit:jar:4.12:test
-| | +- org.mockito:mockito-core:jar:3.1.0:test
+| | +- org.springframework:spring-test:jar:5.2.1.RELEASE:test
| | +- org.jmock:jmock:jar:2.11.0:test
| | | +- org.jmock:jmock-testjar:jar:2.11.0:test
| | | \- org.apache-extras.beanshell:bsh:jar:2.0b6:test
@@ -200,10 +201,10 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
| \- org.springframework.boot:spring-boot:jar:2.2.0.RELEASE:compile
+- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.0.RELEASE:compile
+- com.fasterxml.jackson.core:jackson-databind:jar:2.10.0:compile
- +- org.springframework:spring-core:jar:5.2.0.RELEASE:compile
- | \- org.springframework:spring-jcl:jar:5.2.0.RELEASE:compile
- +- org.springframework:spring-context:jar:5.2.0.RELEASE:compile
- | +- org.springframework:spring-aop:jar:5.2.0.RELEASE:compile
- | +- org.springframework:spring-beans:jar:5.2.0.RELEASE:compile
- | \- org.springframework:spring-expression:jar:5.2.0.RELEASE:compile
+ +- org.springframework:spring-core:jar:5.2.1.RELEASE:compile
+ | \- org.springframework:spring-jcl:jar:5.2.1.RELEASE:compile
+ +- org.springframework:spring-context:jar:5.2.1.RELEASE:compile
+ | +- org.springframework:spring-aop:jar:5.2.1.RELEASE:compile
+ | +- org.springframework:spring-beans:jar:5.2.1.RELEASE:compile
+ | \- org.springframework:spring-expression:jar:5.2.1.RELEASE:compile
\- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
diff --git a/starters/pom.xml b/starters/pom.xml
index 70184e3..5544fa4 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -31,7 +31,7 @@ under the License.
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.0.RELEASE</version>
+ <version>2.2.1.RELEASE</version>
<relativePath/>
</parent>
@@ -43,7 +43,7 @@ under the License.
<url>https://isis.apache.org</url>
<properties>
- <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
+ <spring-boot.version>2.2.1.RELEASE</spring-boot.version>
<approvaltests.version>4.0.2</approvaltests.version>
</properties>
diff --git a/starters/simpleapp/application/pom.xml b/starters/simpleapp/application/pom.xml
index 573d856..5795d00 100644
--- a/starters/simpleapp/application/pom.xml
+++ b/starters/simpleapp/application/pom.xml
@@ -99,6 +99,12 @@
<artifactId>isis-mavendeps-testing</artifactId>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/starters/simpleapp/application/src/main/java/domainapp/application/DomainAppApplicationModule.java b/starters/simpleapp/application/src/main/java/domainapp/application/ApplicationModule.java
similarity index 95%
rename from starters/simpleapp/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
rename to starters/simpleapp/application/src/main/java/domainapp/application/ApplicationModule.java
index 25070e8..4f6d1e5 100644
--- a/starters/simpleapp/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
+++ b/starters/simpleapp/application/src/main/java/domainapp/application/ApplicationModule.java
@@ -29,6 +29,6 @@ import domainapp.modules.simple.SimpleModule;
@Configuration
@Import(SimpleModule.class)
@ComponentScan
-public class DomainAppApplicationModule implements Module {
+public class ApplicationModule implements Module {
}
diff --git a/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java b/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
index fc8a742..ee57a1a 100644
--- a/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
+++ b/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
@@ -19,7 +19,6 @@
package domainapp.conf;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
@@ -28,10 +27,9 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.IsisBootSecurityBypass;
+import org.apache.isis.security.bypass.IsisBootSecurityBypass;
-import domainapp.application.DomainAppApplicationModule;
-import domainapp.modules.simple.SimpleModule;
+import domainapp.application.ApplicationModule;
/**
* Makes the integral parts of the 'simple app' web application.
@@ -47,7 +45,7 @@ import domainapp.modules.simple.SimpleModule;
IsisBootDataNucleus.class,
IsisBootSecurityBypass.class,
IsisExtFixturesModule.class,
- DomainAppApplicationModule.class
+ ApplicationModule.class
})
public class SimpleAppManifestForTesting {
diff --git a/starters/simpleapp/application/src/test/resources/cucumber.properties~deprecated b/starters/simpleapp/application/src/test/resources/cucumber.properties~deprecated
deleted file mode 100644
index b579b01..0000000
--- a/starters/simpleapp/application/src/test/resources/cucumber.properties~deprecated
+++ /dev/null
@@ -1 +0,0 @@
-cucumber.api.java.ObjectFactory=org.apache.isis.specsupport.ObjectFactoryForIntegration
\ No newline at end of file
diff --git a/starters/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java b/starters/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java
index 23075d8..fdeaf93 100644
--- a/starters/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java
+++ b/starters/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleManifestForTesting.java
@@ -28,7 +28,7 @@ import org.apache.isis.config.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.IsisBootSecurityBypass;
+import org.apache.isis.security.bypass.IsisBootSecurityBypass;
import domainapp.modules.simple.SimpleModule;
@@ -45,12 +45,9 @@ import domainapp.modules.simple.SimpleModule;
IsisBoot.class,
IsisBootSecurityBypass.class,
IsisBootDataNucleus.class,
- IsisExtFixturesModule.class
+ IsisExtFixturesModule.class,
+ SimpleModule.class
})
-@ComponentScan(
- basePackageClasses= {
- SimpleModule.class
- })
public class SimpleModuleManifestForTesting {
}
diff --git a/starters/simpleapp/webapp/pom.xml b/starters/simpleapp/webapp/pom.xml
index 1e931ce..367b904 100644
--- a/starters/simpleapp/webapp/pom.xml
+++ b/starters/simpleapp/webapp/pom.xml
@@ -151,7 +151,7 @@
<goal>list</goal>
</goals>
<configuration>
- <outputFile>${project.build.directory}/test-classes/domain/application/lockdown/LockDownMavenDeps_Test.list.actual.txt</outputFile>
+ <outputFile>${project.build.directory}/test-classes/domain/webapp/lockdown/LockDownMavenDeps_Test.list.actual.txt</outputFile>
</configuration>
</execution>
<execution>
@@ -161,7 +161,7 @@
<goal>tree</goal>
</goals>
<configuration>
- <outputFile>${project.build.directory}/test-classes/domain/application/lockdown/LockDownMavenDeps_Test.tree.actual.txt</outputFile>
+ <outputFile>${project.build.directory}/test-classes/domain/webapp/lockdown/LockDownMavenDeps_Test.tree.actual.txt</outputFile>
</configuration>
</execution>
</executions>
diff --git a/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index 8ffb02a..f58ca67 100644
--- a/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -18,8 +18,6 @@
*/
package domainapp.webapp;
-import domainapp.application.SimpleAppManifest;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
diff --git a/starters/simpleapp/application/src/main/java/domainapp/application/SimpleAppManifest.java b/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleAppManifest.java
similarity index 94%
rename from starters/simpleapp/application/src/main/java/domainapp/application/SimpleAppManifest.java
rename to starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleAppManifest.java
index ee1e92d..5c05c68 100644
--- a/starters/simpleapp/application/src/main/java/domainapp/application/SimpleAppManifest.java
+++ b/starters/simpleapp/webapp/src/main/java/domainapp/webapp/SimpleAppManifest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.application;
+package domainapp.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -31,7 +31,7 @@ import org.apache.isis.security.shiro.IsisBootSecurityShiro;
import org.apache.isis.viewer.restfulobjects.IsisBootViewerRestfulObjects;
import org.apache.isis.viewer.wicket.viewer.IsisBootViewerWicket;
-import domainapp.application.DomainAppApplicationModule;
+import domainapp.application.ApplicationModule;
import domainapp.application.fixture.scenarios.DomainAppDemo;
/**
@@ -51,7 +51,7 @@ import domainapp.application.fixture.scenarios.DomainAppDemo;
IsisBootViewerWicket.class,
IsisExtFixturesModule.class,
- DomainAppApplicationModule.class,
+ ApplicationModule.class,
DomainAppDemo.class // register this fixture
})
diff --git a/starters/simpleapp/application/src/main/java/domainapp/application/layout/menubars.layout.xml b/starters/simpleapp/webapp/src/main/java/domainapp/webapp/layout/menubars.layout.xml
similarity index 100%
rename from starters/simpleapp/application/src/main/java/domainapp/application/layout/menubars.layout.xml
rename to starters/simpleapp/webapp/src/main/java/domainapp/webapp/layout/menubars.layout.xml
diff --git a/starters/simpleapp/webapp/src/main/resources/application.yml b/starters/simpleapp/webapp/src/main/resources/application.yml
index f8b3761..6117444 100644
--- a/starters/simpleapp/webapp/src/main/resources/application.yml
+++ b/starters/simpleapp/webapp/src/main/resources/application.yml
@@ -90,7 +90,7 @@ isis:
viewer:
wicket:
application:
- menubarsLayoutXml: domainapp/application/layout/menubars.layout.xml
+ menubarsLayoutXml: domainapp/webapp/layout/menubars.layout.xml
brandLogoHeader: /images/apache-isis/logo-48x48.png")
faviconUrl: /images/favicon.png")
name: Simple App
diff --git a/starters/simpleapp/webapp/src/test/java/domain/application/lockdown/.gitignore b/starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/.gitignore
similarity index 100%
rename from starters/simpleapp/webapp/src/test/java/domain/application/lockdown/.gitignore
rename to starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/.gitignore
diff --git a/starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.java b/starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.java
similarity index 82%
rename from starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.java
rename to starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.java
index 4186e44..600ce9e 100644
--- a/starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.java
+++ b/starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.java
@@ -1,4 +1,4 @@
-package domain.application.lockdown;
+package domain.webapp.lockdown;
import java.io.IOException;
import java.net.URL;
@@ -7,20 +7,20 @@ import java.util.Arrays;
import org.approvaltests.Approvals;
import org.approvaltests.reporters.DiffReporter;
import org.approvaltests.reporters.UseReporter;
-import org.junit.Before;
-import org.junit.Test;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.assumeThat;
public class LockDownMavenDeps_Test {
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- assumeThat(System.getProperty("lockdown"), is(not(nullValue())));
+ Assumptions.assumeThat(System.getProperty("lockdown")).isNotNull();
}
@UseReporter(DiffReporter.class)
diff --git a/starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.list.approved.txt b/starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt
similarity index 87%
rename from starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.list.approved.txt
rename to starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt
index b4e462f..fc40d79 100644
--- a/starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.list.approved.txt
+++ b/starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.list.approved.txt
@@ -12,7 +12,7 @@
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.10.0:compile
com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.10.0:compile
- com.fasterxml:classmate:jar:1.5.0:compile
+ com.fasterxml:classmate:jar:1.5.1:compile
com.github.openjson:openjson:jar:1.0.10:compile
com.google.code.findbugs:annotations:jar:2.0.1:compile
com.google.code.findbugs:jsr305:jar:3.0.2:compile
@@ -25,7 +25,7 @@
com.google.javascript:closure-compiler-externs:jar:v20190325:compile
com.google.javascript:closure-compiler-unshaded:jar:v20190325:compile
com.google.jsinterop:jsinterop-annotations:jar:1.0.0:compile
- com.h2database:h2:jar:1.4.199:compile
+ com.h2database:h2:jar:1.4.200:compile
com.jayway.jsonpath:json-path:jar:2.4.0:compile
com.sun.mail:javax.mail:jar:1.6.0:compile
com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:compile
@@ -61,9 +61,9 @@
javax.json.bind:javax.json.bind-api:jar:1.0:compile
javax.transaction:transaction-api:jar:1.1:compile
javax:javaee-api:jar:8.0:compile
- joda-time:joda-time:jar:2.10.4:compile
+ joda-time:joda-time:jar:2.10.5:compile
junit:junit:jar:4.12:compile
- net.bytebuddy:byte-buddy:jar:1.10.1:compile
+ net.bytebuddy:byte-buddy:jar:1.10.2:compile
net.ftlines.wicket-source:wicket-source:jar:7.0.0:compile
net.jcip:jcip-annotations:jar:1.0:compile
net.minidev:accessors-smart:jar:1.2:compile
@@ -104,6 +104,7 @@
org.apache.isis.extensions:isis-extensions-fixtures:jar:2.0.0-M3-SNAPSHOT:compile
org.apache.isis.extensions:isis-extensions-specsupport:jar:2.0.0-M3-SNAPSHOT:compile
org.apache.isis.extensions:isis-extensions-spring:jar:2.0.0-M3-SNAPSHOT:compile
+ org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:2.0.0-M3-SNAPSHOT:compile
org.apache.isis.mavendeps:isis-mavendeps-testing:pom:2.0.0-M3-SNAPSHOT:test
org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:2.0.0-M3-SNAPSHOT:compile
org.apache.logging.log4j:log4j-api:jar:2.12.1:compile
@@ -150,7 +151,7 @@
org.hamcrest:hamcrest-core:jar:2.1:compile
org.hamcrest:hamcrest-library:jar:2.1:compile
org.hamcrest:hamcrest:jar:2.1:compile
- org.hibernate.validator:hibernate-validator:jar:6.0.17.Final:compile
+ org.hibernate.validator:hibernate-validator:jar:6.0.18.Final:compile
org.hsqldb:hsqldb:jar:2.5.0:test
org.jboss.logging:jboss-logging:jar:3.4.1.Final:compile
org.jboss.resteasy:resteasy-jackson-provider:jar:4.0.0.Beta5:compile
@@ -183,31 +184,31 @@
org.projectlombok:lombok:jar:1.18.10:provided
org.reactivestreams:reactive-streams:jar:1.0.3:compile
org.skyscreamer:jsonassert:jar:1.5.0:compile
- org.slf4j:jul-to-slf4j:jar:1.7.28:compile
- org.slf4j:slf4j-api:jar:1.7.28:compile
- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-actuator:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-starter-json:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-starter-log4j2:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-starter-test:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-starter-tomcat:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-starter-validation:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-starter-web:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-starter:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-test-autoconfigure:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot-test:jar:2.2.0.RELEASE:compile
- org.springframework.boot:spring-boot:jar:2.2.0.RELEASE:compile
- org.springframework:spring-aop:jar:5.2.0.RELEASE:compile
- org.springframework:spring-beans:jar:5.2.0.RELEASE:compile
- org.springframework:spring-context:jar:5.2.0.RELEASE:compile
- org.springframework:spring-core:jar:5.2.0.RELEASE:compile
- org.springframework:spring-expression:jar:5.2.0.RELEASE:compile
- org.springframework:spring-jcl:jar:5.2.0.RELEASE:compile
- org.springframework:spring-test:jar:5.2.0.RELEASE:compile
- org.springframework:spring-tx:jar:5.2.0.RELEASE:compile
- org.springframework:spring-web:jar:5.2.0.RELEASE:compile
- org.springframework:spring-webmvc:jar:5.2.0.RELEASE:compile
+ org.slf4j:jul-to-slf4j:jar:1.7.29:compile
+ org.slf4j:slf4j-api:jar:1.7.29:compile
+ org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-actuator:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-autoconfigure:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-starter-json:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-starter-log4j2:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-starter-test:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-starter-tomcat:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-starter-validation:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-starter-web:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-starter:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-test-autoconfigure:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot-test:jar:2.2.1.RELEASE:compile
+ org.springframework.boot:spring-boot:jar:2.2.1.RELEASE:compile
+ org.springframework:spring-aop:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-beans:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-context:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-core:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-expression:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-jcl:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-test:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-tx:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-web:jar:5.2.1.RELEASE:compile
+ org.springframework:spring-webmvc:jar:5.2.1.RELEASE:compile
org.webjars.bower:momentjs:jar:2.24.0:compile
org.webjars.bower:summernote:jar:0.8.11:compile
org.webjars:Eonasdan-bootstrap-datetimepicker:jar:4.17.37-1:compile
diff --git a/starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.tree.approved.txt b/starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt
similarity index 84%
rename from starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.tree.approved.txt
rename to starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt
index 7bed3d4..1ade18f 100644
--- a/starters/simpleapp/webapp/src/test/java/domain/application/lockdown/LockDownMavenDeps_Test.tree.approved.txt
+++ b/starters/simpleapp/webapp/src/test/java/domain/webapp/lockdown/LockDownMavenDeps_Test.tree.approved.txt
@@ -1,54 +1,55 @@
org.apache.isis.examples.apps:simpleapp-webapp:jar:2.0.0-M3-SNAPSHOT
+- org.apache.isis.examples.apps:simpleapp-application:jar:2.0.0-M3-SNAPSHOT:compile
-| \- org.apache.isis.examples.apps:simpleapp-module-simple:jar:2.0.0-M3-SNAPSHOT:compile
-| +- org.apache.isis.extensions:isis-extensions-fixtures:jar:2.0.0-M3-SNAPSHOT:compile
-| | \- org.apache.isis.extensions:isis-extensions-spring:jar:2.0.0-M3-SNAPSHOT:compile
-| \- org.apache.isis.extensions:isis-extensions-specsupport:jar:2.0.0-M3-SNAPSHOT:compile
-| +- io.cucumber:cucumber-java:jar:4.8.0:compile
-| | \- io.cucumber:cucumber-core:jar:4.8.0:compile
-| | +- io.cucumber:gherkin:jar:5.1.0:compile
-| | +- io.cucumber:tag-expressions:jar:1.1.1:compile
-| | +- io.cucumber:cucumber-expressions:jar:7.0.2:compile
-| | \- io.cucumber:datatable:jar:1.1.14:compile
-| | \- io.cucumber:datatable-dependencies:jar:1.1.14:compile
-| +- io.cucumber:cucumber-spring:jar:4.8.0:compile
-| \- io.cucumber:cucumber-junit:jar:4.8.0:compile
+| +- org.apache.isis.examples.apps:simpleapp-module-simple:jar:2.0.0-M3-SNAPSHOT:compile
+| | +- org.apache.isis.extensions:isis-extensions-fixtures:jar:2.0.0-M3-SNAPSHOT:compile
+| | | \- org.apache.isis.extensions:isis-extensions-spring:jar:2.0.0-M3-SNAPSHOT:compile
+| | \- org.apache.isis.extensions:isis-extensions-specsupport:jar:2.0.0-M3-SNAPSHOT:compile
+| | +- io.cucumber:cucumber-java:jar:4.8.0:compile
+| | | \- io.cucumber:cucumber-core:jar:4.8.0:compile
+| | | +- io.cucumber:gherkin:jar:5.1.0:compile
+| | | +- io.cucumber:tag-expressions:jar:1.1.1:compile
+| | | +- io.cucumber:cucumber-expressions:jar:7.0.2:compile
+| | | \- io.cucumber:datatable:jar:1.1.14:compile
+| | | \- io.cucumber:datatable-dependencies:jar:1.1.14:compile
+| | +- io.cucumber:cucumber-spring:jar:4.8.0:compile
+| | \- io.cucumber:cucumber-junit:jar:4.8.0:compile
+| \- org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:2.0.0-M3-SNAPSHOT:compile
+- org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:2.0.0-M3-SNAPSHOT:compile
-| +- org.springframework.boot:spring-boot-starter-web:jar:2.2.0.RELEASE:compile
-| | +- org.springframework.boot:spring-boot-starter:jar:2.2.0.RELEASE:compile
+| +- org.springframework.boot:spring-boot-starter-web:jar:2.2.1.RELEASE:compile
+| | +- org.springframework.boot:spring-boot-starter:jar:2.2.1.RELEASE:compile
| | | +- jakarta.annotation:jakarta.annotation-api:jar:1.3.5:compile
| | | \- org.yaml:snakeyaml:jar:1.25:runtime
-| | +- org.springframework.boot:spring-boot-starter-json:jar:2.2.0.RELEASE:compile
+| | +- org.springframework.boot:spring-boot-starter-json:jar:2.2.1.RELEASE:compile
| | | +- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.10.0:compile
| | | \- com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.10.0:compile
-| | +- org.springframework.boot:spring-boot-starter-tomcat:jar:2.2.0.RELEASE:compile
+| | +- org.springframework.boot:spring-boot-starter-tomcat:jar:2.2.1.RELEASE:compile
| | | +- org.apache.tomcat.embed:tomcat-embed-core:jar:9.0.27:compile
| | | +- org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.27:compile
| | | \- org.apache.tomcat.embed:tomcat-embed-websocket:jar:9.0.27:compile
-| | +- org.springframework.boot:spring-boot-starter-validation:jar:2.2.0.RELEASE:compile
+| | +- org.springframework.boot:spring-boot-starter-validation:jar:2.2.1.RELEASE:compile
| | | +- jakarta.validation:jakarta.validation-api:jar:2.0.1:compile
-| | | \- org.hibernate.validator:hibernate-validator:jar:6.0.17.Final:compile
+| | | \- org.hibernate.validator:hibernate-validator:jar:6.0.18.Final:compile
| | | +- org.jboss.logging:jboss-logging:jar:3.4.1.Final:compile
-| | | \- com.fasterxml:classmate:jar:1.5.0:compile
-| | +- org.springframework:spring-web:jar:5.2.0.RELEASE:compile
-| | \- org.springframework:spring-webmvc:jar:5.2.0.RELEASE:compile
+| | | \- com.fasterxml:classmate:jar:1.5.1:compile
+| | +- org.springframework:spring-web:jar:5.2.1.RELEASE:compile
+| | \- org.springframework:spring-webmvc:jar:5.2.1.RELEASE:compile
| +- org.apache.isis.core:isis-applib:jar:2.0.0-M3-SNAPSHOT:compile
| | \- org.apache.isis.core:isis-commons:jar:2.0.0-M3-SNAPSHOT:compile
| | +- javax:javaee-api:jar:8.0:compile
| | | \- com.sun.mail:javax.mail:jar:1.6.0:compile
| | | \- javax.activation:activation:jar:1.1:compile
| | +- com.google.code.findbugs:annotations:jar:2.0.1:compile
-| | +- org.springframework:spring-tx:jar:5.2.0.RELEASE:compile
-| | \- org.springframework.boot:spring-boot-starter-log4j2:jar:2.2.0.RELEASE:compile
+| | +- org.springframework:spring-tx:jar:5.2.1.RELEASE:compile
+| | \- org.springframework.boot:spring-boot-starter-log4j2:jar:2.2.1.RELEASE:compile
| | +- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.12.1:compile
| | | \- org.apache.logging.log4j:log4j-api:jar:2.12.1:compile
| | +- org.apache.logging.log4j:log4j-core:jar:2.12.1:compile
| | +- org.apache.logging.log4j:log4j-jul:jar:2.12.1:compile
-| | \- org.slf4j:jul-to-slf4j:jar:1.7.28:compile
+| | \- org.slf4j:jul-to-slf4j:jar:1.7.29:compile
| +- org.apache.isis.core:isis-schema:jar:2.0.0-M3-SNAPSHOT:compile
-| | \- joda-time:joda-time:jar:2.10.4:compile
+| | \- joda-time:joda-time:jar:2.10.5:compile
| +- org.apache.isis.core:isis-codegen-bytebuddy:jar:2.0.0-M3-SNAPSHOT:compile
-| | +- net.bytebuddy:byte-buddy:jar:1.10.1:compile
+| | +- net.bytebuddy:byte-buddy:jar:1.10.2:compile
| | \- org.objenesis:objenesis:jar:2.2:compile
| +- org.apache.isis.core:isis-viewer-wicket-impl:jar:2.0.0-M3-SNAPSHOT:compile
| | +- org.apache.isis.core:isis-viewer-wicket-ui:jar:2.0.0-M3-SNAPSHOT:compile
@@ -166,13 +167,22 @@ org.apache.isis.examples.apps:simpleapp-webapp:jar:2.0.0-M3-SNAPSHOT
| +- com.google.errorprone:error_prone_annotations:jar:2.3.2:compile
| +- com.google.j2objc:j2objc-annotations:jar:1.3:compile
| \- org.codehaus.mojo:animal-sniffer-annotations:jar:1.18:compile
-+- com.h2database:h2:jar:1.4.199:compile
++- com.h2database:h2:jar:1.4.200:compile
+- org.apache.isis.mavendeps:isis-mavendeps-testing:pom:2.0.0-M3-SNAPSHOT:test
| +- org.apache.isis.core:isis-unittestsupport:jar:2.0.0-M3-SNAPSHOT:compile
-| | +- org.slf4j:slf4j-api:jar:1.7.28:compile
-| | +- org.springframework.boot:spring-boot-starter-test:jar:2.2.0.RELEASE:compile
-| | | +- org.springframework.boot:spring-boot-test:jar:2.2.0.RELEASE:compile
-| | | +- org.springframework.boot:spring-boot-test-autoconfigure:jar:2.2.0.RELEASE:compile
+| | +- org.junit.jupiter:junit-jupiter-api:jar:5.5.2:compile
+| | | +- org.apiguardian:apiguardian-api:jar:1.1.0:compile
+| | | +- org.opentest4j:opentest4j:jar:1.2.0:compile
+| | | \- org.junit.platform:junit-platform-commons:jar:1.5.2:compile
+| | +- org.junit.jupiter:junit-jupiter-engine:jar:5.5.2:compile
+| | | \- org.junit.platform:junit-platform-engine:jar:1.5.2:compile
+| | +- org.junit.vintage:junit-vintage-engine:jar:5.5.2:compile
+| | | \- junit:junit:jar:4.12:compile
+| | +- org.mockito:mockito-core:jar:3.1.0:compile
+| | +- org.slf4j:slf4j-api:jar:1.7.29:compile
+| | +- org.springframework.boot:spring-boot-starter-test:jar:2.2.1.RELEASE:compile
+| | | +- org.springframework.boot:spring-boot-test:jar:2.2.1.RELEASE:compile
+| | | +- org.springframework.boot:spring-boot-test-autoconfigure:jar:2.2.1.RELEASE:compile
| | | +- com.jayway.jsonpath:json-path:jar:2.4.0:compile
| | | | \- net.minidev:json-smart:jar:2.3:compile
| | | | \- net.minidev:accessors-smart:jar:1.2:compile
@@ -183,16 +193,7 @@ org.apache.isis.examples.apps:simpleapp-webapp:jar:2.0.0-M3-SNAPSHOT
| | | +- org.skyscreamer:jsonassert:jar:1.5.0:compile
| | | | \- com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:compile
| | | \- org.xmlunit:xmlunit-core:jar:2.6.3:compile
-| | +- org.springframework:spring-test:jar:5.2.0.RELEASE:compile
-| | +- org.junit.jupiter:junit-jupiter-api:jar:5.5.2:compile
-| | | +- org.apiguardian:apiguardian-api:jar:1.1.0:compile
-| | | +- org.opentest4j:opentest4j:jar:1.2.0:compile
-| | | \- org.junit.platform:junit-platform-commons:jar:1.5.2:compile
-| | +- org.junit.jupiter:junit-jupiter-engine:jar:5.5.2:compile
-| | | \- org.junit.platform:junit-platform-engine:jar:1.5.2:compile
-| | +- org.junit.vintage:junit-vintage-engine:jar:5.5.2:compile
-| | | \- junit:junit:jar:4.12:compile
-| | +- org.mockito:mockito-core:jar:3.1.0:compile
+| | +- org.springframework:spring-test:jar:5.2.1.RELEASE:compile
| | +- org.jmock:jmock:jar:2.11.0:compile
| | | +- org.jmock:jmock-testjar:jar:2.11.0:compile
| | | \- org.apache-extras.beanshell:bsh:jar:2.0b6:compile
@@ -208,16 +209,16 @@ org.apache.isis.examples.apps:simpleapp-webapp:jar:2.0.0-M3-SNAPSHOT
| | \- com.approvaltests:approvaltests-util:jar:4.0.2:test
| +- org.picocontainer:picocontainer:jar:2.15:compile
| \- org.hsqldb:hsqldb:jar:2.5.0:test
-+- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.0.RELEASE:compile
-| +- org.springframework.boot:spring-boot-actuator:jar:2.2.0.RELEASE:compile
-| | \- org.springframework.boot:spring-boot:jar:2.2.0.RELEASE:compile
-| +- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.0.RELEASE:compile
++- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.1.RELEASE:compile
+| +- org.springframework.boot:spring-boot-actuator:jar:2.2.1.RELEASE:compile
+| | \- org.springframework.boot:spring-boot:jar:2.2.1.RELEASE:compile
+| +- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.1.RELEASE:compile
| +- com.fasterxml.jackson.core:jackson-databind:jar:2.10.0:compile
-| +- org.springframework:spring-core:jar:5.2.0.RELEASE:compile
-| | \- org.springframework:spring-jcl:jar:5.2.0.RELEASE:compile
-| +- org.springframework:spring-context:jar:5.2.0.RELEASE:compile
-| | +- org.springframework:spring-aop:jar:5.2.0.RELEASE:compile
-| | +- org.springframework:spring-beans:jar:5.2.0.RELEASE:compile
-| | \- org.springframework:spring-expression:jar:5.2.0.RELEASE:compile
+| +- org.springframework:spring-core:jar:5.2.1.RELEASE:compile
+| | \- org.springframework:spring-jcl:jar:5.2.1.RELEASE:compile
+| +- org.springframework:spring-context:jar:5.2.1.RELEASE:compile
+| | +- org.springframework:spring-aop:jar:5.2.1.RELEASE:compile
+| | +- org.springframework:spring-beans:jar:5.2.1.RELEASE:compile
+| | \- org.springframework:spring-expression:jar:5.2.1.RELEASE:compile
| \- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
\- org.projectlombok:lombok:jar:1.18.10:provided