cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From conflue...@apache.org
Subject [CONF] Apache CXF > Release Management
Date Wed, 23 Feb 2011 20:18:00 GMT
<html>
<head>
    <base href="https://cwiki.apache.org/confluence">
            <link rel="stylesheet" href="/confluence/s/2036/9/15/_/styles/combined.css?spaceKey=CXF&amp;forWysiwyg=true"
type="text/css">
    </head>
<body style="background: white;" bgcolor="white" class="email-body">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
    <h2><a href="https://cwiki.apache.org/confluence/display/CXF/Release+Management">Release
Management</a></h2>
    <h4>Page <b>edited</b> by             <a href="https://cwiki.apache.org/confluence/display/~dkulp">Daniel
Kulp</a>
    </h4>
        <br/>
                         <h4>Changes (9)</h4>
                                 
    
<div id="page-diffs">
                    <table class="diff" cellpadding="0" cellspacing="0">
    
            <tr><td class="diff-snipped" >...<br></td></tr>
            <tr><td class="diff-unchanged" > <br>h2. Performing a release
<br></td></tr>
            <tr><td class="diff-deleted-lines" style="color:#999;background-color:#fdd;text-decoration:line-through;">For
the most part, we now follow the same instructions that the maven team uses. <br>[http://maven.apache.org/developers/release/releasing.html]
<br></td></tr>
            <tr><td class="diff-unchanged" > <br></td></tr>
            <tr><td class="diff-deleted-lines" style="color:#999;background-color:#fdd;text-decoration:line-through;">There
is one piece of poor wording or flat-out error on that page. At one point, it says, &#39;make
sure that there are no SNAPSHOTS in your POM.&#39; In fact, the situation is the opposite.
The release plugin requires all the POM versions to be SNAPSHOTS, and proceeds to create and
tag a revision in which the snapshot version is replaced by the actual release version. <br></td></tr>
            <tr><td class="diff-added-lines" style="background-color: #dfd;">The
first step is to update the release_notes.txt in the distribution/src/main/release. <br></td></tr>
            <tr><td class="diff-unchanged" > <br></td></tr>
            <tr><td class="diff-deleted-lines" style="color:#999;background-color:#fdd;text-decoration:line-through;">One
other caveat: if you use a Mac, you are prone to run into MRELEASE-355, a feud between Apple
and Subversion. Whoever hits this first on CXF will have to modify the pom to ask for version
2.0-beta-8 of the maven-release-plugin, which seems to be the only way around it. <br></td></tr>
            <tr><td class="diff-added-lines" style="background-color: #dfd;">Then,
to actually perform the relesae, run the below commands.   <br></td></tr>
            <tr><td class="diff-changed-lines" ><span class="diff-deleted-words"style="color:#999;background-color:#fdd;text-decoration:line-through;">
</span> <span class="diff-added-words"style="background-color: #dfd;">{warning}</span>
<br></td></tr>
            <tr><td class="diff-deleted-lines" style="color:#999;background-color:#fdd;text-decoration:line-through;">Basically,
setup your settings.xml file as they described except for your gpg key.  The version of the
gpg plugin we use will ask for it.   <br> <br>After that is setup, you need to
update the release_notes.txt in the distribution/src/main/release, and run the below commands.
<br></td></tr>
            <tr><td class="diff-added-lines" style="background-color: #dfd;">Make
sure you use Maven 2.2.1, not Maven 3.x.  There is a bug that causes the signatures of the
projects of packaging &quot;bundle&quot; to not be deployed correctly with Maven 3.x.
<br></td></tr>
            <tr><td class="diff-unchanged" >{noformat} <br>mvn release:prepare
-Peverything,jaxws22 <br>mvn release:perform <br>{noformat} <br></td></tr>
            <tr><td class="diff-changed-lines" >That will tag the release, update
the poms, etc...  Then build it (off the tag) and deploy everything (including source jars
and javadoc jars) to the Nexus repository location and gpg signs everything.  When the build
is done staging, you need to login to the Nexus repository and &quot;close&quot; the
staging are.   <span class="diff-deleted-words"style="color:#999;background-color:#fdd;text-decoration:line-through;">See
the Maven page above for instructions.</span>  <span class="diff-deleted-words"style="color:#999;background-color:#fdd;text-decoration:line-through;">
</span> That is very important.   After the staging are is closed, note the URL for
the staging area as you will need that for the vote. <br></td></tr>
            <tr><td class="diff-unchanged" > <br>At this point, everything
&quot;pre-vote&quot; is done.   Call the vote. <br></td></tr>
            <tr><td class="diff-snipped" >...<br></td></tr>
    
            </table>
    </div>                            <h4>Full Content</h4>
                    <div class="notificationGreySide">
        <h2><a name="ReleaseManagement-Deployingsnapshots"></a>Deploying
snapshots</h2>

<p>Snapshots are automatically deployed every night to the Nexus snapshot repository
at <a href="https://repository.apache.org/content/groups/snapshots-group/" class="external-link"
rel="nofollow">https://repository.apache.org/content/groups/snapshots-group/</a>
.  There is no need to manually deploy snapshots anymore.</p>


<h2><a name="ReleaseManagement-Maintainingafixesbranch"></a>Maintaining
a fixes branch</h2>
<p>dkulp: I'm adding this section to document what worked for ME when maintaining the
2.0.x-fixes branch for the 2.0.x releases.  Each Release Manager may have their own style
or tools or whatever.   This is not a "set in stone" type thing.  </p>

<p>Basically, almost all development and fixes and such are usually done by the various
developers right on trunk.   Thus, the main job of the fixes branch maintainer is to triage
the commits on trunk and merge pure fixes to the fixes branch, resolve conflicts, run the
tests, and periodically deploy snapshots.   For the most part, when things go well, it doesn't
take too much time or effort.   An hour or two every couple days is about it.</p>

<p>To set up, you'll want to:</p>
<ol>
	<li>use svn cp to make a branch. Use URLs for the pathnames or it will take <em>forever</em>.</li>
	<li>use bin/pom-version.pl to change the version in the branch</li>
	<li>use svnmerge.py init to set up svnmerge. You may want to run this in <em>both</em>
the trunk and the new branch in case you are contemplating bidirectional merges.</li>
</ol>


<p>These steps work for individual developers who want to go off into a branch in the
sandbox to work through something complex.</p>


<p>In trunk/bin, there is a DoMerges.java program that wraps svnmerge.py to assist in
the merging.   If the branch is setup with snvmerge.py, if you run it from you checkout directory,
it will prompt for every commit on trunk to see if you want to "Merge" it, "Block" it, or
"Ignore" it.   It displays the commit log first so you can see what was involved.   You can
also check the  <a href="http://www.nabble.com/cxf-commits-f23851.html" class="external-link"
rel="nofollow">cxf-commits</a> archive to see the full details of the commit to help
decide what action to take.  If you select "Merge", it will merge the change and then prompt
before committing.    That will allow you to look at the merge and resolve any conflicts.
 (or even revert it if you didn't mean to hit Merge)</p>




<h2><a name="ReleaseManagement-Performingarelease"></a>Performing a release</h2>

<p>The first step is to update the release_notes.txt in the distribution/src/main/release.</p>

<p>Then, to actually perform the relesae, run the below commands.  </p>
<div class='panelMacro'><table class='warningMacro'><colgroup><col width='24'><col></colgroup><tr><td
valign='top'><img src="/confluence/images/icons/emoticons/forbidden.gif" width="16"
height="16" align="absmiddle" alt="" border="0"></td><td></td></tr></table></div>
<p>Make sure you use Maven 2.2.1, not Maven 3.x.  There is a bug that causes the signatures
of the projects of packaging "bundle" to not be deployed correctly with Maven 3.x.</p>
<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent
panelContent">
<pre>mvn release:prepare -Peverything,jaxws22
mvn release:perform
</pre>
</div></div>
<p>That will tag the release, update the poms, etc...  Then build it (off the tag) and
deploy everything (including source jars and javadoc jars) to the Nexus repository location
and gpg signs everything.  When the build is done staging, you need to login to the Nexus
repository and "close" the staging are.    That is very important.   After the staging are
is closed, note the URL for the staging area as you will need that for the vote.</p>

<p>At this point, everything "pre-vote" is done.   Call the vote.</p>



<p>After the vote passes, you'll need to promote that staging repository to the main
location. Login to Nexus to do that as well.  See above Maven team release page.</p>

<p>Also, don't forget to copy the actual distributions to people.apache.org:/www/www.apache.org/dist/cxf.</p>

<p>Unpack the javadocs.  Create a new directory in /www/cxf.apache.org/javadoc to match
the version number and then unpack the cxf-bundle/$version/*-javadoc.jar from the maven repo
into that new directory.  Update the "latest" sym-links in the javadoc directory to point
to the new directory.</p>

<p>Finally, update the <a href="/confluence/display/CXF/Download" title="Download">download</a>
pages.</p>

    </div>
        <div id="commentsSection" class="wiki-content pageSection">
        <div style="float: right;">
            <a href="https://cwiki.apache.org/confluence/users/viewnotifications.action"
class="grey">Change Notification Preferences</a>
        </div>
        <a href="https://cwiki.apache.org/confluence/display/CXF/Release+Management">View
Online</a>
        |
        <a href="https://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=70605&revisedVersion=21&originalVersion=20">View
Changes</a>
                |
        <a href="https://cwiki.apache.org/confluence/display/CXF/Release+Management?showComments=true&amp;showCommentArea=true#addcomment">Add
Comment</a>
            </div>
</div>
</div>
</div>
</div>
</body>
</html>

Mime
View raw message