cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r908822 - in /websites/production/cxf/content: cache/main.pageCache release-management.html
Date Wed, 14 May 2014 19:46:50 GMT
Author: buildbot
Date: Wed May 14 19:46:50 2014
New Revision: 908822

Log:
Production update by buildbot for cxf

Modified:
    websites/production/cxf/content/cache/main.pageCache
    websites/production/cxf/content/release-management.html

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

Modified: websites/production/cxf/content/release-management.html
==============================================================================
--- websites/production/cxf/content/release-management.html (original)
+++ websites/production/cxf/content/release-management.html Wed May 14 19:46:50 2014
@@ -108,38 +108,11 @@ Apache CXF -- Release Management
          <td height="100%">
            <!-- Content -->
            <div class="wiki-content">
-<div id="ConfluenceContent"><h2 id="ReleaseManagement-Deployingsnapshots">Deploying
snapshots</h2>
-
-<p>Snapshots are automatically deployed every night to the Nexus snapshot repository
at <a shape="rect" class="external-link" href="https://repository.apache.org/content/groups/snapshots-group/">https://repository.apache.org/content/groups/snapshots-group/</a>
.  There is no need to manually deploy snapshots anymore.</p>
-
-
-<h2 id="ReleaseManagement-Maintainingafixesbranch">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 shape="rect" class="external-link" href="http://www.nabble.com/cxf-commits-f23851.html"
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 id="ReleaseManagement-Performingarelease">Performing a release</h2>
-
-<p>The first step is to update the release_notes.txt in the distribution/src/main/release.
 This file's JIRA list of solved Bugs, Improvements, etc. can be obtained from the <a shape="rect"
class="external-link" href="https://issues.apache.org/jira/browse/CXF#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel">"Road
Map" JIRA tab</a>, selecting the desired version's Release Notes, and then the Configure
Release Notes button (choose Text output).</p>
-
-    <div class="aui-message warning shadowed information-macro">
+<div id="ConfluenceContent"><h2 id="ReleaseManagement-Deployingsnapshots">Deploying
snapshots</h2><p>Snapshots are automatically deployed every night to the Nexus
snapshot repository at <a shape="rect" class="external-link" href="https://repository.apache.org/content/groups/snapshots-group/">https://repository.apache.org/content/groups/snapshots-group/</a>
. There is no need to manually deploy snapshots anymore.</p><h2 id="ReleaseManagement-Maintainingafixesbranch">Maintaining
a fixes branch</h2><p>dkulp: I'm adding this section to document what worked for
ME when maintaining the 2.7.x-fixes branch for the 2.7.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 master. Thus, the main job of the fixes branch maintainer is to triage the commits on master
and merge pure fixes to the fixes branches, resolve co
 nflicts, 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 git branch
to make a branch.</li><li>On the branch, create a .gitmergeinfo file with a single
line of "origin/master" to say the branch will be merging from there.</li></ol><p><span
style="background-color: transparent;line-height: 1.4285715;">In trunk/bin, there is a
DoMerges.java program that assists in the merging. If the branch is setup with .gitmergeinfo,
if you run it from the root directory of the checkout, it will prompt for every commit on
master 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 </span><a shape="rect"
class="external-link" href="http://www.nabble.com/cxf-commits-f23851.html" style="background-color:
transparent;line-height: 1.4
 285715;" rel="nofollow">cxf-commits</a><span style="background-color: transparent;line-height:
1.4285715;"> 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)</span></p><h2 id="ReleaseManagement-Performingarelease">Performing
a release</h2><p>The first step is to update the release_notes.txt in the distribution/src/main/release.
This file's JIRA list of solved Bugs, Improvements, etc. can be obtained from the <a shape="rect"
class="external-link" href="https://issues.apache.org/jira/browse/CXF#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel">"Road
Map" JIRA tab</a>, selecting the desired version's Release Notes, and then the Configure
Release Notes button (choose Text output).</p>    <div class="aui-message warning
shadowed informat
 ion-macro">
                             <span class="aui-icon icon-warning">Icon</span>
                 <div class="message-content">
-                            <p>Don't manually update the POM versions from X.Y.Z-SNAPSHOT
to X.Y.Z, the Maven Release Plugin commands below will automatically take care of that.  Also,
prior to performing the release you'll need to have your Apache LDAP information configured
in your Maven settings.xml file:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent
pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-...
+                            <p>Don't manually update the POM versions from X.Y.Z-SNAPSHOT
to X.Y.Z, the Maven Release Plugin commands below will automatically take care of that. Also,
prior to performing the release you'll need to have your Apache LDAP information configured
in your Maven settings.xml file:</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[...
 &lt;server&gt;                                                                
    &lt;id&gt;apache.releases.https&lt;/id&gt;
    &lt;username&gt;apacheID&lt;/username&gt;
@@ -150,83 +123,17 @@ Apache CXF -- Release Management
 </div></div>
                     </div>
     </div>
-
-
-<p>Then, to actually perform the release, run the below commands.  </p>
-    <div class="aui-message warning shadowed information-macro">
-                            <span class="aui-icon icon-warning">Icon</span>
-                <div class="message-content">
-                            
-<p>It is suggested to use Maven 2.2.1 for CXF versions &lt;=2.5.x as that has been
better tested.   For &gt;=2.6.0, Maven 3 is required.  It's recommended you build the
release with the lowest JDK version supported by that particular branch (JDK 6 with CXF 2.7.x,
JDK 5 for older releases).</p>
-                    </div>
-    </div>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent
panelContent">
+<p>Then, to actually perform the release, run the below commands.</p><div
class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent
panelContent">
 <pre>mvn release:prepare -Peverything,jaxws22
-mvn release:perform
+mvn release:perform -Peverything,jaxws22
 </pre>
-</div></div>
-<p>The above commands tag the release, update the poms versions, etc., then build it
(off the tag), gpg sign and deploy everything (including source jars and javadoc jars) to
the <a shape="rect" class="external-link" href="https://repository.apache.org">Nexus
repository location</a>.  When the build is done staging, you next need to login to
the Nexus repository and "close" the staging area (click on Staging Repositories in the left-side
menu, select the repo you just uploaded and then select the close button.)   Closing is very
important.   After the staging area is closed, note the URL for the staging area as you will
need that for the vote.</p>
-    <div class="aui-message problem shadowed information-macro">
-                            <span class="aui-icon icon-problem">Icon</span>
-                <div class="message-content">
-                            
-<p>You may encounter error like<br clear="none">
-<a shape="rect" class="unresolved" href="#">INFO</a> Unable to tag SCM<br
clear="none">
-Provider message:<br clear="none">
-The svn tag command failed.<br clear="none">
-Command output:<br clear="none">
-svn: PROPFIND request failed on '/repos/asf/!svn/vcc/default'<br clear="none">
-svn: No such revision 1197023<br clear="none">
-when run "mvn release:prepare -Peverything,jaxws22" to create tag if you're not in U.S. <br
clear="none">
-This is caused by that the svn server in Europe need some time to sync up to the central
server in U.S.<br clear="none">
-If you encounter it, just wait a minute, and do "mvn release:prepare -Dresume=true -Peverything,jaxws22"
which<br clear="none">
-will pick up the left task from last run.</p>
-                    </div>
-    </div>
-
-
-<p>At this point, everything "pre-vote" is done.   Call the vote.</p>
-
-
-<h2 id="ReleaseManagement-Releasingtheartifacts">Releasing the artifacts</h2>
-
-<ul><li>Maven artifacts -  After the vote passes, you'll need to promote that
staging repository to the main location. Login to <a shape="rect" class="external-link"
href="https://repository.apache.org">Nexus repository location</a> to do that as
well, find the staging repository and click the Release button.</li></ul>
-
-
-<ul><li>Distributions - You will need to commit the distributions into the special
svn distribution area:
-<a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf">https://dist.apache.org/repos/dist/release/cxf</a><br
clear="none">
-after you commit they will be live on dist.apache.org fairly quickly, but it will still take
time for the mirrors to get copies.   It's likely easier to make the directory via an svn
command, check out just that directory, and then add the files.  The dist area is rather large
(400MB or so) so checking out the entire thing may be slow. 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent
pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-svn mkdir https://dist.apache.org/repos/dist/release/cxf/2.6.3
+</div></div><p>The above commands tag the release, update the poms versions,
etc., then build it (off the tag), gpg sign and deploy everything (including source jars and
javadoc jars) to the <a shape="rect" class="external-link" href="https://repository.apache.org">Nexus
repository location</a>. When the build is done staging, you next need to login to the
Nexus repository and "close" the staging area (click on Staging Repositories in the left-side
menu, select the repo you just uploaded and then select the close button.) Closing is very
important. After the staging area 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><h2 id="ReleaseManagement-Releasingtheartifacts">Releasing the artifacts</h2><ul><li>Maven
artifacts - After the vote passes, you'll need to promote that staging repository to the main
location. Login to <a shape="rect" class="external-link" href="https://repository.a
 pache.org">Nexus repository location</a> to do that as well, find the staging repository
and click the Release button.</li></ul><ul><li><p>Distributions
- You will need to commit the distributions into the special svn distribution area: <a
shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf">https://dist.apache.org/repos/dist/release/cxf</a><br
clear="none"> after you commit they will be live on dist.apache.org fairly quickly, but
it will still take time for the mirrors to get copies. It's likely easier to make the directory
via an svn command, check out just that directory, and then add the files. The dist area is
rather large (400MB or so) so checking out the entire thing may be slow.</p><div
class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent
pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[svn
mkdir https://dist.apache.org/repos/dist/release/cxf/2.6.3
 svn checkout https://dist.apache.org/repos/dist/release/cxf/2.6.3
 ....  add files to 2.6.3 .....
 svn commit
 ]]></script>
-</div></div></li></ul>
-
-
-<p>The <a shape="rect" href="http://cxf.apache.org/download.html">download page</a>
of a currently released version will tell you the precise files you need to upload.  Basically,
the -src.tar.gz, -src.zip, tar.gz, .zip files, and the .md5, .sha1, and .asc signature files
of each of those.  For greatest accuracy, it's best to download the files from Nexus and use
those.  (For example, for CXF 2.6.2, you would check <a shape="rect" class="external-link"
href="https://repository.apache.org/content/repositories/releases/org/apache/cxf/apache-cxf/2.6.2/">this
folder</a>).  </p>
-
-<ul><li>Update the download page - around 24 hours after committing the distributions,
update the download page, release notes, etc. to point at the new versions.  At that stage
you'll want to delete (svn rm) the previous version of each branch you uploaded to <a shape="rect"
class="external-link" href="https://dist.apache.org">https://dist.apache.org</a>,
so if you added <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf/2.6.3">https://dist.apache.org/repos/dist/release/cxf/2.6.3</a>
and <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf/2.5.6">https://dist.apache.org/repos/dist/release/cxf/2.5.6</a>,
you'll want to remove <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf/2.6.2">https://dist.apache.org/repos/dist/release/cxf/2.6.2</a>
and <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf/2.5.5">https://dist.apache.org/repo
 s/dist/release/cxf/2.5.5</a>.  (Older versions will still be available at <a shape="rect"
class="external-link" href="http://archive.apache.org/dist/cxf/">http://archive.apache.org/dist/cxf/</a>
and are referenced from there on the CXF download page.)</li></ul>
-
-
-<ul><li>Unpack the javadocs from the appropriate cxf-bundle-VERSION-javadocs.jar
into the appropriate directory in an svn checkout of <a shape="rect" class="external-link"
href="https://svn-master.apache.org/repos/infra/websites/production/cxf/content/javadoc">https://svn-master.apache.org/repos/infra/websites/production/cxf/content/javadoc</a>
 and commit the new version.  Make sure any new files are added.</li></ul>
-
-
-<ul><li>Unpack the schemas directory from the appropriate cxf-bundle-VERSION.jar
and check if any of the schemas in <a shape="rect" class="external-link" href="https://svn-master.apache.org/repos/infra/websites/production/cxf/content/schemas">https://svn-master.apache.org/repos/infra/websites/production/cxf/content/schemas</a>
need updating.</li></ul>
-
-
-<h2 id="ReleaseManagement-UpdatingJIRA">Updating JIRA</h2>
-
-<p>JIRA will need to be updated:</p>
-<ul><li>Add new versions that JIRA items can be created against, and mark the
version(s) you just released as "released":</li></ul>
-<ol><li>Go to the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/CXF">CXF
JIRA Home Page</a> and select the "Versions" left menu item, then select "Manage Versions".</li><li>Select
the tools icon (far right side) for the version(s) you've just released and select "Release".</li><li>Also
on this screen type in new release versions for the branch(es) you've released and plan on
releasing more versions from.</li></ol>
-<ul><li>Close the JIRA items that were marked resolved for each release:</li></ul>
-<ol><li>From the previous screen, select "Exit Administration".</li><li>From
the CXF JIRA home page, select Versions from the left-side menu, and for each version you
just released:
-	<ol><li>Select version, then issues left-side menu item, then select the "Resolved"
list.</li><li>From the tools icon, select Bulk Change -&gt; select all items
-&gt; Transition Issues -&gt; Close Issues -&gt; Confirm.</li></ol>
-	</li></ol></div>
+</div></div></li></ul><p>The <a shape="rect" href="http://cxf.apache.org/download.html">download
page</a> of a currently released version will tell you the precise files you need to
upload. Basically, the -src.tar.gz, -src.zip, tar.gz, .zip files, and the .md5, .sha1, and
.asc signature files of each of those. For greatest accuracy, it's best to download the files
from Nexus and use those. (For example, for CXF 2.6.2, you would check <a shape="rect"
class="external-link" href="https://repository.apache.org/content/repositories/releases/org/apache/cxf/apache-cxf/2.6.2/">this
folder</a>).</p><ul><li>Update the download page - around 24 hours
after committing the distributions, update the download page, release notes, etc. to point
at the new versions. At that stage you'll want to delete (svn rm) the previous version of
each branch you uploaded to <a shape="rect" class="external-link" href="https://dist.apache.org">https://dist.apache.org</a>,
so if you added <a shape="rect" class="ext
 ernal-link" href="https://dist.apache.org/repos/dist/release/cxf/2.6.3">https://dist.apache.org/repos/dist/release/cxf/2.6.3</a>
and <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf/2.5.6">https://dist.apache.org/repos/dist/release/cxf/2.5.6</a>,
you'll want to remove <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf/2.6.2">https://dist.apache.org/repos/dist/release/cxf/2.6.2</a>
and <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf/2.5.5">https://dist.apache.org/repos/dist/release/cxf/2.5.5</a>.
(Older versions will still be available at <a shape="rect" class="external-link" href="http://archive.apache.org/dist/cxf/">http://archive.apache.org/dist/cxf/</a>
and are referenced from there on the CXF download page.)</li></ul><ul><li>Unpack
the javadocs from the appropriate cxf-bundle-VERSION-javadocs.jar into the appropriate directory
in an svn checkout of <a shap
 e="rect" class="external-link" href="https://svn-master.apache.org/repos/infra/websites/production/cxf/content/javadoc">https://svn-master.apache.org/repos/infra/websites/production/cxf/content/javadoc</a>
and commit the new version. Make sure any new files are added.</li></ul><ul><li>Unpack
the schemas directory from the appropriate cxf-bundle-VERSION.jar and check if any of the
schemas in <a shape="rect" class="external-link" href="https://svn-master.apache.org/repos/infra/websites/production/cxf/content/schemas">https://svn-master.apache.org/repos/infra/websites/production/cxf/content/schemas</a>
need updating.</li></ul><h2 id="ReleaseManagement-UpdatingJIRA">Updating
JIRA</h2><p>JIRA will need to be updated:</p><ul><li>Add new
versions that JIRA items can be created against, and mark the version(s) you just released
as "released":</li></ul><ol><li>Go to the <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/CXF">CXF JIRA Home Page</a> and select
th
 e "Versions" left menu item, then select "Manage Versions".</li><li>Select the
tools icon (far right side) for the version(s) you've just released and select "Release".</li><li>Also
on this screen type in new release versions for the branch(es) you've released and plan on
releasing more versions from.</li></ol><ul><li>Close the JIRA items
that were marked resolved for each release:</li></ul><ol><li>From
the previous screen, select "Exit Administration".</li><li>From the CXF JIRA home
page, select Versions from the left-side menu, and for each version you just released:<ol><li>Select
version, then issues left-side menu item, then select the "Resolved" list.</li><li>From
the tools icon, select Bulk Change -&gt; select all items -&gt; Transition Issues
-&gt; Close Issues -&gt; Confirm.</li></ol></li></ol></div>
            </div>
            <!-- Content -->
          </td>



Mime
View raw message