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/17 13:31:39 UTC
[isis-app-simpleapp] 01/01: minor cleanup, no behavioral changes
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
commit 05529b3c2a0f5617b4b051c19188261fdd0ec6d3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 17 14:31:29 2021 +0100
minor cleanup, no behavioral changes
---
enhance-all.sh | 2 --
module-simple/pom.xml | 12 +++---------
.../DomainAppFixtureScriptsSpecificationProvider.java | 2 --
.../application/services/health/HealthCheckServiceImpl.java | 7 +++----
4 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/enhance-all.sh b/enhance-all.sh
deleted file mode 100644
index 63572d1..0000000
--- a/enhance-all.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-mvn -pl module-simple datanucleus:enhance -o
\ No newline at end of file
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 5972370..efb62ce 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -56,8 +56,9 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.persistence</groupId>
- <artifactId>isis-persistence-jpa-eclipselink</artifactId>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-jpa</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
@@ -86,13 +87,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jpa</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
<!-- IDE support (optional) -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
index daa7a9a..44a100c 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
@@ -2,8 +2,6 @@ package domainapp.webapp.application.fixture;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecification;
import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecificationProvider;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index f6b6a8c..19a0dca 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -3,17 +3,16 @@ package domainapp.webapp.application.services.health;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.stereotype.Service;
+
import org.apache.isis.applib.services.health.Health;
import org.apache.isis.applib.services.health.HealthCheckService;
-import org.springframework.stereotype.Service;
import domainapp.modules.simple.dom.so.SimpleObjects;
-import lombok.extern.log4j.Log4j2;
-
@Service
@Named("domainapp.HealthCheckServiceImpl")
-@Log4j2
+//@Log4j2
public class HealthCheckServiceImpl implements HealthCheckService {
private final SimpleObjects simpleObjects;