[isis] 07/08: ISIS-2274: fixes for smoke test, I hope

[da...@apache.org]

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.git

commit db36047ec8b415bb6c88756842e48c13dfb30147
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 30 16:49:23 2020 +0000

    ISIS-2274: fixes for smoke test, I hope
---
 .../modules/comguide/pages/cutting-a-release.adoc  | 25 +++++++---------------
 .../DomainModelTest_usingGoodDomain.java           |  1 +
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/antora/toc/modules/comguide/pages/cutting-a-release.adoc b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
index 9ffff79..3481fb0 100644
--- a/antora/toc/modules/comguide/pages/cutting-a-release.adoc
+++ b/antora/toc/modules/comguide/pages/cutting-a-release.adoc
@@ -3,16 +3,13 @@
 :page-partial:
 
 
-
-
-
 The release process consists of:
 
 * the release manager cutting the release (documented below)
 * Members of the Apache Isis PMC xref:toc:comguide:about.adoc#verifying-releases[verifying] and voting on the release
 * the release manager performing post-release tasks, for either a xref:toc:comguide:about.adoc#post-release-successful.adoc[successful] or an xref:toc:comguide:post-release-unsuccessful[unsuccessful] vote.
 
-Apache Isis itself is released in one go, everything is ultimately a child of `core-parent/pom.xml` (relative to the link:https://github.com/apache/isis[source code root])
+Apache Isis itself is released in one go, everything is ultimately a child of `core-parent/pom.xml` (relative to the link:https://github.com/apache/isis[source code root]).
 This section details the process for formally releasing this module.
 
 The subsequent sections describe how other committers can xref:toc:comguide:about.adoc#verifying-releases.adoc[verify a release] and how the release manager can then perform xref:toc:comguide:post-release[post-release] activities and set up for the next development iteration.
@@ -25,7 +22,7 @@ They should work on Linux and MacOS; for Windows, use mSysGit.
 
 == Obtain Consensus
 
-Before releasing `core`, ensure there is consensus on the xref:toc:ROOT:support.adoc#[dev mailing list] that this is the right time for a release.
+Before releasing the framework, ensure there is consensus on the xref:toc:ROOT:support.adoc#[dev mailing list] that this is the right time for a release.
 The discussion should include confirming the version number to be used, and to confirm content.
 
 These discussions should also confirm the version number of the module being released.
@@ -53,7 +50,6 @@ env | grep ISIS | sort
 <2> set to an "umbrella" ticket for all release activities.
 (One should exist already, xref:toc:comguide:post-release-successful.adoc#create-new-jira[created at] the beginning of the development cycle now completing).
 
-
 Obviously, alter ``$ISISREL`` as required, and bump ``$ISISRC`` for re-releasing following an xref:toc:comguide:about.adoc#post-release-unsuccessful[unsuccessful] release.
 
 [IMPORTANT]
@@ -80,21 +76,17 @@ Check that there are no snapshot dependencies:
 
 [source,bash,subs="attributes+"]
 ----
-grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | grep -v mothball | sort`
+grep SNAPSHOT $(/bin/find . -name pom.xml | grep -v target  sort)
 ----
 
-The only mention of `SNAPSHOT` should be in the `revision` property of the root `core/pom.xml` file.
+The only mention of `SNAPSHOT` should be in the `revision` property of the root `core-prent/pom.xml` file.
 
 == Bump `revision` property to `$ISISREL`
 
 Previously we used the `maven-release-plugin` which took responsibility for bumping the `<version>` from -SNAPSHOT to release, and then onto the next -SNAPSHOT.
-However, this plugin does not seem to be compatible with the support for `$\{revision}` property introduced in Maven 3.5.0 in order https://maven.apache.org/maven-ci-friendly.html[to support CI/CD use cases]; at least we couldn't make it work.
+However, we now use a simpler process, of just running `mvn versions:set -DnewVersion=...`.
 
-So, instead, we perform the edit of `$\{revision}` in the `pom.xml` files (for `core-parent`):
-
-Change these to the release version, using:
-
-WARNING: TODO: v2: these scripts have changed
+So, bump to the release version:
 
 [source,bash,subs="attributes+"]
 ----
@@ -113,14 +105,13 @@ so that they should read:
 
 After release, there is a xref:toc:comguide:cutting-a-release.adoc#reset-revision[similar step at the end] to reset back to `1.0.0-SNAPSHOT`.
 
-== Releasing Core
+== Releasing the Framework
 
-First, we release `core`.
 Switch to the appropriate directory:
 
 [source,bash,subs="attributes+"]
 ----
-cd core
+cd core-parent
 ----
 
 === Set environment variables
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index b18cf3e..2d29f96 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -53,6 +53,7 @@ import lombok.val;
         }, 
         properties = {
                 "isis.core.meta-model.introspector.mode=FULL",
+                "isis.applib.annotation.domain-object.editing==TRUE",
                 "isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
                 "logging.level.DependentArgUtils=DEBUG"
         })