svn commit: r825648 - in /websites/production/camel/content: cache/main.pageCache release-guide.html

[buildbot]

Author: buildbot
Date: Fri Jul 13 03:21:49 2012
New Revision: 825648

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/release-guide.html

Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/camel/content/release-guide.html
==============================================================================
--- websites/production/camel/content/release-guide.html (original)
+++ websites/production/camel/content/release-guide.html Fri Jul 13 03:21:49 
2012
@@ -254,6 +254,42 @@ Certificate information:
   camel-spring-integration<br clear="none">
   camel-spring-security</li><li>Have a beer! <img align="middle" 
class="emoticon" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif"; 
height="20" width="20" alt="" border="0"></li></ol>
 
+
+<h2><a shape="rect" name="ReleaseGuide-Createanewmaintenancebranch"></a>Create 
a new maintenance branch </h2>
+<p>When we finish the major version release, we need to create a maintenance 
branch to holds the bug fixes. Here are the steps for it.</p>
+<ol><li>Create a branch from trunk remotely
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java">
+svn copy -m <span class="code-quote">"create camel 2.10.x fix branch"</span> 
https:<span class="code-comment">//svn.apache.org/repos/asf/camel/trunk/ 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x</span>
+</pre>
+</div></div></li></ol>
+
+
+<ol><li>Check out the remote branch in a new directory
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java">
+svn checkout https:<span 
class="code-comment">//svn.apache.org/repos/asf/camel/branches/camel-2.10.x 
</span>
+</pre>
+</div></div></li></ol>
+
+
+<ol><li>Initialize merge tracking for the new branch
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java">
+cd camel-2.10.x
+svnmerge.py init -f commit.txt https:<span 
class="code-comment">//svn.apache.org/repos/asf/camel/branches/camel-2.10.x
+</span>svn ci -F commit.txt 
+</pre>
+</div></div></li></ol>
+
+
+<ol><li>Update the version number for the next patch release
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java">
+find ./ -name pom.xml |xargs perl -pi -e 's/2.11-SNAPSHOT/2.10.x-SNAPSHOT/g'
+svn ci -m <span class="code-quote">"Update the pom version <span 
class="code-keyword">for</span> next patch release"</span>
+</pre>
+</div></div></li></ol>
 </div>
         </td>
         <td valign="top">