You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2014/07/19 13:27:32 UTC

svn commit: r916778 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/contributors/release-process.html

Author: buildbot
Date: Sat Jul 19 11:27:32 2014
New Revision: 916778

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/contributors/release-process.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 19 11:27:32 2014
@@ -1 +1 @@
-1611888
+1611889

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 19 11:27:32 2014
@@ -1 +1 @@
-1611888
+1611889

Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Sat Jul 19 11:27:32 2014
@@ -504,10 +504,10 @@ git pull --ff-only
 
 <p>Then, determine/confirm the version number of the module being released.  This should be in line with our <a href="versioning-policy.html">semantic versioning policy</a>.</p>
 
-<p>Next, create a release branch in your local Git repo, using the version number determined and as per <a href="release-branch-and-tag-names.html">these standards</a>.  For example, to prepare release candidate #1 for a release 1.2.3 of <code>core</code>, use:</p>
+<p>Next, create a release branch in your local Git repo, using the version number determined and as per <a href="release-branch-and-tag-names.html">these standards</a>.  For example, to prepare release candidate #1 for a release 1.6.0 of <code>core</code>, use:</p>
 
 <pre>
-git checkout -b prepare/isis-1.2.3
+git checkout -b prepare/isis-1.6.0
 </pre>
 
 <p>All release preparation is done locally; if we are successful, this branch will be pushed back to master.</p>
@@ -526,11 +526,11 @@ Unless otherwise stated, you should assu
 
 <p>The version number of the parent pom should reflect the branch name that you are now on (with a <code>-SNAPSHOT</code> suffix).  In many cases this will have been done already during earlier development; but confirm that it has been updated.  If it has not, make the change.</p>
 
-<p>For example, if releasing <code>core</code> version <code>1.2.3</code>, the POM should read:</p>
+<p>For example, if releasing <code>core</code> version <code>1.6.0</code>, the POM should read:</p>
 
 <pre><code>&lt;groupId&gt;org.apache.isis.core&lt;/groupId&gt;
 &lt;artifactId&gt;isis&lt;/artifactId&gt;
-&lt;version&gt;1.2.3-SNAPSHOT&lt;/version&gt;
+&lt;version&gt;1.6.0-SNAPSHOT&lt;/version&gt;
 </code></pre>
 
 <h3>Update parent (Isis Core)</h3>
@@ -556,7 +556,7 @@ Unless otherwise stated, you should assu
 <pre><code>&lt;parent&gt;
     &lt;groupId&gt;org.apache.isis.core&lt;/groupId&gt;
     &lt;artifactId&gt;isis&lt;/artifactId&gt;
-    &lt;version&gt;1.2.3&lt;/version&gt;
+    &lt;version&gt;1.6.0&lt;/version&gt;
     &lt;relativePath /&gt;
 &lt;/parent&gt;
 </code></pre>
@@ -773,9 +773,9 @@ licenses to remove from supplemental-mod
 <p>Run the dry-run as follows:</p>
 
 <pre><code>mvn release:prepare -P apache-release -D dryRun=true \
-    -DreleaseVersion=1.2.3 \
-    -Dtag=isis-1.2.3 \
-    -DdevelopmentVersion=1.2.4-SNAPSHOT
+    -DreleaseVersion=1.6.0 \
+    -Dtag=isis-1.6.0 \
+    -DdevelopmentVersion=1.7.0-SNAPSHOT
 </code></pre>
 
 <p>where:</p>
@@ -820,13 +820,13 @@ $ mvn release:prepare -P apache-release 
 [INFO] Isis Core TCK Fixtures
 [INFO]
 [INFO] ------------------------------------------------------------------------
-[INFO] Building Apache Isis Core 1.2.3-SNAPSHOT
+[INFO] Building Apache Isis Core 1.6.0-SNAPSHOT
 [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.2.3: :
+1.6.0: :
 </pre>
 
 <p>If you didn't provide the <code>releaseVersion</code>, <code>tag</code> and <code>developmentVersion</code> tags, then you'll be prompted for them.  You can generally accept the defaults that Maven offers.</p>
@@ -834,9 +834,9 @@ What is the release version for "Apache 
 <p>Assuming this completes successfully, re-run the command, but without the <code>dryRun</code> flag and specifying <code>resume=false</code> (to ignore the generated <code>release.properties</code> file that gets generated as a side-effect of using <code>git</code>).  You can also set the <code>skipTests</code> flag since they would have been run during the previous dry run:</p>
 
 <pre><code>mvn release:prepare -P apache-release -D resume=false -DskipTests=true
-        -DreleaseVersion=1.2.3 \
-        -Dtag=isis-1.2.3 \
-        -DdevelopmentVersion=1.2.4-SNAPSHOT
+        -DreleaseVersion=1.6.0 \
+        -Dtag=isis-1.6.0 \
+        -DdevelopmentVersion=1.7.0-SNAPSHOT
 </code></pre>
 
 <blockquote>
@@ -845,12 +845,12 @@ What is the release version for "Apache 
 
 <h3>Post-prepare sanity check</h3>
 
-<p>You should end up with artifacts in your local repo with the new version <code>1.2.3</code>. There are then a couple of sanity checks that you can perform:</p>
+<p>You should end up with artifacts in your local repo with the new version <code>1.6.0</code>. There are then a couple of sanity checks that you can perform:</p>
 
 <ul>
 <li>unzip the source-release ZIP and check it builds</p>
 
-<p>For example, if building core, then the ZIP file will be called <code>isis-1.2.3-source-release.zip</code> and should reside in <code>~/.m2/repository/org/apache/isis/core/isis/1.2.3</code> directory.</p>
+<p>For example, if building core, then the ZIP file will be called <code>isis-1.6.0-source-release.zip</code> and should reside in <code>~/.m2/repository/org/apache/isis/core/isis/1.6.0</code> directory.</p>
 
 <p>Unzip in a new directory, and build.</li>
 <li>Inspect the <code>DEPENDENCIES</code> file.</p>
@@ -905,17 +905,17 @@ Check that the generated app's artifacts
 [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.2.3 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch isis-1.6.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.2.3 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch isis-1.6.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.2.3"
+[INFO] Executing: cmd.exe /X /C "git checkout isis-1.6.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
@@ -976,13 +976,13 @@ re
 
 <p>To push the branch, for example:</p>
 
-<pre><code>git checkout prepare/isis-1.2.3
-git push -u origin prepare/isis-1.2.3
+<pre><code>git checkout prepare/isis-1.6.0
+git push -u origin prepare/isis-1.6.0
 </code></pre>
 
 <p>To push the tag, with the <code>-RCn</code> suffix, for example:</p>
 
-<pre><code>git push origin refs/tags/isis-1.2.3:refs/tags/isis-1.2.3-RC1
+<pre><code>git push origin refs/tags/isis-1.6.0:refs/tags/isis-1.6.0-RC1
 git fetch
 </code></pre>
 
@@ -1022,7 +1022,7 @@ The artifacts have been uploaded to stag
 
 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.4.0-RC1.
+In the source code repo the code has been tagged as isis-1.6.0-RC1.
 
 Our website contains some suggestions of how to verify the release, see http://isis.apache.org/contributors/verifying-releases.html.  There is also a script you can use, http://isis.apache.org/contributors/verifying-releases-script.html.
 
@@ -1033,7 +1033,7 @@ Please verify the release and cast your 
 [ ] -1
 </pre>
 
-<p>The value <code>orgapacheisis-nnn</code> is the repository id provided by Nexus earlier.</p>
+<p>The value <code>orgapacheisis-10xx</code> is the repository id provided by Nexus earlier.</p>
 
 <p>The procedure for other committers to verify the release can be found <a href="verifying-releases.html">here</a>.</p>
 
@@ -1044,7 +1044,7 @@ Please verify the release and cast your 
 <p>For example, use the following subject for a vote on Isis Core:</p>
 
 <pre>
-[RESULT] [VOTE] Apache Isis Core release 1.2.3
+[RESULT] [VOTE] Apache Isis Core release 1.6.0
 </pre>
 
 <p>using the body (alter last line as appropriate):</p>
@@ -1067,7 +1067,7 @@ The vote is (UN)SUCCESSFUL.
 
 <p>You can do this using the <code>scripts/promoterctag.sh</code> script; for example:</p>
 
-<pre><code>sh scripts/promoterctag isis-1.2.3 RC1
+<pre><code>sh scripts/promoterctag isis-1.6.0 RC1
 </code></pre>
 
 <p>Or, if you like to execute the steps in that script by hand:</p>
@@ -1077,7 +1077,7 @@ The vote is (UN)SUCCESSFUL.
 </ul>
 
 <pre>
-  git push origin refs/tags/isis-1.2.3:refs/tags/isis-1.2.3
+  git push origin refs/tags/isis-1.6.0:refs/tags/isis-1.6.0
   git fetch
 </pre>
 
@@ -1086,7 +1086,7 @@ The vote is (UN)SUCCESSFUL.
 </ul>
 
 <pre>
-  git push origin --delete refs/tags/isis-1.2.3-RC1
+  git push origin --delete refs/tags/isis-1.6.0-RC1
   git fetch
 </pre>
 
@@ -1095,7 +1095,7 @@ The vote is (UN)SUCCESSFUL.
 </ul>
 
 <pre>
-  git tag -d isis-1.2.3-RC1
+  git tag -d isis-1.6.0-RC1
   git fetch
 </pre>
 
@@ -1110,7 +1110,7 @@ The vote is (UN)SUCCESSFUL.
 </ul>
 
 <pre>
-  git push origin --delete prepare/isis-1.2.3
+  git push origin --delete prepare/isis-1.6.0
 </pre>
 
 <ul>
@@ -1118,7 +1118,7 @@ The vote is (UN)SUCCESSFUL.
 </ul>
 
 <pre>
-  git branch -D prepare/isis-1.2.3
+  git branch -D prepare/isis-1.6.0
 </pre>
 
 <ul>
@@ -1126,7 +1126,7 @@ The vote is (UN)SUCCESSFUL.
 </ul>
 
 <pre>
-  git push origin --delete refs/tags/isis-1.2.3-RC1
+  git push origin --delete refs/tags/isis-1.6.0-RC1
 </pre>
 
 <ul>
@@ -1134,7 +1134,7 @@ The vote is (UN)SUCCESSFUL.
 </ul>
 
 <pre>
-  git tag -d isis-1.2.3
+  git tag -d isis-1.6.0
 </pre>
 
 <ul>
@@ -1227,7 +1227,7 @@ isis/
 
 <p>Typically this be will a new page in the core section or for one of the components. Make a note of the URL of this new page (for use in the mailing list announcement).</p>
 
-<p>For example, a new release of Isis Core would have a release notes page <code>http://isis.apache.org/core/release-notes-1.2.3.html</code></li>
+<p>For example, a new release of Isis Core would have a release notes page <code>http://isis.apache.org/core/release-notes-1.6.0.html</code></li>
 <li>Do a search for <code>x.y.0-SNAPSHOT</code> and replace with <code>x.y.0</code></li>
 <li>Update the version number on the <a href="../intro/getting-started/quickstart-archetype.html">quickstart archetype</a> and the <a href="../intro/getting-started/simple-archetype.html">simple archetype</a> pages.</li>
 <li>For core (if released) and for each released component's about page, update the link to the latest release notes providing details of the contents of the release.</li>
@@ -1262,7 +1262,7 @@ TODO: some sort of process required here
 <p>For example, for a release of Apache Isis Core, use the following subject:</p>
 
 <pre>
-[ANN] Apache Isis version 1.2.3 Released
+[ANN] Apache Isis version 1.6.0 Released
 </pre>
 
 <p>And use the following body (summarizing the main points as required):</p>
@@ -1314,9 +1314,9 @@ Enjoy!
 
 <pre><code>git checkout master                           # update master with latest
 git pull
-git merge prepare/isis-1.2.3                  # merge branch onto master
-git branch -d prepare/isis-1.2.3              # branch no longer needed
-git push origin --delete prepare/isis-1.2.3   # remote branch no longer needed
+git merge prepare/isis-1.6.0                  # merge branch onto master
+git branch -d prepare/isis-1.6.0              # branch no longer needed
+git push origin --delete prepare/isis-1.6.0   # remote branch no longer needed
 </code></pre>
 
 <p>If the core was updated, then you'll most likely need to update other POMs to the new <code>-SNAPSHOT</code>.</p>