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 2013/01/04 09:58:22 UTC

svn commit: r1428752 - in /isis/site/trunk/content/contributors: recreating-an-archetype.md release-branch-and-tag-names.md release-process-one-pager.md release-process.md

Author: danhaywood
Date: Fri Jan  4 08:58:21 2013
New Revision: 1428752

URL: http://svn.apache.org/viewvc?rev=1428752&view=rev
Log:
isis site - minor updates to release and archetype docs

Modified:
    isis/site/trunk/content/contributors/recreating-an-archetype.md
    isis/site/trunk/content/contributors/release-branch-and-tag-names.md
    isis/site/trunk/content/contributors/release-process-one-pager.md
    isis/site/trunk/content/contributors/release-process.md

Modified: isis/site/trunk/content/contributors/recreating-an-archetype.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/recreating-an-archetype.md?rev=1428752&r1=1428751&r2=1428752&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/recreating-an-archetype.md (original)
+++ isis/site/trunk/content/contributors/recreating-an-archetype.md Fri Jan  4 08:58:21 2013
@@ -52,7 +52,7 @@ where `1.2.3` is the version of isis cor
 First, build the archetype:
 
 <pre>
-cd target/generated-resources/archetype
+cd target/generated-sources/archetype
 mvn clean install
 cd ../../..
 </pre>
@@ -77,7 +77,7 @@ mvn clean install
 
 And test.  For example:
 <pre>
-cd viewer-wicket
+cd viewer-webapp
 mvn antrun:run
 </pre>
 
@@ -92,6 +92,8 @@ git rm -rf ../../archetype/quickstart_wi
 rm -rf ../../archetype/quickstart_wicket_restful_jdo
 </pre>
 
+Make sure that the `archetype/quickstart_wicket_restful_jdo` directory was fully removed, otherwise the next command will not copy the regenerated source into the correct location.
+
 Then, copy over the generated source of the archetype:
 
 <pre>

Modified: isis/site/trunk/content/contributors/release-branch-and-tag-names.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-branch-and-tag-names.md?rev=1428752&r1=1428751&r2=1428752&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/release-branch-and-tag-names.md (original)
+++ isis/site/trunk/content/contributors/release-branch-and-tag-names.md Fri Jan  4 08:58:21 2013
@@ -15,15 +15,51 @@ The table below shows the tag name to us
 <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>
 
 where `xxx` represents a specific component or archetype being released.

Modified: isis/site/trunk/content/contributors/release-process-one-pager.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-process-one-pager.md?rev=1428752&r1=1428751&r2=1428752&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/release-process-one-pager.md (original)
+++ isis/site/trunk/content/contributors/release-process-one-pager.md Fri Jan  4 08:58:21 2013
@@ -8,7 +8,7 @@ Pull down latest, create branch:
 <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>
 
 Sanity check:
@@ -18,6 +18,14 @@ mvn clean install -o
 </pre>
 
 
+## Switch to correct directory
+
+Switch to the directory containing the (parent of the) artifact(s) to be released, eg:
+
+<pre>
+cd core
+</pre>
+
 ## Check code
 
 Update parent version to non-`SNAPSHOT` (including tck project, if any):

Modified: isis/site/trunk/content/contributors/release-process.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-process.md?rev=1428752&r1=1428751&r2=1428752&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/release-process.md (original)
+++ isis/site/trunk/content/contributors/release-process.md Fri Jan  4 08:58:21 2013
@@ -97,10 +97,10 @@ git pull --ff-only
 
 Then, determine/confirm the version number of the module being released.  This should be in line with our [semantic versioning policy](versioning-policy.html).
 
-Next, create a release branch in your local Git repo, using the version number determined and as per [these standards](release-branch-and-tag-names.html).  For example, to prepare a release 1.2.3 of `core`, use:
+Next, create a release branch in your local Git repo, using the version number determined and as per [these standards](release-branch-and-tag-names.html).  For example, to prepare release candidate #1 for a release 1.2.3 of `core`, use:
 
 <pre>
-git checkout -b prepare/isis-1.2.3
+git checkout -b prepare/isis-1.2.3-RC1
 </pre>
 
 All release preparation is done locally; if we are successful, this branch will be pushed back to master.
@@ -464,7 +464,7 @@ For the first, release version, you can 
 What is the release version for "Apache Isis Core"? (org.apache.isis.core:isis) 1.2.3: :
 </pre>
 
-For the next question, SCM release tag, you can generally accept the default. Maven's offered value is a concatenation of the `artifactId` and the version entered above.  This is the same as our [standard](release-branch-and-tag-names.html):
+For the next question, SCM release tag, you can generally accept the default. Maven's offered value is a concatenation of the `artifactId` and the version entered above *without a `-RCn` suffix*.  This is the same as our [standard](release-branch-and-tag-names.html):
 <pre>
 What is SCM release tag or label for "Apache Isis Core"? (org.apache.isis.core:isis) isis-1.2.3: :
 </pre>
@@ -625,8 +625,8 @@ Finally, push both the branch and the ta
 
 To push the branch, for example:
 <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>
 
 To push the tag, with the `-RCn` suffix, for example:
@@ -735,13 +735,13 @@ If the vote has been unsuccessful, then:
 * delete the remote branch, for example:
 
 <pre>
-  git push origin --delete prepare/isis-1.2.3
+  git push origin --delete prepare/isis-1.2.3-RC1
 </pre>
 
 * delete your local branch, for example:
 
 <pre>
-  git branch -D prepare/isis-1.2.3
+  git branch -D prepare/isis-1.2.3-RC1
 </pre>
 
 * delete the remote origin server's tag, for example:
@@ -927,11 +927,11 @@ Finally, [log onto](https://blogs.apache
 Because we release from a branch, the changes made in the branch (changes to `pom.xml` made by the `maven-release-plugin`, or any manual edits) should be merged back from the release branch back into the `master` branch:
 
 <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>
 
 If the core was updated, then you'll most likely need to update other POMs to the new `-SNAPSHOT`.