You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/18 10:14:10 UTC
[isis-app-simpleapp] branch jpa updated: fixes service provisioning
when launching the App
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa by this push:
new 8f2f2e3 fixes service provisioning when launching the App
8f2f2e3 is described below
commit 8f2f2e36673eaa51d2408dc04189cc6c34dea809
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 18 11:13:59 2021 +0100
fixes service provisioning when launching the App
---
module-simple/pom.xml | 5 -----
.../modules/simple/integtests/SimpleModuleIntegTestAbstract.java | 2 --
.../integtests}/SimpleModuleTestConfiguration_usingJpa.java | 2 +-
webapp/pom.xml | 8 ++++++++
.../domainapp/webapp/integtests/ApplicationIntegTestAbstract.java | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 1a8a2d7..75410a9 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -69,11 +69,6 @@
<!-- TESTS -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-bypass</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-unittests</artifactId>
<type>pom</type>
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 1e2a277..fe55994 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -4,8 +4,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import domainapp.modules.simple.testing.SimpleModuleTestConfiguration_usingJpa;
-
@SpringBootTest(
classes = {
diff --git a/module-simple/src/main/java/domainapp/modules/simple/testing/SimpleModuleTestConfiguration_usingJpa.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
similarity index 98%
rename from module-simple/src/main/java/domainapp/modules/simple/testing/SimpleModuleTestConfiguration_usingJpa.java
rename to module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
index c63fd97..bade212 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/testing/SimpleModuleTestConfiguration_usingJpa.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJpa.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package domainapp.modules.simple.testing;
+package domainapp.modules.simple.integtests;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 38a6602..91795f0 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -174,6 +174,14 @@
</dependency>
<!-- TESTING -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>simpleapp-module-simple</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-integtests</artifactId>
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index d593f00..5d98c02 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -4,7 +4,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-import domainapp.modules.simple.testing.SimpleModuleTestConfiguration_usingJpa;
+import domainapp.modules.simple.integtests.SimpleModuleTestConfiguration_usingJpa;
import domainapp.webapp.application.ApplicationModule;
import domainapp.webapp.bdd.stepdefs.BddStepDefsModule;