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 2020/01/31 17:44:31 UTC
[isis-app-helloworld] branch master updated: updates mavendeps
dependencies, now on an interim again
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
The following commit(s) were added to refs/heads/master by this push:
new 4aa3a62 updates mavendeps dependencies, now on an interim again
4aa3a62 is described below
commit 4aa3a62e14c7313fe5658feeca1725272c1c24fd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 31 17:44:14 2020 +0000
updates mavendeps dependencies, now on an interim again
---
README.adoc | 47 +---------------------
pom.xml | 4 +-
.../java/domainapp/modules/hello/types/Name.java | 2 +-
src/main/resources/application.yml | 2 -
4 files changed, 4 insertions(+), 51 deletions(-)
diff --git a/README.adoc b/README.adoc
index 9bab573..2734c24 100644
--- a/README.adoc
+++ b/README.adoc
@@ -21,7 +21,7 @@ It provides more structure and includes examples of fixtures, unit tests, integr
+
[source,bash]
----
-APP=simpleapp
+APP=helloworld
BRANCH=master
REPO=isis-app-$APP
@@ -71,48 +71,3 @@ This is useful to know if the application fails to bootstrap, complaining of "un
TIP: You can also use `enhance-all.sh`
-== Docker
-
-To package up the application as a docker image and push to a Docker registry:
-
-* set `$DOCKER_REGISTRY_USERNAME` and `$DOCKER_REGISTRY_PASSWORD` environment variables
-
-* modify the `to/image` configuration property for the link:https://github.com/GoogleContainerTools/jib[jib-maven-plugin] in the `pom.xml`
-+
-The default value is `docker.io/apacheisis/simpleapp:latest`:
-
-** change `docker.io` prefix to push to a registry other than Docker hub
-** change `apacheisis/simpleapp` to the name of your app.
-
-* package up the app with the `docker` profile:
-+
-[source,bash]
-----
-mvn -pl webapp -DskipTests -Ddocker package
-----
-
-Variants:
-
-* to specify Docker registry credentials through some other mechanism, configure the `pom.xml` for `maven-jib-plugin` (it supports a link:https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin#authentication-methods[variety of ways] to specify credentials)
-
-* to override the image at the command line, use `-Dimage=...`.
-
-
-
-To run a docker image previously packaged:
-
-[source,bash]
-----
-docker pull apacheisis/simpleapp:latest
-docker container run -d -p 8080:8080 apacheisis/simpleapp:latest
-----
-
-This can then be accessed at link:http://localhost:8080[localhost:8080].
-
-
-=== Externalized Configuration
-
-The application is configured to run in the `/run/secrets` directory.
-Configuration can be therefore be externalized by defining an `application.properties` secret for the Kubernetes or Docker Swarm cluster.
-
-Spring Boot will use these settings in preference to the configuration properties defined in `classpath:config/application.properties`, see link:https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config[Spring docs].
diff --git a/pom.xml b/pom.xml
index 8e80408..ddb24ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M2.20200126-1742-e89bdf6c</version>
+ <version>2.0.0-M2.20200131-1559-7516c085</version>
<!--
<version>2.0.0-M3-SNAPSHOT</version>
-->
@@ -75,7 +75,7 @@
<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-testing</artifactId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
<scope>test</scope>
<type>pom</type>
</dependency>
diff --git a/src/main/java/domainapp/modules/hello/types/Name.java b/src/main/java/domainapp/modules/hello/types/Name.java
index 5eeb825..f3457b9 100644
--- a/src/main/java/domainapp/modules/hello/types/Name.java
+++ b/src/main/java/domainapp/modules/hello/types/Name.java
@@ -13,7 +13,7 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Property;
@Column(length = Name.MAX_LEN, allowsNull = "false")
-@Property(editing = Editing.DISABLED, maxLength = Name.MAX_LEN)
+@Property(maxLength = Name.MAX_LEN)
@Parameter(maxLength = Name.MAX_LEN)
@ParameterLayout(named = "Name")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 559ff05..b1e58b1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,8 +9,6 @@ isis:
annotation:
action:
explicit: true
- domain-object:
- editing: false
core:
meta-model: