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 2018/07/31 16:55:49 UTC
[isis] 01/03: ISIS-1810: doc updates

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 36919bb1a31e1dff38f050f5624c86a24ef796f1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jul 26 10:00:30 2018 +0100

    ISIS-1810: doc updates
---
 .../main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc |  4 ++--
 .../asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc     | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index 35d350c..638b343 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -152,7 +152,7 @@ sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" example/application/hello
 git commit -am "${ISISJIRA}: bumps revision property across all pom.xml's to ${ISISREL}"
 ----
 
-After release, there is a similar step at the end to set to the next development SNAPSHOT.
+After release, there is a xref:cgcom.adoc#__cgcom_cutting-a-release_bump-revision-to-ISISDEV[similar step at the end] to update to the next development `SNAPSHOT`.
 
 
 
@@ -775,7 +775,7 @@ Unfortunately, Nexus does not seem to allow subkeys to be used for signing. See
 == Bump `revision` property to `$ISISDEV`
 
 At the beginning of the release process we bumped the `revision` property to the release version, ie `${ISISREL}`.
-With the release now deployed we now need to bump the revision up to the next development version, ie `${ISISDEV}.
+With the release now deployed we now need to bump the revision up to the next development version, ie `${ISISDEV}`.
 
 In the root of the Apache Isis repo, we do this for all three ``pom.xml``s with:
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
index 38cac73..6efe926 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
@@ -232,16 +232,17 @@ Assuming that everything builds ok, then test the archetypes (adjust version as
 [source,bash]
 ----
 mvn archetype:generate  \
+    -D archetypeCatalog=local \
     -D archetypeGroupId=org.apache.isis.archetype \
     -D archetypeArtifactId=helloworld-archetype \
     -D archetypeVersion=2.0.0-M1 \
     -D groupId=com.mycompany \
-    -D artifactId=myapp \
+    -D artifactId=myhelloworld \
     -D version=1.0-SNAPSHOT \
     -B \
     -o
 
-cd myapp
+cd myhelloworld
 mvn clean install jetty:run -o
 ----
 +
@@ -251,17 +252,20 @@ Adjust the version as necessary.
 +
 [source,bash]
 ----
+cd ..
+
 mvn archetype:generate  \
+    -D archetypeCatalog=local \
     -D archetypeGroupId=org.apache.isis.archetype \
     -D archetypeArtifactId=simpleapp-archetype \
     -D archetypeVersion=2.0.0-M1 \
     -D groupId=com.mycompany \
-    -D artifactId=myapp \
+    -D artifactId=mysimpleapp \
     -D version=1.0-SNAPSHOT \
     -B \
     -o
 
-cd myapp
+cd mysimpleapp
 mvn clean install -o && mvn -pl webapp jetty:run -o
 ----
 +