jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r879214 - in /websites/staging/jspwiki/trunk/content: ./ community/mailing_lists.html community/people.html development/source_and_guide.html ppmc/how_to_release.html
Date Fri, 20 Sep 2013 18:46:16 GMT
Author: buildbot
Date: Fri Sep 20 18:46:15 2013
New Revision: 879214

Log:
Staging update by buildbot for jspwiki

Modified:
    websites/staging/jspwiki/trunk/content/   (props changed)
    websites/staging/jspwiki/trunk/content/community/mailing_lists.html
    websites/staging/jspwiki/trunk/content/community/people.html
    websites/staging/jspwiki/trunk/content/development/source_and_guide.html
    websites/staging/jspwiki/trunk/content/ppmc/how_to_release.html

Propchange: websites/staging/jspwiki/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep 20 18:46:15 2013
@@ -1 +1 @@
-1525092
+1525093

Modified: websites/staging/jspwiki/trunk/content/community/mailing_lists.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/community/mailing_lists.html (original)
+++ websites/staging/jspwiki/trunk/content/community/mailing_lists.html Fri Sep 20 18:46:15 2013
@@ -84,9 +84,9 @@
         <div id="pagecontent">
           <h2 id="jspwiki-user">JSPWiki-user</h2>
 <p>The jspwiki-user mailing list is hosted at Apache. You can join it by sending 
-an e-mail to <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#117;&#115;&#101;&#114;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#117;&#115;&#101;&#114;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>. You can also browse
+an e-mail to <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#117;&#115;&#101;&#114;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#117;&#115;&#101;&#114;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>. You can also browse
 the list archives on either <a class="external" 
-href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/">Apache
+href="http://mail-archives.apache.org/mod_mbox/jspwiki-user/">Apache
 mail archives</a> or <a href="http://www.nabble.com/JspWiki---User-f2680.html" class="external">
 Nabble</a>.</p>
 <h2 id="jspwiki-dev">JSPWiki-dev</h2>
@@ -94,20 +94,20 @@ Nabble</a>.</p>
 interested in the current state and development. For example, all bug reports 
 and enhancement requests from JIRA are automatically sent here. The jspwiki-dev 
 list is hosted at Apache, so you join by sending an email to 
-<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#100;&#101;&#118;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#100;&#101;&#118;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>. The 
-<a href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/" 
+<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#100;&#101;&#118;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#100;&#101;&#118;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>. The
+<a href="http://mail-archives.apache.org/mod_mbox/jspwiki-dev/"
 class="external">list archives</a> are also browseable.</p>
 <h2 id="jspwiki-commits">JSPWiki-commits</h2>
 <p>If you subscribe to this list you will get emailed when (a committer) commits 
 new or changed files to the SVN repository. The jspwiki-commits list is hosted 
 at Apache, join it by sending an email to 
-<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#99;&#111;&#109;&#109;&#105;&#116;&#115;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#99;&#111;&#109;&#109;&#105;&#116;&#115;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>. Again, the 
+<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#99;&#111;&#109;&#109;&#105;&#116;&#115;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#99;&#111;&#109;&#109;&#105;&#116;&#115;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>. Again, the
 <a class="external" 
-href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-commits/">list 
+href="http://mail-archives.apache.org/mod_mbox/jspwiki-commits/">list
 archives</a> are also browseable.</p>
 <h2 id="unsubscribing">Unsubscribing</h2>
 <p>Unsubscribing is equally easy: you can just send an email to 
-jspwiki-&lt;user|dev|commits&gt;-unsubscribe@incubator.apache.org from the same 
+&lt;user|dev|commits&gt;-unsubscribe@jspwiki.apache.org from the same
 email address that you originally subscribed from.</p>
 <h2 id="other-resources">Other resources</h2>
 <ul>

Modified: websites/staging/jspwiki/trunk/content/community/people.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/community/people.html (original)
+++ websites/staging/jspwiki/trunk/content/community/people.html Fri Sep 20 18:46:15 2013
@@ -85,29 +85,25 @@
           <h2 id="jspwiki-contributors">JSPWiki contributors</h2>
 <p>The current JSPWiki committer list:</p>
 <ul>
+<li>Murray Altheims</li>
 <li>Dirk Frederickx</li>
 <li>Florian Holeczek</li>
 <li>Janne Jalkanen</li>
 <li>Andrew Jaquith</li>
 <li><a href="http://www.jroller.com/gmazza/">Glen Mazza</a></li>
 <li>Harry Metske</li>
+<li>Craig Russell</li>
 <li>Juan Pablo Santos</li>
 <li>Christoph Sauer</li>
 </ul>
-<p>As esteemed mentors we have:</p>
-<ul>
-<li>Sam Ruby</li>
-<li>Craig Russell</li>
-<li>Siegfried Goeschl</li>
-</ul>
 <p>And, of course, all the fine people of the jspwiki-dev <a href="mailing_lists.html">mailing list</a>!</p>
-<h2 id="ppmc">PPMC</h2>
-<p>The Podling Project Management Committee consists of </p>
+<h2 id="pmc">PMC</h2>
+<p>The Project Management Committee consists of </p>
 <ul>
+<li>Murray Altheims</li>
 <li>Dirk Frederickx</li>
 <li>Florian Holeczek</li>
 <li>Andrew Jaquith</li>
-<li>Janne Jalkanen</li>
 <li>Glen Mazza</li>
 <li>Harry Metske</li>
 <li>Craig Russell</li>

Modified: websites/staging/jspwiki/trunk/content/development/source_and_guide.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/development/source_and_guide.html (original)
+++ websites/staging/jspwiki/trunk/content/development/source_and_guide.html Fri Sep 20 18:46:15 2013
@@ -83,27 +83,32 @@
       <div class="tabs">
         <div id="pagecontent">
           <h2 id="getting-jspwiki-source-code">Getting JSPWiki Source Code</h2>
-<p>JSPWiki source code (<a class="external" href="http://svn.apache.org/viewvc/incubator/jspwiki/">
+<p>JSPWiki source code (<a class="external" href="http://svn.apache.org/viewvc/jspwiki/">
 browse</a>) is maintained using Apache Subversion.</p>
 <p>Checkout the code using:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
 </pre></div>
 
 
 <p>There is also a European mirror, so you can alternatively use:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">eu</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">eu</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
 </pre></div>
 
 
 <p>Change http to https if you are a developer intending to make commits</p>
 <p>See the <a href="edit_website.html">Edit Website</a> page for the website sources.</p>
 <h2 id="building-jspwiki">Building JSPWiki</h2>
-<p>Apache JSPWiki is a <a href="http://maven.apache.org">Maven</a>-based project and builds using the same commands as other Maven projects.  The JSPWiki team maintains a <a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/mvn_cheat-sheet.txt?view=co">cheat sheet</a> of common Maven tasks for this project.</p>
-<p>Production distributions (see <a href="../ppmc/how_to_release.html">Release Page</a>) still use the Apache Ant "ant dist" target, after the build is done using Maven.</p>
+<p>Apache JSPWiki is a <a href="http://maven.apache.org">Maven</a>-based project and 
+builds using the same commands as other Maven projects.  The JSPWiki team maintains 
+a <a href="http://svn.apache.org/viewvc/jspwiki/trunk/mvn_cheat-sheet.txt?view=co">cheat sheet</a> 
+of common Maven tasks for this project.</p>
+<p>Production distributions (see <a href="../ppmc/how_to_release.html">Release Page</a>) still use the Apache Ant "ant dist" target, after 
+the build is done using Maven.</p>
 <h3 id="coding-standards">Coding standards:</h3>
 <ul>
-<li>Use the <a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml?view=co&content-type=text%2Fplain">Eclipse</a> 
-and <a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml?view=co&revision=1486481&content-type=text%2Fplain">Checkstyle</a> formatters (both automatically incorporated when you run mvn eclipse:eclipse on the project.)</li>
+<li>Use the <a href="http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml?view=co&content-type=text%2Fplain">Eclipse</a> 
+and <a href="http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml?view=co&revision=1486481&content-type=text%2Fplain">Checkstyle</a> 
+formatters (both automatically incorporated when you run mvn eclipse:eclipse on the project.)</li>
 <li>Remove trailing whitespace and whitespace on empty lines</li>
 </ul>
 <h3 id="commits">Commits:</h3>

Modified: websites/staging/jspwiki/trunk/content/ppmc/how_to_release.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/ppmc/how_to_release.html (original)
+++ websites/staging/jspwiki/trunk/content/ppmc/how_to_release.html Fri Sep 20 18:46:15 2013
@@ -101,7 +101,7 @@
 <h2 id="first-time-release-managers">First time release managers</h2>
 <ol>
 <li>Generate <a href="http://www.apache.org/dev/release-signing.html#generate">PGP code signing keys</a></li>
-<li>Add the PGP code signing keys to the <a href="http://svn.apache.org/repos/asf/incubator/jspwiki/dist/KEYS">KEYS file</a> as documented on the 
+<li>Add the PGP code signing keys to the <a href="http://svn.apache.org/repos/asf/jspwiki/dist/KEYS">KEYS file</a> as documented on the 
 <a href="http://www.apache.org/dev/release-signing.html#keys-policy">Infrastructure site</a></li>
 <li>Put in a <a href="https://issues.apache.org/jira/browse/INFRA">Infrastructure JIRA</a> asking to get added to the incubator unix 
 group on people.apache.org <!--and the jspwiki deployer role for Nexus--></li>
@@ -135,7 +135,7 @@ you'll have to enter your login password
     1. Update ReleaseNotes with [new release notes from JIRA][], select the 
 version and set the style to Text
     2. Commit the updated ReleaseNotes with message: "Preparing for release 
-X.Y.Z-incubating"
+X.Y.Z"
 -->
 
 <!---
@@ -143,21 +143,21 @@ X.Y.Z-incubating"
 
     1. Create a branch for the X.Y release series
 
-            svn copy https://svn.apache.org/repos/asf/incubator/jspwiki/trunk \
-            https://svn.apache.org/repos/asf/incubator/jspwiki/branches/jspwiki-X.Y -m "Branching for X.Y releases"
+            svn copy https://svn.apache.org/repos/asf/jspwiki/trunk \
+            https://svn.apache.org/repos/asf/jspwiki/branches/jspwiki-X.Y -m "Branching for X.Y releases"
 
     2. Bump the version number in trunk and commit (the update-versions script 
 mangles the whitespace in the root XML element):
 
-            sed -i "" -e "s/X.Y.0-incubating-SNAPSHOT/X.Y+1.0-incubating-SNAPSHOT/" pom.xml
+            sed -i "" -e "s/X.Y.0-SNAPSHOT/X.Y+1.0-SNAPSHOT/" pom.xml
 
     3. Checkout the release branch:
 
-            svn checkout https://svn.apache.org/repos/asf/incubator/jspwiki/branches/jspwiki-X.Y
+            svn checkout https://svn.apache.org/repos/asf/jspwiki/branches/jspwiki-X.Y
 
   3. Remove -SNAPSHOT from the release branch and commit
 
-        sed -i "" -e "s/X.Y.Z-incubating-SNAPSHOT/X.Y.Z-incubating/" pom.xml
+        sed -i "" -e "s/X.Y.Z-SNAPSHOT/X.Y.Z/" pom.xml
 
   4. Deploy to Nexus Staging Repository
 
@@ -171,7 +171,7 @@ mangles the whitespace in the root XML e
 on the left under Build Promotion.
     4. Select org.apache.jspwiki from the list of repositories, select the 
 current repository and delete any asc.md5/asc.sha1 files. Then click Close 
-using "Apache JSPWiki X.Y.Z-incubating" as the description to allow others 
+using "Apache JSPWiki X.Y.Z" as the description to allow others
 to see the repository.
 -->
 
@@ -196,7 +196,7 @@ to see the repository.
 <li>
 <p>Copy the src distribution file and checksums to people.apache.org,
 excluding the asc.md5/asc.sha1 files:</p>
-<div class="codehilite"><pre><span class="n">scp</span> <span class="n">target</span><span class="o">/*</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="o">*</span> <span class="n">username</span><span class="p">@</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span><span class="o">~/</span><span class="n">public_html</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span><span class="o">-</span><span class="n">candidate</span><span class="o">-</span>$<span class="n">RC</span>
+<div class="codehilite"><pre><span class="n">scp</span> <span class="n">target</span><span class="o">/*</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="o">*</span> <span class="n">username</span><span class="p">@</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span><span class="o">~/</span><span class="n">public_html</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">candidate</span><span class="o">-</span>$<span class="n">RC</span>
 </pre></div>
 
 
@@ -213,26 +213,25 @@ excluding the asc.md5/asc.sha1 files:</p
 excluding the asc.md5/asc.sha1 files:
 
             rm target/*asc.*
-            scp target/*.tar.gz* username@people.apache.org:~/public_html/jspwiki-X.Y.Z-incubating-candidate-$RC
+            scp target/*.tar.gz* username@people.apache.org:~/public_html/jspwiki-X.Y.Z-candidate-$RC
 -->
 
 <ol>
 <li>
 <p>Tag the release candidate:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">copy</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">branches</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="o">/</span> <span class="o">\</span>
-<span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">tags</span><span class="o">/</span><span class="n">release</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span><span class="o">/</span> <span class="o">-</span><span class="n">m</span> &quot;<span class="n">jspwiki</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">in
 cubating</span> <span class="n">release</span><span class="p">.</span>&quot;
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">copy</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">branches</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="o">/</span> <span class="o">\</span>
+<span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">tags</span><span class="o">/</span><span class="n">release</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">/</span> <span class="o">-</span><span class="n">m</span> &quot;<span class="n">jspwiki</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span> <span class="n">release</span><span class="p">.</span>&quot;
 </pre></div>
 
 
 </li>
 </ol>
 <h2 id="run-a-vote">Run a vote</h2>
-<p>Send the following to jspwiki-dev@incubator.apache.org and 
-general@incubator.apache.org:</p>
+<p>Send the following to dev@jspwiki.apache.org:</p>
 <!---
-    Subject: [VOTE] Release JSPWiki version X.Y.Z-incubating
+    Subject: [VOTE] Release JSPWiki version X.Y.Z
 
-    This is an incubator release for Apache JSPWiki, version X.Y.Z-incubating.
+    This is a release for Apache JSPWiki, version X.Y.Z.
 
     It fixes the following issues:
     https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=<REPLACE>
@@ -242,21 +241,21 @@ general@incubator.apache.org:</p>
     Note that we are voting upon the source (tag), binaries are provided for convenience.
 
     Source and binary files:
-    http://people.apache.org/~<REPLACE>/jspwiki-X.Y.Z-incubating-candidate-$RC
+    http://people.apache.org/~<REPLACE>/jspwiki-X.Y.Z-candidate-$RC
 
     Maven staging repo:
     https://repository.apache.org/content/repositories/orgapachejspwiki-<REPLACE>/
 
     The tag to be voted upon:
-    http://svn.apache.org/repos/asf/incubator/jspwiki/tags/release-X.Y.Z-incubating/
+    http://svn.apache.org/repos/asf/jspwiki/tags/release-X.Y.Z/
 
     JSPWiki's KEYS file containing PGP keys we use to sign the release:
     http://www.apache.org/dist/incubator/jspwiki/KEYS
 -->
 
-<div class="codehilite"><pre><span class="n">Subject</span><span class="p">:</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">Release</span> <span class="n">JSPWiki</span> <span class="n">version</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span>
+<div class="codehilite"><pre><span class="n">Subject</span><span class="p">:</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">Release</span> <span class="n">JSPWiki</span> <span class="n">version</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span>
 
-<span class="n">This</span> <span class="n">is</span> <span class="n">an</span> <span class="n">incubator</span> <span class="n">release</span> <span class="k">for</span> <span class="n">Apache</span> <span class="n">JSPWiki</span><span class="p">,</span> <span class="n">version</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span><span class="p">.</span>
+<span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">release</span> <span class="k">for</span> <span class="n">Apache</span> <span class="n">JSPWiki</span><span class="p">,</span> <span class="n">version</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="p">.</span>
 
 <span class="n">It</span> <span class="n">fixes</span> <span class="n">the</span> <span class="n">following</span> <span class="n">issues</span><span class="p">:</span>
 <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">issues</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">jira</span><span class="o">/</span><span class="n">secure</span><span class="o">/</span><span class="n">ReleaseNote</span><span class="p">.</span><span class="n">jspa</span>?<span class="n">projectId</span><span class="p">=</span>12310732<span class="o">&amp;</span><span class="n">version</span><span class="p">=</span><span class="o">&lt;</span><span class="n">REPLACE</span><span class="o">&gt;</span>
@@ -266,18 +265,17 @@ general@incubator.apache.org:</p>
 <span class="n">Note</span> <span class="n">that</span> <span class="n">we</span> <span class="n">are</span> <span class="n">voting</span> <span class="n">upon</span> <span class="n">the</span> <span class="n">source</span> <span class="p">(</span><span class="n">tag</span><span class="p">),</span> <span class="n">binaries</span> <span class="n">are</span> <span class="n">provided</span> <span class="k">for</span> <span class="n">convenience</span><span class="p">.</span>
 
 <span class="n">Source</span> <span class="n">and</span> <span class="n">binary</span> <span class="n">files</span><span class="p">:</span>
-<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/~&lt;</span><span class="n">REPLACE</span><span class="o">&gt;/</span><span class="n">jspwiki</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span><span class="o">-</span><span class="n">candidate</span><span class="o">-</span>$<span class="n">RC</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/~&lt;</span><span class="n">REPLACE</span><span class="o">&gt;/</span><span class="n">jspwiki</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">candidate</span><span class="o">-</span>$<span class="n">RC</span>
 
 <span class="n">The</span> <span class="n">tag</span> <span class="n">to</span> <span class="n">be</span> <span class="n">voted</span> <span class="n">upon</span><span class="p">:</span>
-<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">tags</span><span class="o">/</span><span class="n">release</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span><span class="o">/</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">tags</span><span class="o">/</span><span class="n">release</span><span class="o">-</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">/</span>
 
 <span class="n">JSPWiki</span><span class="o">&#39;</span><span class="n">s</span> <span class="n">KEYS</span> <span class="n">file</span> <span class="n">containing</span> <span class="n">PGP</span> <span class="n">keys</span> <span class="n">we</span> <span class="n">use</span> <span class="n">to</span> <span class="nb">sign</span> <span class="n">the</span> <span class="n">release</span><span class="p">:</span>
 <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">KEYS</span>
 </pre></div>
 
 
-<p>Note that the Incubator PMC needs to vote upon the release after a successful 
-PPMC vote before any release can be made official.</p>
+<p>Note that the PMC needs to vote upon the release before any release can be made official.</p>
 <h2 id="roll-out">Roll Out</h2>
 <p>If the vote passes, roll out the release:</p>
 <!---
@@ -285,7 +283,7 @@ PPMC vote before any release can be made
     1. Login to <https://repository.apache.org> and select Staging Repositories 
 on the left under Build Promotion.
     2. Select the repository that was closed earlier, and click Release, using 
-the description "Apache jspwiki X.Y.Z-incubating artifacts"
+the description "Apache jspwiki X.Y.Z artifacts"
 -->
 
 <ol>
@@ -295,18 +293,18 @@ the description "Apache jspwiki X.Y.Z-in
 <span class="n">VERSION</span><span class="p">=</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span>
 <span class="n">PREVIOUS_VERSION</span><span class="p">=</span><span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span>
 <span class="n">CANDIDATE</span><span class="p">=</span><span class="n">C</span>
-<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">~/</span><span class="n">public_html</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span><span class="o">-</span><span class="n">incubating</span><span class="o">-</span><span class="n">candidate</span><span class="o">-</span>$<span class="n">CANDIDATE</span> <span class="o">\</span>
-<span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span><span class="o">-</span><span class="n">incubating</span>
+<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">~/</span><span class="n">public_html</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span><span class="o">-</span><span class="n">candidate</span><span class="o">-</span>$<span class="n">CANDIDATE</span> <span class="o">\</span>
+<span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span>
 <span class="n">cd</span> <span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span>
-<span class="n">chgrp</span> <span class="o">-</span><span class="n">R</span> <span class="n">incubator</span> <span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span><span class="o">-</span><span class="n">incubating</span>
-<span class="n">chmod</span> <span class="o">-</span><span class="n">R</span> <span class="n">g</span><span class="o">+</span><span class="n">w</span> <span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span><span class="o">-</span><span class="n">incubating</span>
-<span class="n">rm</span> <span class="o">-</span><span class="n">r</span> <span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span>$<span class="n">PREVIOUS_VERSION</span><span class="o">-</span><span class="n">incubating</span> # <span class="n">remove</span> <span class="n">older</span> <span class="n">versions</span>
+<span class="n">chgrp</span> <span class="o">-</span><span class="n">R</span> <span class="n">jspwiki</span> <span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span>
+<span class="n">chmod</span> <span class="o">-</span><span class="n">R</span> <span class="n">g</span><span class="o">+</span><span class="n">w</span> <span class="n">jspwiki</span><span class="o">-</span>$<span class="n">VERSION</span>
+<span class="n">rm</span> <span class="o">-</span><span class="n">r</span> <span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">-</span>$<span class="n">PREVIOUS_VERSION</span> # <span class="n">remove</span> <span class="n">older</span> <span class="n">versions</span>
 </pre></div>
 
 
 <p>The last line is to remove the previous version, since only the most recent 
 version on a particular branch should be in the dist directory. Older versions 
-are <a href="http://archive.apache.org/dist/incubator/jspwiki/">archived</a> automatically.</p>
+are <a href="http://archive.apache.org/dist/jspwiki/">archived</a> automatically.</p>
 </li>
 <li>
 <p>Wait 24 hours for mirrors to sync</p>
@@ -322,7 +320,7 @@ are <a href="http://archive.apache.org/d
 
 </li>
 <li>
-<p>Copy javadocs to https://svn.apache.org/repos/infra/websites/production/jspwiki/documentation/javadocs/X.Y.Z-incubating</p>
+<p>Copy javadocs to https://svn.apache.org/repos/infra/websites/production/jspwiki/documentation/javadocs/X.Y.Z</p>
 </li>
 <li>Add a link to index.html of the javadoc in the documentation/javadoc.mdtext page</li>
 </ol>
@@ -334,24 +332,23 @@ changes on the front page of the site</p
 </ol>
 <h2 id="announce-the-release">Announce the release</h2>
 <p>Send the following from an apache.org address to announce@apache.org, 
-jspwiki-user@incubator.apache.org, jspwiki-dev@incubator.apache.org:</p>
-<div class="codehilite"><pre><span class="n">Subject</span><span class="p">:</span> <span class="p">[</span><span class="n">ANNOUNCE</span><span class="p">]</span> <span class="n">Apache</span> <span class="n">JSPWiki</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span> <span class="n">released</span>
+user@jspwiki.apache.org, dev@jspwiki.apache.org:</p>
+<div class="codehilite"><pre><span class="n">Subject</span><span class="p">:</span> <span class="p">[</span><span class="n">ANNOUNCE</span><span class="p">]</span> <span class="n">Apache</span> <span class="n">JSPWiki</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span> <span class="n">released</span>
 
-<span class="n">The</span> <span class="n">Apache</span> <span class="n">JSPWiki</span> <span class="n">team</span> <span class="n">is</span> <span class="n">pleased</span> <span class="n">to</span> <span class="n">announce</span> <span class="n">the</span> <span class="n">release</span> <span class="n">of</span> <span class="n">JSPWiki</span>
-<span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="o">-</span><span class="n">incubating</span> <span class="n">from</span> <span class="n">the</span> <span class="n">Apache</span> <span class="n">Incubator</span><span class="p">.</span>
+<span class="n">The</span> <span class="n">Apache</span> <span class="n">JSPWiki</span> <span class="n">team</span> <span class="n">is</span> <span class="n">pleased</span> <span class="n">to</span> <span class="n">announce</span> <span class="n">the</span> <span class="n">release</span> <span class="n">of</span> <span class="n">JSPWiki</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span><span class="p">.</span>
 
 <span class="n">This</span> <span class="n">is</span> <span class="n">the</span> <span class="o">&lt;</span><span class="n">REPLACE</span><span class="o">&gt;</span> <span class="n">release</span> <span class="n">of</span> <span class="n">Apache</span> <span class="n">JSPWiki</span><span class="p">,</span> <span class="n">a</span> <span class="n">feature</span><span class="o">-</span><span class="n">rich</span> <span class="n">and</span> 
 <span class="n">extensible</span> <span class="n">WikiWiki</span> <span class="n">engine</span> <span class="n">built</span> <span class="n">around</span> <span class="n">the</span> <span class="n">standard</span> <span class="n">J2EE</span> <span class="n">components</span><span class="p">.</span>
 
 <span class="n">The</span> <span class="n">release</span> <span class="n">is</span> <span class="n">available</span> <span class="n">here</span><span class="p">:</span>
-<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dyn</span><span class="o">/</span><span class="n">closer</span><span class="p">.</span><span class="n">cgi</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dyn</span><span class="o">/</span><span class="n">closer</span><span class="p">.</span><span class="n">cgi</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span>
 
 <span class="n">The</span> <span class="n">full</span> <span class="n">change</span> <span class="nb">log</span> <span class="n">is</span> <span class="n">available</span> <span class="n">here</span><span class="p">:</span>
 <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">issues</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">jira</span><span class="o">/</span><span class="n">browse</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">fixforversion</span><span class="o">/&lt;</span><span class="n">REPLACE</span><span class="o">&gt;</span>
 
 <span class="n">We</span> <span class="n">welcome</span> <span class="n">your</span> <span class="n">help</span> <span class="n">and</span> <span class="n">feedback</span><span class="p">.</span> <span class="n">For</span> <span class="n">more</span> <span class="n">information</span> <span class="n">on</span> <span class="n">how</span> <span class="n">to</span>
 <span class="n">report</span> <span class="n">problems</span><span class="p">,</span> <span class="n">and</span> <span class="n">to</span> <span class="n">get</span> <span class="n">involved</span><span class="p">,</span> <span class="n">visit</span> <span class="n">the</span> <span class="n">project</span> <span class="n">website</span> <span class="n">at</span>
-<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">incubator</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">jspwiki</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>
 
 <span class="n">The</span> <span class="n">Apache</span> <span class="n">JSPWiki</span> <span class="n">Team</span>
 </pre></div>



Mime
View raw message