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 2015/11/10 07:42:36 UTC
isis git commit: ISIS-1195: updating release docs
Repository: isis
Updated Branches:
refs/heads/master 7117c96cc -> f88c0ca9d
ISIS-1195: updating release docs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f88c0ca9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f88c0ca9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f88c0ca9
Branch: refs/heads/master
Commit: f88c0ca9d71244da9635765a138e9e5eee0cabb9
Parents: 7117c96
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 10 06:42:20 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 10 06:42:20 2015 +0000
----------------------------------------------------------------------
.../_cg_committers_cutting-a-release.adoc | 60 ++++++--------------
.../_cg_committers_post-release-successful.adoc | 22 +++----
...cg_committers_post-release-unsuccessful.adoc | 16 +++---
.../_cg_committers_verifying-releases.adoc | 2 +-
4 files changed, 37 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f88c0ca9/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
index a19b1d8..faadb7c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
@@ -47,8 +47,8 @@ We use environment variables to parameterize as many of the steps as possible.
----
cd core
export ISISTMP=/c/tmp # <1>
-export ISISDEV=1.11.0-SNAPSHOT
-export ISISREL=1.10.0
+export ISISDEV=1.12.0-SNAPSHOT
+export ISISREL=1.11.0
export ISISRC=RC1
export ISISBRANCH=release-$ISISREL-$ISISRC
export ISISJIRA=ISIS-9999 # <2>
@@ -62,7 +62,7 @@ Obviously, alter `$ISISDEV` and `$ISISREL` as required, and bump `$ISISRC` for r
[IMPORTANT]
====
-Note that the branch name is *not* the same any of the eventual tag names (eg `isis-1.10.0` or `simpleapp-archetype-1.10.0`).
+Note that the branch name is *not* the same any of the eventual tag names (eg `isis-1.11.0` or `simpleapp-archetype-1.11.0`).
If they did have the same name, then what would happen is that the `maven-release-plugin` would checkout the (HEAD of the) branch and thus upload a SNAPSHOT to the snapshot repository. What it should of course do is checkout the tag and then upload that to the release staging repository.
====
@@ -86,13 +86,13 @@ All release preparation is done locally; if we are successful, this branch will
Double check that the version number of the parent pom should reflect the branch name that you are now on (with a `-SNAPSHOT` suffix). his will normally have been done already during earlier development; but confirm that it has been updated. If it has not, make the change.
-Double check that the version number of the core POM (`core/pom.xml`) should reflect the branch name that you are now on. For example, if releasing version `1.10.0`, the POM should read:
+Double check that the version number of the core POM (`core/pom.xml`) should reflect the branch name that you are now on. For example, if releasing version `1.11.0`, the POM should read:
[source,xml]
----
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
-<version>1.10.0-SNAPSHOT</version>
+<version>1.11.0-SNAPSHOT</version>
----
Also, check that there are no snapshot dependencies:
@@ -255,32 +255,6 @@ You may be prompted for the gpg passphrase.
Experiments in using `--batch-mode -Dgpg.passphrase="..."` to fully automate this didn't work; for more info, see http://maven.apache.org/plugins/maven-gpg-plugin/sign-mojo.html[here] (maven release plugin docs) and http://maven.apache.org/maven-release/maven-release-plugin/examples/non-interactive-release.html[here] (maven gpg plugin docs).
====
-This should generate something like:
-
-[source,bash]
-----
-[INFO] Scanning for projects...
-[INFO] ------------------------------------------------------------------------
-[INFO] Reactor Build Order:
-[INFO]
-[INFO] Apache Isis Core
-[INFO] Apache Isis Core AppLib
-[INFO] Apache Isis Core Unit Test Support
-[INFO] Apache Isis Core MetaModel
-[INFO] Apache Isis Core Runtime
-[INFO] Apache Isis Core WebServer
- ...
-[INFO] Apache Isis Core Integration Testing Support
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] Building Apache Isis Core 1.10.0
-[INFO] ------------------------------------------------------------------------
-[INFO]
-[INFO] --- maven-release-plugin:2.3.2:prepare (default-cli) @ isis ---
-[INFO] Resuming release from phase 'map-release-versions'
-What is the release version for "Apache Isis Core"? (org.apache.isis.core:isis)
-1.10.0: :
-----
[[_cg_committers_cutting-a-release_releasing-core_release-prepare-proper]]
@@ -308,7 +282,7 @@ If there are any snags at this stage, then explicitly delete the generated `rele
[[_cg_committers_cutting-a-release_releasing-core_post-prepare-sanity-check]]
=== Post-prepare sanity check
-You should end up with artifacts in your local repo with the new version (eg `1.10.0`). This is a good time to do some quick sanity checks; nothing has yet been uploaded:
+You should end up with artifacts in your local repo with the new version (eg `1.11.0`). This is a good time to do some quick sanity checks; nothing has yet been uploaded:
* unzip the source-release ZIP and check it builds.
* Inspect the `DEPENDENCIES` file, and check it looks correct.
@@ -364,17 +338,17 @@ The custom `workingDirectory` prevents file path issues if releasing on Windows.
[INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw\co
re
[INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C "git clone --branch isis-1.10.0 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.11.0 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target
[INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw
[INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C "git clone --branch isis-1.10.0 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.11.0 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target
[INFO] Executing: cmd.exe /X /C "git ls-remote file:///C:\APACHE\isis-git-rw"
[INFO] Working directory: C:\Users\ADMINI~1\AppData\Local\Temp
[INFO] Executing: cmd.exe /X /C "git fetch file:///C:\APACHE\isis-git-rw"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
-[INFO] Executing: cmd.exe /X /C "git checkout isis-1.10.0"
+[INFO] Executing: cmd.exe /X /C "git checkout release-1.11.0"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
[INFO] Executing: cmd.exe /X /C "git ls-files"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
@@ -427,7 +401,7 @@ Update the parent `pom.xml` to reference the _released_ version of Apache Isis c
[source,xml]
----
<properties>
- <isis.version>1.10.0</isis.version>
+ <isis.version>1.11.0</isis.version>
...
</properties>
----
@@ -653,7 +627,7 @@ Use the following subject, eg:
[source,bash]
----
-[VOTE] Apache Isis Core release 1.10.0 RC1
+[VOTE] Apache Isis Core release 1.11.0 RC1
----
And use the following body:
@@ -662,17 +636,17 @@ And use the following body:
----
I've cut a release for Apache Isis Core and the simpleapp archetype:
-* Core 1.10.0
-* SimpleApp Archetype 1.10.0
+* Core 1.11.0
+* SimpleApp Archetype 1.11.0
The source code artifacts have been uploaded to staging repositories on repository.apache.org:
-* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/core/isis/1.10.0/isis-1.10.0-source-release.zip
-* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/archetype/simpleapp-archetype/1.10.0/simpleapp-archetype-1.10.0-source-release.zip
+* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/core/isis/1.11.0/isis-1.11.0-source-release.zip
+* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/archetype/simpleapp-archetype/1.11.0/simpleapp-archetype-1.11.0-source-release.zip
For each zip there is a corresponding signature file (append .asc to the zip's url).
-In the source code repo the code has been tagged as isis-1.10.0-RC1 and simpleapp-archetype-1.10.0-RC1; see https://git-wip-us.apache.org/repos/asf?p=isis.git
+In the source code repo the code has been tagged as isis-1.11.0-RC1 and simpleapp-archetype-1.11.0-RC1; see https://git-wip-us.apache.org/repos/asf?p=isis.git
For instructions on how to verify the release (build from binaries and/or use in Maven directly), see http://isis.apache.org/guides/cg.html#_cg_committers_verifying-releases
@@ -685,7 +659,7 @@ Please verify the release and cast your vote. The vote will be open for a minim
Remember to update:
-* the version number (1.10.0 or whatever)
+* the version number (1.11.0 or whatever)
* the release candidate number (`RC1` or whatever)
* the repository id, as provided by Nexus earlier (`orgapacheisis-10xx` or whatever)
http://git-wip-us.apache.org/repos/asf/isis/blob/f88c0ca9/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
index c123cda..3708048 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
@@ -25,7 +25,7 @@ Post the results to the `dev@isis.a.o` mailing list:
[source,bash]
----
-[RESULT] [VOTE] Apache Isis Core release 1.9.0
+[RESULT] [VOTE] Apache Isis Core release 1.11.0
----
using the body (alter last line as appropriate):
@@ -53,8 +53,8 @@ You can do this using the `scripts/promoterctag.sh` script; for example:
[source,bash]
----
-sh scripts/promoterctag.sh isis-1.9.0 RC1
-sh scripts/promoterctag.sh simpleapp-archetype-1.9.0 RC1
+sh scripts/promoterctag.sh isis-1.11.0 RC1
+sh scripts/promoterctag.sh simpleapp-archetype-1.11.0 RC1
----
@@ -159,7 +159,7 @@ For example:
[source,bash]
----
-sh upd.sh 1.9.0 1.10.0
+sh upd.sh 1.10.0 1.11.0
----
The script downloads the artefacts from the Nexus release repository, adds the artefacts to subsversion and deletes the previous version.
@@ -182,7 +182,7 @@ From the root directory, generate the release notes for the current release, in
[source,bash]
----
-sh scripts/jira-release-notes.sh ISIS 1.10.0 > /tmp/1
+sh scripts/jira-release-notes.sh ISIS 1.11.0 > /tmp/1
----
@@ -239,14 +239,14 @@ For example, for a release of Apache Isis Core, use the following subject:
[source,bash]
----
-[ANN] Apache Isis version 1.10.0 Released
+[ANN] Apache Isis version 1.11.0 Released
----
And use the following body (summarizing the main points as required):
[source]
----
-The Apache Isis team is pleased to announce the release of Apache Isis v1.10.0.
+The Apache Isis team is pleased to announce the release of Apache Isis v1.11.0.
New features in this release include:
* ...
@@ -263,7 +263,7 @@ Enjoy!
--The Apache Isis team
-[1] http://isis.apache.org/release-notes.html#r1.10.0
+[1] http://isis.apache.org/release-notes.html#r1.11.0
[2] http://search.maven.org
[3] http://isis.apache.org/downloads.html
----
@@ -287,9 +287,9 @@ Because we release from a branch, the changes made in the branch (changes to `po
----
git checkout master # update master with latest
git pull
-git merge release-1.10.0-RC1 # merge branch onto master
-git branch -d release-1.10.0-RC1 # branch no longer needed
-git push origin --delete release-1.10.0-RC1 # remote branch no longer needed
+git merge release-1.11.0-RC1 # merge branch onto master
+git branch -d release-1.11.0-RC1 # branch no longer needed
+git push origin --delete release-1.11.0-RC1 # remote branch no longer needed
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f88c0ca9/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
index 65fc596..a1aa68f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
@@ -25,7 +25,7 @@ For example, use the following subject for a vote on Apache Isis Core:
[source,bash]
----
-[RESULT] [VOTE] Apache Isis Core release 1.9.0
+[RESULT] [VOTE] Apache Isis Core release 1.11.0
----
using the body (alter last line as appropriate):
@@ -52,7 +52,7 @@ Tidy up remote branches in the git repo:
+
[source,bash]
----
-git push --delete origin release-1.10.0-RC1
+git push --delete origin release-1.11.0-RC1
----
@@ -60,8 +60,8 @@ git push --delete origin release-1.10.0-RC1
+
[source,bash]
----
-git push --delete origin isis-1.10.0-RC1
-git push --delete origin simpleapp-archetype-1.10.0-RC1
+git push --delete origin isis-1.11.0-RC1
+git push --delete origin simpleapp-archetype-1.11.0-RC1
----
@@ -69,10 +69,10 @@ git push --delete origin simpleapp-archetype-1.10.0-RC1
+
[source,bash]
----
-git tag -d isis-1.10.0
-git tag -d isis-1.10.0-RC1
-git tag -d simpleapp-archetype-1.10.0
-git tag -d simpleapp-archetype-1.10.0-RC1
+git tag -d isis-1.11.0
+git tag -d isis-1.11.0-RC1
+git tag -d simpleapp-archetype-1.11.0
+git tag -d simpleapp-archetype-1.11.0-RC1
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f88c0ca9/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
index b2a350a..3466ca7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
@@ -285,7 +285,7 @@ mvn archetype:generate \
-D version=1.0-SNAPSHOT \
-B \
-o \
- -D archetypeVersion=1.9.0 # adjust version as necessary
+ -D archetypeVersion=1.11.0 # adjust version as necessary
cd myapp
mvn clean install -o