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 2013/01/04 09:58:33 UTC
svn commit: r844882 - in /websites/staging/isis/trunk: cgi-bin/ content/
content/contributors/
Author: buildbot
Date: Fri Jan 4 08:58:33 2013
New Revision: 844882
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/recreating-an-archetype.html
websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html
websites/staging/isis/trunk/content/contributors/release-process-one-pager.html
websites/staging/isis/trunk/content/contributors/release-process.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan 4 08:58:33 2013
@@ -1 +1 @@
-1428269
+1428752
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan 4 08:58:33 2013
@@ -1 +1 @@
-1428269
+1428752
Modified: websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html (original)
+++ websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html Fri Jan 4 08:58:33 2013
@@ -291,7 +291,7 @@ groovy ../../../scripts/updateGeneratedA
<p>First, build the archetype:</p>
<pre>
-cd target/generated-resources/archetype
+cd target/generated-sources/archetype
mvn clean install
cd ../../..
</pre>
@@ -319,7 +319,7 @@ mvn clean install
<p>And test. For example:</p>
<pre>
-cd viewer-wicket
+cd viewer-webapp
mvn antrun:run
</pre>
@@ -334,6 +334,8 @@ git rm -rf ../../archetype/quickstart_wi
rm -rf ../../archetype/quickstart_wicket_restful_jdo
</pre>
+<p>Make sure that the <code>archetype/quickstart_wicket_restful_jdo</code> directory was fully removed, otherwise the next command will not copy the regenerated source into the correct location.</p>
+
<p>Then, copy over the generated source of the archetype:</p>
<pre>
Modified: websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html Fri Jan 4 08:58:33 2013
@@ -250,15 +250,51 @@ distinguish the releasable module that t
<table>
<tr>
<th>Releasable module</th>
-<th>Branch name to use while readying the release locally</th>
-<th>Tag name pushed.</th>
+ <th>Branch name to use while readying the release locally</th>
+ <th>Tag name for <tt>release:prepare</tt></th>
+ <th>Tag name manually pushed.</th>
</tr>
-<tr><td>core</td><td>prepare/isis-x.y.z</td><td>isis-x.y.z</td></tr>
-<tr><td>objectstore/xxx</td><td>prepare/isis-objectstore-xxx-x.y.z</td><td>isis-objectstore-xxx-x.y.z</td></tr>
-<tr><td>profilestore/xxx</td><td>prepare/isis-profilestore-xxx-x.y.z</td><td>isis-profilestore-xxx-x.y.z</td></tr>
-<tr><td>progmodel/xxx</td><td>prepare/isis-progmodel-xxx-x.y.z</td><td>isis-progmodel-xxx-x.y.z</td></tr>
-<tr><td>security/xxx</td><td>prepare/isis-security-xxx-x.y.z</td><td>isis-security-xxx-x.y.z</td></tr>
-<tr><td>viewer/xxx</td><td>prepare/isis-viewer-xxx-x.y.z</td><td>isis-viewer-xxx-x.y.z</td></tr>
+<tr>
+ <td>core</td>
+ <td>prepare/isis-x.y.z-RCn</td>
+ <td>isis-x.y.z</td>
+ <td>isis-x.y.z-RCn</td>
+</tr>
+<tr>
+ <td>objectstore/xxx</td>
+ <td>prepare/isis-objectstore-xxx-x.y.z-RCn</td>
+ <td>isis-objectstore-xxx-x.y.z</td>
+ <td>isis-objectstore-xxx-x.y.z-RCn</td>
+</tr>
+<tr>
+ <td>profilestore/xxx</td>
+ <td>prepare/isis-profilestore-xxx-x.y.z-RCn</td>
+ <td>isis-profilestore-xxx-x.y.z</td>
+ <td>isis-profilestore-xxx-x.y.z-RCn</td>
+</tr>
+<tr>
+ <td>progmodel/xxx</td>
+ <td>prepare/isis-progmodel-xxx-x.y.z-RCn</td>
+ <td>isis-progmodel-xxx-x.y.z</td>
+ <td>isis-progmodel-xxx-x.y.z-RCn</td>
+</tr>
+<tr>
+ <td>security/xxx</td>
+ <td>prepare/isis-security-xxx-x.y.z-RCn</td>
+ <td>isis-security-xxx-x.y.z</td>
+ <td>isis-security-xxx-x.y.z-RCn</td>
+</tr>
+<tr>
+ <td>viewer/xxx</td>
+ <td>prepare/isis-viewer-xxx-x.y.z-RCn</td>
+ <td>isis-viewer-xxx-x.y.z</td>
+ <td>isis-viewer-xxx-x.y.z-RCn</td>
+</tr>
+<tr>
+ <td>example/archetype/quickstart_aaa_bbb_ccc</td>
+ <td>prepare/quickstart_abc-archetype-x.y.z-RCn</td>
+ <td>quickstart_abc-archetype-x.y.z</td></tr>
+ <td>quickstart_abc-archetype-x.y.z-RCn</td></tr>
</table>
<p>where <code>xxx</code> represents a specific component or archetype being released.</p>
Modified: websites/staging/isis/trunk/content/contributors/release-process-one-pager.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process-one-pager.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process-one-pager.html Fri Jan 4 08:58:33 2013
@@ -243,7 +243,7 @@
<pre>
git checkout master
git pull --ff-only
-git checkout -b prepare/isis-1.2.3
+git checkout -b prepare/isis-1.2.3-RC1
</pre>
<p>Sanity check:</p>
@@ -253,6 +253,14 @@ rm -rf ~/.m2/repository/org/apache/isis
mvn clean install -o
</pre>
+<h2>Switch to correct directory</h2>
+
+<p>Switch to the directory containing the (parent of the) artifact(s) to be released, eg:</p>
+
+<pre>
+cd core
+</pre>
+
<h2>Check code</h2>
<p>Update parent version to non-<code>SNAPSHOT</code> (including tck project, if any):</p>
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 Fri Jan 4 08:58:33 2013
@@ -338,10 +338,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 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.2.3 of <code>core</code>, use:</p>
<pre>
-git checkout -b prepare/isis-1.2.3
+git checkout -b prepare/isis-1.2.3-RC1
</pre>
<p>All release preparation is done locally; if we are successful, this branch will be pushed back to master.</p>
@@ -710,7 +710,7 @@ What is the release version for "Apache
What is the release version for "Apache Isis Core"? (org.apache.isis.core:isis) 1.2.3: :
</pre>
-<p>For the next question, SCM release tag, you can generally accept the default. Maven's offered value is a concatenation of the <code>artifactId</code> and the version entered above. This is the same as our <a href="release-branch-and-tag-names.html">standard</a>:</p>
+<p>For the next question, SCM release tag, you can generally accept the default. Maven's offered value is a concatenation of the <code>artifactId</code> and the version entered above <em>without a <code>-RCn</code> suffix</em>. This is the same as our <a href="release-branch-and-tag-names.html">standard</a>:</p>
<pre>
What is SCM release tag or label for "Apache Isis Core"? (org.apache.isis.core:isis) isis-1.2.3: :
@@ -873,8 +873,8 @@ Unfortunately, Nexus does not seem to al
<p>To push the branch, for example:</p>
<pre>
-git checkout prepare/isis-1.2.3
-git push -u origin prepare/isis-1.2.3
+git checkout prepare/isis-1.2.3-RC1
+git push -u origin prepare/isis-1.2.3-RC1
</pre>
<p>To push the tag, with the <code>-RCn</code> suffix, for example:</p>
@@ -992,7 +992,7 @@ The vote is (UN)SUCCESSFUL.
</ul>
<pre>
- git push origin --delete prepare/isis-1.2.3
+ git push origin --delete prepare/isis-1.2.3-RC1
</pre>
<ul>
@@ -1000,7 +1000,7 @@ The vote is (UN)SUCCESSFUL.
</ul>
<pre>
- git branch -D prepare/isis-1.2.3
+ git branch -D prepare/isis-1.2.3-RC1
</pre>
<ul>
@@ -1188,11 +1188,11 @@ Enjoy!
<p>Because we release from a branch, the changes made in the branch (changes to <code>pom.xml</code> made by the <code>maven-release-plugin</code>, or any manual edits) should be merged back from the release branch back into the <code>master</code> branch:</p>
<pre>
-git checkout master # update master with latest
+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.2.3-RC1 # merge branch onto master
+git branch -d prepare/isis-1.2.3-RC1 # branch no longer needed
+git push origin --delete prepare/isis-1.2.3-RC1 # remote branch no longer needed
</pre>
<p>If the core was updated, then you'll most likely need to update other POMs to the new <code>-SNAPSHOT</code>.</p>