jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1525093 - in /jspwiki/site/trunk/content: community/mailing_lists.mdtext community/people.mdtext development/source_and_guide.mdtext ppmc/how_to_release.mdtext
Date Fri, 20 Sep 2013 18:46:12 GMT
Author: juanpablo
Date: Fri Sep 20 18:46:11 2013
New Revision: 1525093

URL: http://svn.apache.org/r1525093
Log:
removing incubator references, hopefully last ones

Modified:
    jspwiki/site/trunk/content/community/mailing_lists.mdtext
    jspwiki/site/trunk/content/community/people.mdtext
    jspwiki/site/trunk/content/development/source_and_guide.mdtext
    jspwiki/site/trunk/content/ppmc/how_to_release.mdtext

Modified: jspwiki/site/trunk/content/community/mailing_lists.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/site/trunk/content/community/mailing_lists.mdtext?rev=1525093&r1=1525092&r2=1525093&view=diff
==============================================================================
--- jspwiki/site/trunk/content/community/mailing_lists.mdtext (original)
+++ jspwiki/site/trunk/content/community/mailing_lists.mdtext Fri Sep 20 18:46:11 2013
@@ -3,9 +3,9 @@ Title: Mailing lists
 ## JSPWiki-user
 
 The jspwiki-user mailing list is hosted at Apache. You can join it by sending 
-an e-mail to <jspwiki-user-subscribe@incubator.apache.org>. You can also browse
+an e-mail to <user-subscribe@jspwiki.apache.org>. 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>.
 
@@ -15,8 +15,8 @@ This is the list for JSPWiki developers 
 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 
-<jspwiki-dev-subscribe@incubator.apache.org>. The 
-<a href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/" 
+<dev-subscribe@jspwiki.apache.org>. The
+<a href="http://mail-archives.apache.org/mod_mbox/jspwiki-dev/"
 class="external">list archives</a> are also browseable.
 
 ## JSPWiki-commits
@@ -24,15 +24,15 @@ class="external">list archives</a> are a
 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 
-<jspwiki-commits-subscribe@incubator.apache.org>. Again, the 
+<commits-subscribe@jspwiki.apache.org>. 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.
 
 ## Unsubscribing
 
 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.
 
 ## Other resources

Modified: jspwiki/site/trunk/content/community/people.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/site/trunk/content/community/people.mdtext?rev=1525093&r1=1525092&r2=1525093&view=diff
==============================================================================
--- jspwiki/site/trunk/content/community/people.mdtext (original)
+++ jspwiki/site/trunk/content/community/people.mdtext Fri Sep 20 18:46:11 2013
@@ -4,31 +4,28 @@ Title: People
 
 The current JSPWiki committer list:
 
+  * Murray Altheims
   * Dirk Frederickx
   * Florian Holeczek
   * Janne Jalkanen
   * Andrew Jaquith
   * <a href="http://www.jroller.com/gmazza/">Glen Mazza</a>
   * Harry Metske
+  * Craig Russell
   * Juan Pablo Santos
   * Christoph Sauer
   
-As esteemed mentors we have:
-
-  * Sam Ruby
-  * Craig Russell
-  * Siegfried Goeschl
   
 And, of course, all the fine people of the jspwiki-dev [mailing list]!
 
-## PPMC
+## PMC
 
-The Podling Project Management Committee consists of 
+The Project Management Committee consists of 
 
+  * Murray Altheims
   * Dirk Frederickx
   * Florian Holeczek
   * Andrew Jaquith
-  * Janne Jalkanen
   * Glen Mazza
   * Harry Metske
   * Craig Russell

Modified: jspwiki/site/trunk/content/development/source_and_guide.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/site/trunk/content/development/source_and_guide.mdtext?rev=1525093&r1=1525092&r2=1525093&view=diff
==============================================================================
--- jspwiki/site/trunk/content/development/source_and_guide.mdtext (original)
+++ jspwiki/site/trunk/content/development/source_and_guide.mdtext Fri Sep 20 18:46:11 2013
@@ -2,16 +2,16 @@ Title: Getting and Building JSPWiki Sour
 
 ## Getting JSPWiki Source Code
 
-JSPWiki source code (<a class="external" href="http://svn.apache.org/viewvc/incubator/jspwiki/">
+JSPWiki source code (<a class="external" href="http://svn.apache.org/viewvc/jspwiki/">
 browse</a>) is maintained using Apache Subversion.
 
 Checkout the code using:
 
-    svn co http://svn.apache.org/repos/asf/incubator/jspwiki/trunk jspwiki
+    svn co http://svn.apache.org/repos/asf/jspwiki/trunk jspwiki
     
 There is also a European mirror, so you can alternatively use:
 
-    svn co http://svn.eu.apache.org/repos/asf/incubator/jspwiki/trunk jspwiki
+    svn co http://svn.eu.apache.org/repos/asf/jspwiki/trunk jspwiki
     
 Change http to https if you are a developer intending to make commits
 
@@ -19,14 +19,19 @@ See the [Edit Website][] page for the we
 
 ## Building JSPWiki
 
-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.
+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.
 
-Production distributions (see [Release Page][]) still use the Apache Ant "ant dist" target,
after the build is done using Maven.
+Production distributions (see [Release Page][]) still use the Apache Ant "ant dist" target,
after 
+the build is done using Maven.
 
 ### Coding standards:
 
-  * 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.)
+  * 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.)
   * Remove trailing whitespace and whitespace on empty lines
 
 ### Commits:

Modified: jspwiki/site/trunk/content/ppmc/how_to_release.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/site/trunk/content/ppmc/how_to_release.mdtext?rev=1525093&r1=1525092&r2=1525093&view=diff
==============================================================================
--- jspwiki/site/trunk/content/ppmc/how_to_release.mdtext (original)
+++ jspwiki/site/trunk/content/ppmc/how_to_release.mdtext Fri Sep 20 18:46:11 2013
@@ -48,7 +48,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"
 -->
   
 <!---
@@ -56,21 +56,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
 
@@ -84,7 +84,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.
 -->
   2. Deploy source and binary distributions
@@ -100,7 +100,7 @@ to see the repository.
     3. Copy the src distribution file and checksums to people.apache.org,
 excluding the asc.md5/asc.sha1 files:
 
-            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
 
 <!---
     3. Generate the bin distribution:
@@ -111,22 +111,21 @@ excluding the asc.md5/asc.sha1 files:
 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
 -->
   3. Tag the release candidate:
 
-        svn copy https://svn.apache.org/repos/asf/incubator/jspwiki/branches/jspwiki-X.Y/
\
-        https://svn.apache.org/repos/asf/incubator/jspwiki/tags/release-X.Y.Z-incubating/
-m "jspwiki X.Y.Z-incubating release."
+        svn copy https://svn.apache.org/repos/asf/jspwiki/branches/jspwiki-X.Y/ \
+        https://svn.apache.org/repos/asf/jspwiki/tags/release-X.Y.Z/ -m "jspwiki X.Y.Z release."
 
 ## Run a vote
 
-Send the following to jspwiki-dev@incubator.apache.org and 
-general@incubator.apache.org:
+Send the following to dev@jspwiki.apache.org:
 
 <!---
-    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>
@@ -136,21 +135,21 @@ general@incubator.apache.org:
     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
 -->
 
-    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>
@@ -160,16 +159,15 @@ general@incubator.apache.org:
     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
 
     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
     
-Note that the Incubator PMC needs to vote upon the release after a successful 
-PPMC vote before any release can be made official.
+Note that the PMC needs to vote upon the release before any release can be made official.
 
 ## Roll Out
 
@@ -180,7 +178,7 @@ If the vote passes, roll out the release
     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"
 -->
   1. Publish src and bin distributions to the [mirrors][]:
 
@@ -188,12 +186,12 @@ the description "Apache jspwiki X.Y.Z-in
         VERSION=X.Y.Z
         PREVIOUS_VERSION=X.Y.Z
         CANDIDATE=C
-        cp -r ~/public_html/jspwiki-$VERSION-incubating-candidate-$CANDIDATE \
-        /www/www.apache.org/dist/incubator/jspwiki/jspwiki-$VERSION-incubating
+        cp -r ~/public_html/jspwiki-$VERSION-candidate-$CANDIDATE \
+        /www/www.apache.org/dist/incubator/jspwiki/jspwiki-$VERSION
         cd /www/www.apache.org/dist/incubator/jspwiki
-        chgrp -R incubator jspwiki-$VERSION-incubating
-        chmod -R g+w jspwiki-$VERSION-incubating
-        rm -r /www/www.apache.org/dist/incubator/jspwiki/jspwiki-$PREVIOUS_VERSION-incubating
# remove older versions
+        chgrp -R jspwiki jspwiki-$VERSION
+        chmod -R g+w jspwiki-$VERSION
+        rm -r /www/www.apache.org/dist/incubator/jspwiki/jspwiki-$PREVIOUS_VERSION # remove
older versions
 
     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 
@@ -206,7 +204,7 @@ are [archived][] automatically.
 
             mvn javadoc:javadoc
 
-    2. Copy javadocs to https://svn.apache.org/repos/infra/websites/production/jspwiki/documentation/javadocs/X.Y.Z-incubating
+    2. Copy javadocs to https://svn.apache.org/repos/infra/websites/production/jspwiki/documentation/javadocs/X.Y.Z
     3. Add a link to index.html of the javadoc in the documentation/javadoc.mdtext page
 
   4. Post link to the full release notes along with links to the major JIRA 
@@ -215,25 +213,24 @@ changes on the front page of the site
 ## Announce the release
 
 Send the following from an apache.org address to announce@apache.org, 
-jspwiki-user@incubator.apache.org, jspwiki-dev@incubator.apache.org:
+user@jspwiki.apache.org, dev@jspwiki.apache.org:
 
-    Subject: [ANNOUNCE] Apache JSPWiki X.Y.Z-incubating released
+    Subject: [ANNOUNCE] Apache JSPWiki X.Y.Z released
     
-    The Apache JSPWiki team is pleased to announce the release of JSPWiki
-    X.Y.Z-incubating from the Apache Incubator.
+    The Apache JSPWiki team is pleased to announce the release of JSPWiki X.Y.Z.
     
     This is the <REPLACE> release of Apache JSPWiki, a feature-rich and 
     extensible WikiWiki engine built around the standard J2EE components.
     
     The release is available here:
-    http://www.apache.org/dyn/closer.cgi/incubator/jspwiki/
+    http://www.apache.org/dyn/closer.cgi/jspwiki/
     
     The full change log is available here:
     https://issues.apache.org/jira/browse/jspwiki/fixforversion/<REPLACE>
     
     We welcome your help and feedback. For more information on how to
     report problems, and to get involved, visit the project website at
-    http://incubator.apache.org/jspwiki/
+    http://jspwiki.apache.org/
     
     The Apache JSPWiki Team
 
@@ -244,14 +241,14 @@ jspwiki-user@incubator.apache.org, jspwi
 
 
 [PGP code signing keys]: http://www.apache.org/dev/release-signing.html#generate
-[KEYS file]: http://svn.apache.org/repos/asf/incubator/jspwiki/dist/KEYS
+[KEYS file]: http://svn.apache.org/repos/asf/jspwiki/dist/KEYS
 [Infrastructure site]: http://www.apache.org/dev/release-signing.html#keys-policy
 [Infrastructure JIRA]: https://issues.apache.org/jira/browse/INFRA
 [setup the ssh keys]: http://www.thegeekstuff.com/2008/11/3-steps-to-perform-ssh-login-without-password-using-ssh-keygen-ssh-copy-id/
 
 [new release notes from JIRA]: https://issues.apache.org/jira/secure/ConfigureReleaseNote.jspa?projectId=12310732
 
-[archived]: http://archive.apache.org/dist/incubator/jspwiki/
+[archived]: http://archive.apache.org/dist/jspwiki/
 [mirrors]: http://www.apache.org/dev/mirrors.html
 
 [next version number to JIRA]: https://issues.apache.org/jira/plugins/servlet/project-config/jspwiki/versions



Mime
View raw message