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/25 16:45:18 UTC
[isis] 05/12: ISIS-1810: tiny edits for docs (typo,
release procedures)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e47088181d86e6e8105d148d2f35ca8993b953e2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 08:18:20 2018 +0100
ISIS-1810: tiny edits for docs (typo, release procedures)
---
.../src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 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 bc4703c..13b24e3 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
@@ -59,7 +59,7 @@ export ISISREL=2.0.0-M1
export ISISRC=RC1
export ISISBRANCH=release-$ISISREL-$ISISRC
export ISISJIRA=ISIS-9999 # <2>
-export CATALINA_HOME=/c/java/apache-tomcat-8.0.30 # <3>
+export CATALINA_HOME=/c/java/apache-tomcat-9.0.10 # <3>
env | grep ISIS | sort
----
@@ -149,7 +149,7 @@ Change all of these to the release version, using:
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" core/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" example/application/simpleapp/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISREL}<|g" example/application/helloworld/pom.xml
-commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISREL}"
+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.
@@ -772,7 +772,7 @@ In the root of the Apache Isis repo, we do this for all three ``pom.xml``s with:
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" core/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" example/application/simpleapp/pom.xml
sed -i -E "s|<revision>[^<]+<|<revision>${ISISDEV}<|g" example/application/helloworld/pom.xml
-commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISDEV}"
+git commit -am "ISISJIRA: bumps revision property across all pom.xml's to ${ISISDEV}"
----