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/18 18:20:16 UTC
svn commit: r916690 - in /websites/staging/isis/trunk: cgi-bin/ content/
content/contributors/
Author: buildbot
Date: Fri Jul 18 16:20:16 2014
New Revision: 916690
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-branch-and-tag-names.html
websites/staging/isis/trunk/content/contributors/release-checklist.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 Jul 18 16:20:16 2014
@@ -1 +1 @@
-1611302
+1611696
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jul 18 16:20:16 2014
@@ -1 +1 @@
-1611302
+1611696
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 Jul 18 16:20:16 2014
@@ -425,45 +425,21 @@ distinguish the releasable module that t
</tr>
<tr>
<td>core</td>
- <td>prepare/isis-x.y.z-RCn</td>
+ <td>prepare/isis-x.y.z</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>prepare/isis-x.y.z<br/>(reuse same branch as core)</td>
<td>isis-viewer-xxx-x.y.z</td>
<td>isis-viewer-xxx-x.y.z-RCn</td>
</tr>
<tr>
- <td>example/archetype/<br/> quickstart_aaa_bbb_ccc</td>
- <td>prepare/quickstart_abc-archetype-x.y.z-RCn</td>
- <td>quickstart_aaa_bbb_ccc-archetype-x.y.z</td>
- <td>quickstart_aaa_bbb_ccc-archetype-x.y.z-RCn</td>
+ <td>example/archetype/<br/> xxxxapp</td>
+ <td>prepare/isis-x.y.z<br/>(reuse same branch as core)</td>
+ <td>xxxapp-archetype-x.y.z</td>
+ <td>xxxapp-archetype-x.y.z-RCn</td>
</tr>
</table>
Modified: websites/staging/isis/trunk/content/contributors/release-checklist.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-checklist.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-checklist.html Fri Jul 18 16:20:16 2014
@@ -440,19 +440,6 @@
<td> </td>
</tr>
<tr>
- <th>isis-objectstore-jdo</th>
- <td> </td>
- <td> </td>
- <td>n/a</td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td>n/a</td>
- <td> </td>
- </tr>
- <tr>
<th>isis-viewer-wicket</th>
<td> </td>
<td> </td>
@@ -466,46 +453,7 @@
<td> </td>
</tr>
<tr>
- <th>isis-viewer-restfulobjects</th>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td>n/a</td>
- <td> </td>
- </tr>
- <tr>
- <th>isis-security-shiro</th>
- <td> </td>
- <td> </td>
- <td>n/a</td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td>n/a</td>
- <td> </td>
- </tr>
- <tr>
- <th>isis-security-file</th>
- <td> </td>
- <td> </td>
- <td>n/a</td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td>n/a</td>
- <td> </td>
- </tr>
- <tr>
- <th>quickstart_wicket_restful_jdo-archetype</th>
+ <th>todoapp-archetype</th>
<td> </td>
<td> </td>
<td>n/a</td>
@@ -518,7 +466,7 @@
<td> </td>
</tr>
<tr>
- <th>simple_wicket_restful_jdo-archetype</th>
+ <th>simpleapp-archetype</th>
<td> </td>
<td> </td>
<td>n/a</td>
@@ -556,15 +504,6 @@
<td> </td>
</tr>
<tr>
- <th>isis-objectstore-jdo</th>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
<th>isis-viewer-wicket</th>
<td> </td>
<td> </td>
@@ -574,34 +513,7 @@
<td> </td>
</tr>
<tr>
- <th>isis-viewer-restfulobjects</th>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <th>isis-security-shiro</th>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <th>isis-security-file</th>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <th>quickstart_wicket_restful_jdo-archetype</th>
+ <th>todoapp-archetype</th>
<td> </td>
<td> </td>
<td> </td>
@@ -610,7 +522,7 @@
<td> </td>
</tr>
<tr>
- <th>simple_wicket_restful_jdo-archetype</th>
+ <th>simpleapp-archetype</th>
<td> </td>
<td> </td>
<td> </td>
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 Jul 18 16:20:16 2014
@@ -428,8 +428,8 @@ Switch to the directory containing the (
<pre><code>cd core
export ISISART=isis
-export ISISDEV=1.6.0-SNAPSHOT
-export ISISREL=1.5.0
+export ISISDEV=1.7.0-SNAPSHOT
+export ISISREL=1.6.0
export ISISRC=RC1
</code></pre>
@@ -438,8 +438,8 @@ export ISISRC=RC1
<pre><code>cd component/xxx/yyy
export ISISART=isis-xxx-yyy
-export ISISDEV=1.6.0-SNAPSHOT
-export ISISREL=1.5.0
+export ISISDEV=1.7.0-SNAPSHOT
+export ISISREL=1.6.0
export ISISRC=RC1
</code></pre>
@@ -453,18 +453,18 @@ env | grep ISIS | sort
<h2>Get code</h2>
-<p>If <strong>releasing core</strong>, then pull down latest, create branch (eg <code>prepare/isis-1.4.0-RC1</code>):</p>
+<p>If <strong>releasing core</strong>, then pull down latest, create branch (eg <code>prepare/isis-1.6.0</code>):</p>
<pre><code>git checkout master
git pull --ff-only
-git checkout -b prepare/$ISISART-$ISISREL-$ISISRC
+git checkout -b prepare/$ISISART-$ISISREL
</code></pre>
-<p>If <strong>releasing a component without also releasing core</strong>, then pull down latest, create branch (eg <code>prepare/isis-objectstore-jdo-1.4.0-RC1</code>):</p>
+<p>If <strong>releasing a component without also releasing core</strong>, then pull down latest, create branch (eg <code>prepare/isis-viewer-wicket-1.6.0</code>):</p>
<pre><code>git checkout master
git pull --ff-only
-git checkout -b prepare/$ISISART-$ISISREL-$ISISRC
+git checkout -b prepare/$ISISART-$ISISREL
</code></pre>
<p>If <strong>releasing a component on top of a core release</strong>, then omit this step (just continue in the same branch as for core).</p>
@@ -602,7 +602,7 @@ popd
<p>(If component has its own branch, ie not reusing core's, then) push branch:</p>
-<pre><code>git push -u origin prepare/$ISISART-$ISISREL-$ISISRC
+<pre><code>git push -u origin prepare/$ISISART-$ISISREL
</code></pre>
<p>Then push tag:</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 Jul 18 16:20:16 2014
@@ -415,23 +415,14 @@
<ul>
<li><code>core</code></li>
-<li><code>component/objectstore/jdo</code></li>
-<li><code>component/security/file</code></li>
-<li><code>component/security/shiro</code></li>
-<li><code>component/viewer/restfulobjects</code></li>
<li><code>component/viewer/wicket</code></li>
-<li><code>component/example/archetypes/quickstart_wicket_restful_jdo</code></li>
-<li><code>component/example/archetypes/simple_wicket_restful_jdo</code></li>
+<li><code>component/example/archetypes/todoapp</code></li>
+<li><code>component/example/archetypes/simpleapp</code></li>
</ul>
<p>Other components, not yet released (but not mothballed yet either) are:</p>
<ul>
-<li><code>component/objectstore/nosql</code></li>
-<li><code>component/objectstore/xml</code></li>
-<li><code>component/profilestore/xml</code></li>
-<li><code>component/progmodel/groovy</code></li>
-<li><code>component/viewer/dnd</code></li>
<li><code>component/viewer/scimpi</code></li>
</ul>
@@ -516,7 +507,7 @@ git pull --ff-only
<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-RC1
+git checkout -b prepare/isis-1.2.3
</pre>
<p>All release preparation is done locally; if we are successful, this branch will be pushed back to master.</p>
@@ -985,8 +976,8 @@ re
<p>To push the branch, for example:</p>
-<pre><code>git checkout prepare/isis-1.2.3-RC1
-git push -u origin prepare/isis-1.2.3-RC1
+<pre><code>git checkout prepare/isis-1.2.3
+git push -u origin prepare/isis-1.2.3
</code></pre>
<p>To push the tag, with the <code>-RCn</code> suffix, for example:</p>
@@ -1127,7 +1118,7 @@ The vote is (UN)SUCCESSFUL.
</ul>
<pre>
- git push origin --delete prepare/isis-1.2.3-RC1
+ git push origin --delete prepare/isis-1.2.3
</pre>
<ul>
@@ -1135,7 +1126,7 @@ The vote is (UN)SUCCESSFUL.
</ul>
<pre>
- git branch -D prepare/isis-1.2.3-RC1
+ git branch -D prepare/isis-1.2.3
</pre>
<ul>
@@ -1329,11 +1320,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><code>git checkout master # update master with latest
+<pre><code>git checkout master # update master with latest
git pull
-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
+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
</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>