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 2019/05/17 06:42:05 UTC
[isis] branch 2112_SpringBoot updated: ISIS-2112: fixes some (not
all) 'simpleapp' build issues
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2112_SpringBoot by this push:
new a83e591 ISIS-2112: fixes some (not all) 'simpleapp' build issues
a83e591 is described below
commit a83e5915382a86758f27587c47f25df79192880a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 17 08:41:58 2019 +0200
ISIS-2112: fixes some (not all) 'simpleapp' build issues
- DataNucleus' annotation-processor seems to stumble over lombok's
@NonNull, so we removed this annotation from 'SimpleObject'
- Profiles 'isis-validate' and 'swagger' still fail
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
example/application/demo/CREDITS.TXT | 4 +-
example/application/simpleapp/application/pom.xml | 63 -------------------
.../application/simpleapp/module-simple/pom.xml | 71 ----------------------
.../modules/simple/dom/impl/SimpleObject.java | 13 +++-
.../modules/simple/dom/impl/SimpleObjects.java | 2 +-
.../modules/simple/dom/impl/SimpleObject_Test.java | 2 +-
example/application/simpleapp/webapp/pom.xml | 62 -------------------
7 files changed, 16 insertions(+), 201 deletions(-)
diff --git a/example/application/demo/CREDITS.TXT b/example/application/demo/CREDITS.TXT
index 9534d2b..16f50b1 100644
--- a/example/application/demo/CREDITS.TXT
+++ b/example/application/demo/CREDITS.TXT
@@ -3,4 +3,6 @@
This Demo App uses icons made by Freepik and Smashicons from www.flaticon.com
which are licensed by CC 3.0 BY.
-We use flexmark for markdown rendering.
+We use AsciidoctorJ [1] for Asciidoc rendering.
+
+[1] https://github.com/asciidoctor/asciidoctorj
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 6a4823f..272a6ed 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -33,69 +33,6 @@
<packaging>jar</packaging>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <version>0.1-alpha-39</version>
- <extensions>true</extensions>
- <configuration>
- <mixins>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>standard</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>enforcerrelaxed</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>surefire</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>cucumberreporting</artifactId>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index d75fa4a..6d9e5c7 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -38,77 +38,6 @@
<maven-pmd-plugin.ruleset>${project.parent.basedir}/_checks/pmd.xml</maven-pmd-plugin.ruleset>
</properties>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <version>0.1-alpha-39</version>
- <extensions>true</extensions>
- <configuration>
- <mixins>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>standard</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>datanucleusenhance</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>enforcerrelaxed</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>sourceandjavadoc</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>staticanalysis</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>surefire</artifactId>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- ISIS API -->
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index d88a6b6..2e42ced 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -41,6 +41,7 @@ import static org.apache.isis.applib.annotation.SemanticsOf.NON_IDEMPOTENT_ARE_Y
import domainapp.modules.simple.dom.types.Name;
import domainapp.modules.simple.dom.types.Notes;
+import lombok.val;
@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE, schema = "simple")
@javax.jdo.annotations.DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
@@ -48,7 +49,7 @@ import domainapp.modules.simple.dom.types.Notes;
@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
@DomainObject(auditing = Auditing.ENABLED)
@DomainObjectLayout() // causes UI events to be triggered
-@lombok.RequiredArgsConstructor
+//@lombok.RequiredArgsConstructor XXX lombok+JDOQ issue
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
public class SimpleObject implements Comparable<SimpleObject> {
@@ -56,7 +57,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
return "Object: " + getName();
}
- @lombok.Getter @lombok.Setter @lombok.NonNull
+ @lombok.Getter @lombok.Setter //@lombok.NonNull XXX lombok+JDOQ issue
@Name private String name;
@lombok.Getter @lombok.Setter
@@ -107,4 +108,12 @@ public class SimpleObject implements Comparable<SimpleObject> {
@javax.jdo.annotations.NotPersistent
MessageService messageService;
+ // FACTORY
+
+ public static SimpleObject ofName(String name) {
+ val simpleObject = new SimpleObject();
+ simpleObject.setName(name);
+ return simpleObject;
+ }
+
}
\ No newline at end of file
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index 953317f..cb3603a 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@ -47,7 +47,7 @@ public class SimpleObjects {
public SimpleObject create(
@Name final String name
) {
- return repositoryService.persist(new SimpleObject(name));
+ return repositoryService.persist(SimpleObject.ofName(name));
}
@Action(semantics = SemanticsOf.SAFE)
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
index 2532eb1..6529c16 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObject_Test.java
@@ -28,7 +28,7 @@ public class SimpleObject_Test {
@BeforeEach
public void setUp() throws Exception {
- simpleObject = new SimpleObject("Foobar");
+ simpleObject = SimpleObject.ofName("Foobar");
}
public static class Name extends SimpleObject_Test {
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 29ee971..bc8c085 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -52,68 +52,6 @@
<docker-plugin.registryUrl>https://index.docker.io/v1/</docker-plugin.registryUrl>
</properties>
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <version>0.1-alpha-39</version>
- <extensions>true</extensions>
- <configuration>
- <mixins>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>standard</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>enforcerrelaxed</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>sourceandjavadoc</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>staticanalysis</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>jettywar</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>jettyconsole</artifactId>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>docker</artifactId>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- this app -->