maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r860084 [2/39] - in /websites/staging/maven/trunk/content: ./ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/2.0.1/ docs/2.0.10/ docs/2.0.11/ docs/2.0.2/ docs/2.0.3/ docs/2.0.4/ docs/2.0.5/ docs...
Date Sat, 27 Apr 2013 07:29:25 GMT
Modified: websites/staging/maven/trunk/content/benefits-of-using-maven.html
==============================================================================
--- websites/staging/maven/trunk/content/benefits-of-using-maven.html (original)
+++ websites/staging/maven/trunk/content/benefits-of-using-maven.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -13,7 +13,7 @@
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
         <meta name="author" content="Jason van Zyl" />
-        <meta name="Date-Revision-yyyymmdd" content="20130423" />
+        <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -43,7 +43,7 @@
         Benefits of using Maven
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -231,7 +231,81 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Benefits of using Maven<a name="Benefits_of_using_Maven"></a></h2><div class="section"><h3>John Casey<a name="John_Casey"></a></h3><ol style="list-style-type: decimal"><li>standardization</li><li>reuse</li><li>consistency wrt build output</li><li>dependency management</li><li>scalability (lower level of additional info/code to add a new step to the build process)</li></ol></div><div class="section"><h3>Ashley williams<a name="Ashley_williams"></a></h3><ol style="list-style-type: decimal"><li>Dependency management</li><li>Build lifecycle management</li><li>Large existing repository</li><li>Eclipse aware (sort of)</li><li>Well documented (hopefully soon)</li></ol></div><div class="section"><h3>Eric Hartmann<a name="Eric_Hartmann"></a></h3><ol style="list-style-type: decimal"><li>One directory layout,</li><li>A single way to define dependencies,</li><li>Setting up a project is really fast,</li><li>99% of my needs are available out of the box,</l
 i><li>Transitive dependencies ! :-)</li></ol></div><div class="section"><h3>Vincent Massol<a name="Vincent_Massol"></a></h3><ol style="list-style-type: decimal"><li>common build structure</li><li>build best practices enforcement (shared build meme)</li><li>automated build of application, from source code to pre-production platform =&gt; fast time to market with reduced risks</li><li>works well with distributed teams ;-) Location doesn't matter.</li></ol><p>Compared to Ant:</p><ol style="list-style-type: decimal"><li>Higher level of reusability between builds</li><li>Faster turn around time to set up a powerful build (once you're used to Maven)</li><li>Less maintenance</li><li>Shared build meme. I know how to build any maven project</li><li>Greater momentum: Ant is now legacy and not moving fast ahead. Maven is forging ahead fast and there's a potential of having lots of high-value tools around Maven (CI, Dashboard project, IDE integration, etc).</li></ol></div><div class="se
 ction"><h3>Emmanuel Venisse<a name="Emmanuel_Venisse"></a></h3><ol style="list-style-type: decimal"><li>All artifacts are versionned and store in a repository</li><li>build process is standardized for all projects</li><li>a lot of goals are available so it isn't necessary to develop some specific build process part contrary to ANT we can reuse existing ANT tasks in build process with antrun plugin</li><li>it provide quality project information with generated site</li><li>Easy to learn and use</li></ol></div><div class="section"><h3>David Jackman<a name="David_Jackman"></a></h3><ol style="list-style-type: decimal"><li>Dependency management</li><li>Makes the build process much easier at the project level (i.e. don't have to create very much for each project for Maven to build it correctly, and those things you do create are more declarative than functional)</li><li>Automatic project web sites with consistent information about each project</li><li>Recommended standards and best
  practices for project layout and definition</li></ol></div><div class="section"><h3>Jesse Mcconnell<a name="Jesse_Mcconnell"></a></h3><ol style="list-style-type: decimal"><li>Promotes modular design of code. by making it simple to manage mulitple projects it allows the design to be laid out into muliple logical parts, weaving these parts together through the use of dependency tracking in pom files.</li><li>Enforces modular design of code. it is easy to pay lipservice to modular code, but when the code is in seperate compiling projects it is impossible to cross pollinate references between modules of code unless you specifically allow for it in your dependency management... there is no 'I'll just do this now and fix it later' implementations.</li><li>Dependency Management is clearly declared. with the dependency management mechanism you have to try to screw up your jar versioning...there is none of the classic problem of 'which version of this vendor jar is this?' And settin
 g it up on an existing project rips the top off of the existing mess if it exists when you are forced to make 'unknown' versions in your repository to get things up and running...that or lie to yourself that you know the actual version of ABC.jar.</li><li>strong typed life cycle there is a strong defined lifecycle that a software system goes thru from the initiation of a build to the end... and the users are allowed to mix and match their system to the lifecycle instead of cobble together their own lifecycle.. this has the additional benefit of allowing people to move from one project to another and speak using the same vocabulary in terms of software building</li></ol></div><div class="section"><h3>Henning<a name="Henning"></a></h3><ol style="list-style-type: decimal"><li>quick project setup, no complicated build.xml files, just a POM and go</li><li>all developers in a project use the same jar dependencies due to centralized POM.</li><li>getting a number of reports and metr
 ics for a project &quot;for free&quot;</li><li>reduce the size of source distributions, because jars can be pulled from a central location</li></ol></div><div class="section"><h3>Roberto Castro<a name="Roberto_Castro"></a></h3><ol style="list-style-type: decimal"><li>Consistency in artifact naming</li><li>Use of remote repository</li><li>Web site generation</li></ol></div></div>
+        <div class="section">
+<h2>Benefits of using Maven<a name="Benefits_of_using_Maven"></a></h2>
+<div class="section">
+<h3>John Casey<a name="John_Casey"></a></h3>
+<ol style="list-style-type: decimal">
+<li>standardization</li>
+<li>reuse</li>
+<li>consistency wrt build output</li>
+<li>dependency management</li>
+<li>scalability (lower level of additional info/code to add a new step to the build process)</li></ol></div>
+<div class="section">
+<h3>Ashley williams<a name="Ashley_williams"></a></h3>
+<ol style="list-style-type: decimal">
+<li>Dependency management</li>
+<li>Build lifecycle management</li>
+<li>Large existing repository</li>
+<li>Eclipse aware (sort of)</li>
+<li>Well documented (hopefully soon)</li></ol></div>
+<div class="section">
+<h3>Eric Hartmann<a name="Eric_Hartmann"></a></h3>
+<ol style="list-style-type: decimal">
+<li>One directory layout,</li>
+<li>A single way to define dependencies,</li>
+<li>Setting up a project is really fast,</li>
+<li>99% of my needs are available out of the box,</li>
+<li>Transitive dependencies ! :-)</li></ol></div>
+<div class="section">
+<h3>Vincent Massol<a name="Vincent_Massol"></a></h3>
+<ol style="list-style-type: decimal">
+<li>common build structure</li>
+<li>build best practices enforcement (shared build meme)</li>
+<li>automated build of application, from source code to pre-production platform =&gt; fast time to market with reduced risks</li>
+<li>works well with distributed teams ;-) Location doesn't matter.</li></ol>
+<p>Compared to Ant:</p>
+<ol style="list-style-type: decimal">
+<li>Higher level of reusability between builds</li>
+<li>Faster turn around time to set up a powerful build (once you're used to Maven)</li>
+<li>Less maintenance</li>
+<li>Shared build meme. I know how to build any maven project</li>
+<li>Greater momentum: Ant is now legacy and not moving fast ahead. Maven is forging ahead fast and there's a potential of having lots of high-value tools around Maven (CI, Dashboard project, IDE integration, etc).</li></ol></div>
+<div class="section">
+<h3>Emmanuel Venisse<a name="Emmanuel_Venisse"></a></h3>
+<ol style="list-style-type: decimal">
+<li>All artifacts are versionned and store in a repository</li>
+<li>build process is standardized for all projects</li>
+<li>a lot of goals are available so it isn't necessary to develop some specific build process part contrary to ANT we can reuse existing ANT tasks in build process with antrun plugin</li>
+<li>it provide quality project information with generated site</li>
+<li>Easy to learn and use</li></ol></div>
+<div class="section">
+<h3>David Jackman<a name="David_Jackman"></a></h3>
+<ol style="list-style-type: decimal">
+<li>Dependency management</li>
+<li>Makes the build process much easier at the project level (i.e. don't have to create very much for each project for Maven to build it correctly, and those things you do create are more declarative than functional)</li>
+<li>Automatic project web sites with consistent information about each project</li>
+<li>Recommended standards and best practices for project layout and definition</li></ol></div>
+<div class="section">
+<h3>Jesse Mcconnell<a name="Jesse_Mcconnell"></a></h3>
+<ol style="list-style-type: decimal">
+<li>Promotes modular design of code. by making it simple to manage mulitple projects it allows the design to be laid out into muliple logical parts, weaving these parts together through the use of dependency tracking in pom files.</li>
+<li>Enforces modular design of code. it is easy to pay lipservice to modular code, but when the code is in seperate compiling projects it is impossible to cross pollinate references between modules of code unless you specifically allow for it in your dependency management... there is no 'I'll just do this now and fix it later' implementations.</li>
+<li>Dependency Management is clearly declared. with the dependency management mechanism you have to try to screw up your jar versioning...there is none of the classic problem of 'which version of this vendor jar is this?' And setting it up on an existing project rips the top off of the existing mess if it exists when you are forced to make 'unknown' versions in your repository to get things up and running...that or lie to yourself that you know the actual version of ABC.jar.</li>
+<li>strong typed life cycle there is a strong defined lifecycle that a software system goes thru from the initiation of a build to the end... and the users are allowed to mix and match their system to the lifecycle instead of cobble together their own lifecycle.. this has the additional benefit of allowing people to move from one project to another and speak using the same vocabulary in terms of software building</li></ol></div>
+<div class="section">
+<h3>Henning<a name="Henning"></a></h3>
+<ol style="list-style-type: decimal">
+<li>quick project setup, no complicated build.xml files, just a POM and go</li>
+<li>all developers in a project use the same jar dependencies due to centralized POM.</li>
+<li>getting a number of reports and metrics for a project &quot;for free&quot;</li>
+<li>reduce the size of source distributions, because jars can be pulled from a central location</li></ol></div>
+<div class="section">
+<h3>Roberto Castro<a name="Roberto_Castro"></a></h3>
+<ol style="list-style-type: decimal">
+<li>Consistency in artifact naming</li>
+<li>Use of remote repository</li>
+<li>Web site generation</li></ol></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/code-quality-management.html
==============================================================================
--- websites/staging/maven/trunk/content/code-quality-management.html (original)
+++ websites/staging/maven/trunk/content/code-quality-management.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20130423" />
+        <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Code Quality Management
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -230,7 +230,18 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Code Quality Management<a name="Code_Quality_Management"></a></h2><p>Some existing Maven plugins use code analysis technologies (like Checkstyle, PMD, JDepend, ...) to generate various quality reports. This page lists technologies and platforms that know how to aggregate all this information to offer enhanced quality management functionalities.</p><div class="section"><h3>Quality management technologies and platforms<a name="Quality_management_technologies_and_platforms"></a></h3><p>Following is an alphabetical list of those we've heard mentioned around the Maven community:</p><ul><li><a class="externalLink" href="https://hudson.dev.java.net">Hudson</a> - MIT license</li><li><a class="externalLink" href="http://mojo.codehaus.org/dashboard-maven-plugin/">Maven Dashboard plugin</a> - Apache Software License 2.0</li><li><a class="externalLink" href="http://sonar.codehaus.org">Sonar</a> - LGPL v3</li><li><a class="externalLink" hre
 f="http://www.squale.org/">Squale</a> - LGPL v3</li><li><a class="externalLink" href="http://xradar.sourceforge.net">XRadar</a> - BSD style license</li></ul></div></div>
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section">
+<h2>Code Quality Management<a name="Code_Quality_Management"></a></h2>
+<p>Some existing Maven plugins use code analysis technologies (like Checkstyle, PMD, JDepend, ...) to generate various quality reports. This page lists technologies and platforms that know how to aggregate all this information to offer enhanced quality management functionalities.</p>
+<div class="section">
+<h3>Quality management technologies and platforms<a name="Quality_management_technologies_and_platforms"></a></h3>
+<p>Following is an alphabetical list of those we've heard mentioned around the Maven community:</p>
+<ul>
+<li><a class="externalLink" href="https://hudson.dev.java.net">Hudson</a> - MIT license</li>
+<li><a class="externalLink" href="http://mojo.codehaus.org/dashboard-maven-plugin/">Maven Dashboard plugin</a> - Apache Software License 2.0</li>
+<li><a class="externalLink" href="http://sonar.codehaus.org">Sonar</a> - LGPL v3</li>
+<li><a class="externalLink" href="http://www.squale.org/">Squale</a> - LGPL v3</li>
+<li><a class="externalLink" href="http://xradar.sourceforge.net">XRadar</a> - BSD style license</li></ul></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/community.html
==============================================================================
--- websites/staging/maven/trunk/content/community.html (original)
+++ websites/staging/maven/trunk/content/community.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
         <meta name="author" content="Eric Redmond" />
         <meta name="Date-Creation-yyyymmdd" content="20130213" />
-    <meta name="Date-Revision-yyyymmdd" content="20130423" />
+    <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -44,7 +44,7 @@
         The Maven Community
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,7 +232,45 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>The Maven Community<a name="The_Maven_Community"></a></h2><p>Maven, like any other opensource project, relies heavily on the efforts of the entire user community to be ever vigilent for improvements, logging of defects, communicating use-cases, generating documentation, and being wary of other users in need. This is a quick guide outlining what members of the Maven community may do to make the system work better for everyone.</p><div class="section"><h3>Helping With Maven<a name="Helping_With_Maven"></a></h3><p>There is already a comprehensive <a href="./guides/development/guide-helping.html">Guide to Helping With Maven</a>. That guide focuses upon beginning as a supporter, with information on how to help the coding effort.</p><div class="section"><h4>Commit Questions or Answers to the Maven User FAQ<a name="Commit_Questions_or_Answers_to_the_Maven_User_FAQ"></a></h4><p>Documentation is currently a very high priority for the Maven community. 
 Please help out where ever you can, specifically in the work-in-progress <a class="externalLink" href="http://docs.codehaus.org/display/MAVENUSER/FAQs">FAQ Wiki</a>.</p></div><div class="section"><h4>Help Log Defects in JIRA<a name="Help_Log_Defects_in_JIRA"></a></h4><p>Just as any other healthy project requires a quick turn-around on defects, and a transparent method of users to have their wishes heard, so too does Maven need your help. Refer to the <a href="./issue-tracking.html">Issue Tracking</a> page.</p></div><div class="section"><h4>Developers<a name="Developers"></a></h4><p>For Maven developers, commiters, PMC: there is a <a href="./developers/index.html">Developers Guide</a>.</p></div></div><div class="section"><h3>Being a Good Maven Citizen<a name="Being_a_Good_Maven_Citizen"></a></h3><p>The concept of a public repository built into the core architecture of Maven makes it necessarily community-centric. There are a few simple things that Maven users may do to help k
 eep that community thriving.</p><div class="section"><h4>Be a Kind Public Repository User<a name="Be_a_Kind_Public_Repository_User"></a></h4><p>The best thing that a user can do is to set up their own remote repository mirror containing the projects needed. There are several tools to make this simpler, such as <a class="externalLink" href="http://nexus.sonatype.org/">Nexus</a> or <a class="externalLink" href="http://maven.apache.org/archiva/">Archiva</a>. This reduces strain on the Maven central repository, and allows new users to get acquainted with Maven easier and quicker. This is especially important for power-users and corporations. The incentive behind this is, controlling your own servers can give you desired level of security and more control over uptime, resulting in a better experience for your users. With that said, keep the following sentiment in mind:</p><p><i>DO NOT wget THE ENTIRE REPOSITORY!</i></p><p>Please take only the jars you need. We understand this is 
 may entail more work, but grabbing all 9+ Gigs of binaries really kills our servers.</p></div><div class="section"><h4>Host a Mirror<a name="Host_a_Mirror"></a></h4><p>As an extention to the previous statement, if you have access to a large data repository with lots of bandwidth, please consider becomming a mirror for the Maven central repository.</p><p>As you can imagine, thousands of users downloading can put quite a strain on one server. If you wish to be a mirror, please file a request in the <a class="externalLink" href="http://jira.codehaus.org/browse/MPA">Maven Project Administration</a> JIRA project.</p></div><div class="section"><h4>Host a Public Repository<a name="Host_a_Public_Repository"></a></h4><p>If you have any projects that you wish others to use, host them on your own public repository. That way, your users can simply add your repository to their own project repo list, and viola! Maven can keep you and your users in synch, growing your user-base due simply 
 to its new-found ease of use.</p></div></div><div class="section"><h3>User Gathering Spots<a name="User_Gathering_Spots"></a></h3><p>These are a few of the watering holes around which Maven users tend to gather.</p><div class="section"><h4>Mailing Lists<a name="Mailing_Lists"></a></h4><p>Maven has a number of <a href="./mail-lists.html">Mailing Lists</a>, and the Maven User List is specifically dedicated to answering questions about all Maven things.</p></div><div class="section"><h4>IRC (Internet Relay Chat)<a name="IRC_Internet_Relay_Chat"></a></h4><p>Log into the <tt>#maven</tt> IRC channel on <tt>irc.codehaus.org</tt> or <a class="externalLink" href="http://irc.codehaus.org">with web irc client </a></p></div></div></div>
+        <div class="section">
+<h2>The Maven Community<a name="The_Maven_Community"></a></h2>
+<p>Maven, like any other opensource project, relies heavily on the efforts of the entire user community to be ever vigilent for improvements, logging of defects, communicating use-cases, generating documentation, and being wary of other users in need. This is a quick guide outlining what members of the Maven community may do to make the system work better for everyone.</p>
+<div class="section">
+<h3>Helping With Maven<a name="Helping_With_Maven"></a></h3>
+<p>There is already a comprehensive <a href="./guides/development/guide-helping.html">Guide to Helping With Maven</a>. That guide focuses upon beginning as a supporter, with information on how to help the coding effort.</p>
+<div class="section">
+<h4>Commit Questions or Answers to the Maven User FAQ<a name="Commit_Questions_or_Answers_to_the_Maven_User_FAQ"></a></h4>
+<p>Documentation is currently a very high priority for the Maven community. Please help out where ever you can, specifically in the work-in-progress <a class="externalLink" href="http://docs.codehaus.org/display/MAVENUSER/FAQs">FAQ Wiki</a>.</p></div>
+<div class="section">
+<h4>Help Log Defects in JIRA<a name="Help_Log_Defects_in_JIRA"></a></h4>
+<p>Just as any other healthy project requires a quick turn-around on defects, and a transparent method of users to have their wishes heard, so too does Maven need your help. Refer to the <a href="./issue-tracking.html">Issue Tracking</a> page.</p></div>
+<div class="section">
+<h4>Developers<a name="Developers"></a></h4>
+<p>For Maven developers, commiters, PMC: there is a <a href="./developers/index.html">Developers Guide</a>.</p></div></div>
+<div class="section">
+<h3>Being a Good Maven Citizen<a name="Being_a_Good_Maven_Citizen"></a></h3>
+<p>The concept of a public repository built into the core architecture of Maven makes it necessarily community-centric. There are a few simple things that Maven users may do to help keep that community thriving.</p>
+<div class="section">
+<h4>Be a Kind Public Repository User<a name="Be_a_Kind_Public_Repository_User"></a></h4>
+<p>The best thing that a user can do is to set up their own remote repository mirror containing the projects needed. There are several tools to make this simpler, such as <a class="externalLink" href="http://nexus.sonatype.org/">Nexus</a> or <a class="externalLink" href="http://maven.apache.org/archiva/">Archiva</a>. This reduces strain on the Maven central repository, and allows new users to get acquainted with Maven easier and quicker. This is especially important for power-users and corporations. The incentive behind this is, controlling your own servers can give you desired level of security and more control over uptime, resulting in a better experience for your users. With that said, keep the following sentiment in mind:</p>
+<p><i>DO NOT wget THE ENTIRE REPOSITORY!</i></p>
+<p>Please take only the jars you need. We understand this is may entail more work, but grabbing all 9+ Gigs of binaries really kills our servers.</p></div>
+<div class="section">
+<h4>Host a Mirror<a name="Host_a_Mirror"></a></h4>
+<p>As an extention to the previous statement, if you have access to a large data repository with lots of bandwidth, please consider becomming a mirror for the Maven central repository.</p>
+<p>As you can imagine, thousands of users downloading can put quite a strain on one server. If you wish to be a mirror, please file a request in the <a class="externalLink" href="http://jira.codehaus.org/browse/MPA">Maven Project Administration</a> JIRA project.</p></div>
+<div class="section">
+<h4>Host a Public Repository<a name="Host_a_Public_Repository"></a></h4>
+<p>If you have any projects that you wish others to use, host them on your own public repository. That way, your users can simply add your repository to their own project repo list, and viola! Maven can keep you and your users in synch, growing your user-base due simply to its new-found ease of use.</p></div></div>
+<div class="section">
+<h3>User Gathering Spots<a name="User_Gathering_Spots"></a></h3>
+<p>These are a few of the watering holes around which Maven users tend to gather.</p>
+<div class="section">
+<h4>Mailing Lists<a name="Mailing_Lists"></a></h4>
+<p>Maven has a number of <a href="./mail-lists.html">Mailing Lists</a>, and the Maven User List is specifically dedicated to answering questions about all Maven things.</p></div>
+<div class="section">
+<h4>IRC (Internet Relay Chat)<a name="IRC_Internet_Relay_Chat"></a></h4>
+<p>Log into the <tt>#maven</tt> IRC channel on <tt>irc.codehaus.org</tt> or <a class="externalLink" href="http://irc.codehaus.org">with web irc client </a></p></div></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/continuous-integration.html
==============================================================================
--- websites/staging/maven/trunk/content/continuous-integration.html (original)
+++ websites/staging/maven/trunk/content/continuous-integration.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20130423" />
+        <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Continuous Integration
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -230,7 +230,18 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Continuous Integration<a name="Continuous_Integration"></a></h2><!-- TODO:  definition, description, motivation for using, etc. --><div class="section"><h3>CI Servers<a name="CI_Servers"></a></h3><p>Following is an alphabetical list of some CI servers we've heard mentioned around the Maven community:</p><ul><li><a class="externalLink" href="http://continuum.apache.org/">Apache Continuum</a></li><li><a class="externalLink" href="http://www.atlassian.com/software/bamboo/">Bamboo (Atlassian)</a></li><li><a class="externalLink" href="http://cruisecontrol.sourceforge.net/">Cruise Control</a></li><li><a class="externalLink" href="https://hudson.dev.java.net">Hudson</a></li><li><a class="externalLink" href="http://jenkins-ci.org/">Jenkins</a></li><li><a class="externalLink" href="http://www.jetbrains.com/teamcity/">TeamCity (JetBrains)</a></li></ul></div></div>
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section">
+<h2>Continuous Integration<a name="Continuous_Integration"></a></h2><!-- TODO:  definition, description, motivation for using, etc. -->
+<div class="section">
+<h3>CI Servers<a name="CI_Servers"></a></h3>
+<p>Following is an alphabetical list of some CI servers we've heard mentioned around the Maven community:</p>
+<ul>
+<li><a class="externalLink" href="http://continuum.apache.org/">Apache Continuum</a></li>
+<li><a class="externalLink" href="http://www.atlassian.com/software/bamboo/">Bamboo (Atlassian)</a></li>
+<li><a class="externalLink" href="http://cruisecontrol.sourceforge.net/">Cruise Control</a></li>
+<li><a class="externalLink" href="https://hudson.dev.java.net">Hudson</a></li>
+<li><a class="externalLink" href="http://jenkins-ci.org/">Jenkins</a></li>
+<li><a class="externalLink" href="http://www.jetbrains.com/teamcity/">TeamCity (JetBrains)</a></li></ul></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/developers/committer-environment.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/committer-environment.html (original)
+++ websites/staging/maven/trunk/content/developers/committer-environment.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -13,7 +13,7 @@
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Vincent Siveton" />
-        <meta name="Date-Revision-yyyymmdd" content="20130423" />
+        <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -43,7 +43,7 @@
         Developers centre - Commiter Environment
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -231,8 +231,35 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Introduction<a name="Introduction"></a></h2><p>This document is intended to set up the Maven committer environment.</p></div><div class="section"><h2><a name="Source_File_Encoding">Source File Encoding</a></h2><p>When editing source files, make sure you use the right file encoding. For the Maven project, UTF-8 has been chosen as the default file encoding. UTF-8 is an encoding scheme for the Unicode character set and as such allows to encode all characters that Java can handle. The source files should not contain the byte order mark (BOM). There can be exceptions to this general rule, e.g. properties files are usually encoded using ISO-8859-1 as per the JRE API, so please keep this in mind, too.</p></div><div class="section"><h2>Subversion Configuration<a name="Subversion_Configuration"></a></h2><p>Before committing files in subversion repository, you need to read the <a class="externalLink" href="http://www.apache.org/dev/versi
 on-control.html#https-svn">Committer Subversion Access</a> document and you must set your svn client with this properties file: <a href="./svn-eol-style.txt">svn-eol-style.txt</a></p></div><div class="section"><h2><a name="Maven_Code_Style">Maven Code Style</a></h2><p>The following sections show how to set up the code style for Maven in IDEA and Eclipse. It is strongly preferred that patches use this style before they are supplied.</p><div class="section"><h3>IntelliJ IDEA 4.5+<a name="IntelliJ_IDEA_4.5"></a></h3><p>Download <tt><a href="./maven-idea-codestyle.xml">maven-idea-codestyle.xml</a></tt> and copy it to <tt>~/.IntelliJIDEA/config/codestyles</tt> then restart IDEA. On Windows, try <tt>C:\Documents and Settings\&lt;username&gt;\.IntelliJIDEA\config\codestyles</tt></p><p>After this, restart IDEA and open the settings to select the new code style.</p></div><div class="section"><h3>Eclipse 3.2+<a name="Eclipse_3.2"></a></h3><p>Download <tt><a href="./maven-eclipse-codes
 tyle.xml">maven-eclipse-codestyle.xml</a></tt>.</p><p>After this, select Window &gt; Preferences, and open up the configuration for Java &gt; Code Style &gt; Code Formatter. Click on the button labeled Import... and select the file you downloaded. Give the style a name, and click OK.</p></div></div><div class="section"><h2>Setting up SSH public/private keys<a name="Setting_up_SSH_publicprivate_keys"></a></h2><p>By default, SSH (Secure Shell) asks you to enter your password each time, i.e.:</p><div class="source"><pre>&gt;ssh YOUR_APACHE_USERNAME@people.apache.org
-Password:</pre></div><p>SSH can be set up with public/private key pairs so that you don't have to type the password each time. You need to execute the following on your development machine:</p><div class="source"><pre>&gt; cd ~/.ssh
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section">
+<h2>Introduction<a name="Introduction"></a></h2>
+<p>This document is intended to set up the Maven committer environment.</p></div>
+<div class="section">
+<h2><a name="Source_File_Encoding">Source File Encoding</a></h2>
+<p>When editing source files, make sure you use the right file encoding. For the Maven project, UTF-8 has been chosen as the default file encoding. UTF-8 is an encoding scheme for the Unicode character set and as such allows to encode all characters that Java can handle. The source files should not contain the byte order mark (BOM). There can be exceptions to this general rule, e.g. properties files are usually encoded using ISO-8859-1 as per the JRE API, so please keep this in mind, too.</p></div>
+<div class="section">
+<h2>Subversion Configuration<a name="Subversion_Configuration"></a></h2>
+<p>Before committing files in subversion repository, you need to read the <a class="externalLink" href="http://www.apache.org/dev/version-control.html#https-svn">Committer Subversion Access</a> document and you must set your svn client with this properties file: <a href="./svn-eol-style.txt">svn-eol-style.txt</a></p></div>
+<div class="section">
+<h2><a name="Maven_Code_Style">Maven Code Style</a></h2>
+<p>The following sections show how to set up the code style for Maven in IDEA and Eclipse. It is strongly preferred that patches use this style before they are supplied.</p>
+<div class="section">
+<h3>IntelliJ IDEA 4.5+<a name="IntelliJ_IDEA_4.5"></a></h3>
+<p>Download <tt><a href="./maven-idea-codestyle.xml">maven-idea-codestyle.xml</a></tt> and copy it to <tt>~/.IntelliJIDEA/config/codestyles</tt> then restart IDEA. On Windows, try <tt>C:\Documents and Settings\&lt;username&gt;\.IntelliJIDEA\config\codestyles</tt></p>
+<p>After this, restart IDEA and open the settings to select the new code style.</p></div>
+<div class="section">
+<h3>Eclipse 3.2+<a name="Eclipse_3.2"></a></h3>
+<p>Download <tt><a href="./maven-eclipse-codestyle.xml">maven-eclipse-codestyle.xml</a></tt>.</p>
+<p>After this, select Window &gt; Preferences, and open up the configuration for Java &gt; Code Style &gt; Code Formatter. Click on the button labeled Import... and select the file you downloaded. Give the style a name, and click OK.</p></div></div>
+<div class="section">
+<h2>Setting up SSH public/private keys<a name="Setting_up_SSH_publicprivate_keys"></a></h2>
+<p>By default, SSH (Secure Shell) asks you to enter your password each time, i.e.:</p>
+<div class="source">
+<pre>&gt;ssh YOUR_APACHE_USERNAME@people.apache.org
+Password:</pre></div>
+<p>SSH can be set up with public/private key pairs so that you don't have to type the password each time. You need to execute the following on your development machine:</p>
+<div class="source">
+<pre>&gt; cd ~/.ssh
 &gt; ssh-keygen -t dsa -f YOUR_APACHE_USERNAME@apache.org -C YOUR_APACHE_USERNAME@apache.org
 Generating public/private dsa key pair.
 Enter passphrase (empty for no passphrase): (just type return)
@@ -240,9 +267,17 @@ Enter same passphrase again: (just type 
 Your identification has been saved in YOUR_APACHE_USERNAME@apache.org.
 Your public key has been saved in YOUR_APACHE_USERNAME@apache.org.pub.
 The key fingerprint is:
-0c:16:c7:44:9e:a6:2c:c0:8a:87:04:07:a0:5b:94:d2 YOUR_APACHE_USERNAME@apache.org</pre></div><p>Then, paste the content of the local <tt>~/.ssh/YOUR_APACHE_USERNAME.pub</tt> file into the file <tt>/home/YOUR_APACHE_USERNAME/.ssh/authorized_keys</tt> on the Apache remote host.</p><p><b>Note</b>: under Cygwin, it is located at <tt>{cygwin.install.path}\home\YOUR_MACHINE_USERNAME\.ssh</tt>. You need to copy the content of <tt>{cygwin.install.path}\home\YOUR_MACHINE_USERNAME\.ssh</tt> into <tt>C:\Documents and Settings\YOUR_MACHINE_USERNAME\.ssh</tt> for Maven.</p><p>You also need to modify the <tt>~/.ssh/config</tt> to use this identity file when communicating with *.apache.org</p><div class="source"><pre>Host *.apache.org
+0c:16:c7:44:9e:a6:2c:c0:8a:87:04:07:a0:5b:94:d2 YOUR_APACHE_USERNAME@apache.org</pre></div>
+<p>Then, paste the content of the local <tt>~/.ssh/YOUR_APACHE_USERNAME.pub</tt> file into the file <tt>/home/YOUR_APACHE_USERNAME/.ssh/authorized_keys</tt> on the Apache remote host.</p>
+<p><b>Note</b>: under Cygwin, it is located at <tt>{cygwin.install.path}\home\YOUR_MACHINE_USERNAME\.ssh</tt>. You need to copy the content of <tt>{cygwin.install.path}\home\YOUR_MACHINE_USERNAME\.ssh</tt> into <tt>C:\Documents and Settings\YOUR_MACHINE_USERNAME\.ssh</tt> for Maven.</p>
+<p>You also need to modify the <tt>~/.ssh/config</tt> to use this identity file when communicating with *.apache.org</p>
+<div class="source">
+<pre>Host *.apache.org
 User=YOUR_APACHE_USERNAME
-IdentityFile=~/.ssh/YOUR_APACHE_USERNAME@apache.org</pre></div><p>To test the installation, try to log in again on Apache. You should not be asked for your password any more.</p><div class="source"><pre> &gt; ssh YOUR_APACHE_USERNAME@people.apache.org
+IdentityFile=~/.ssh/YOUR_APACHE_USERNAME@apache.org</pre></div>
+<p>To test the installation, try to log in again on Apache. You should not be asked for your password any more.</p>
+<div class="source">
+<pre> &gt; ssh YOUR_APACHE_USERNAME@people.apache.org
 Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994
         The Regents of the University of California.  All rights reserved.
 
@@ -250,7 +285,15 @@ FreeBSD 8.2-RELEASE-p4 (GENERIC) #1 r226
 
 This is minotaur.apache.org (a.k.a. people.apache.org). 
 ...
-YOUR_APACHE_USERNAME@minotaur:~$</pre></div></div><div class="section"><h2>Useful software<a name="Useful_software"></a></h2><p>The Maven Team uses several software. Here is a partial list:</p><ul><li><a class="externalLink" href="http://www.cygwin.com/">Cygwin</a>: collection of free software tools to allow various versions of Microsoft Windows to act somewhat like a Unix system</li><li><a class="externalLink" href="http://winscp.net/">WinSCP</a>: SFTP client for Windows.</li><li><a class="externalLink" href="http://tortoisesvn.tigris.org/">TortoiseSVN</a>: Subversion client, implemented as a Windows shell extension.</li><li><a class="externalLink" href="http://www.gnupg.org/">GnuPG</a>: GNU Privacy Guard.</li></ul></div>
+YOUR_APACHE_USERNAME@minotaur:~$</pre></div></div>
+<div class="section">
+<h2>Useful software<a name="Useful_software"></a></h2>
+<p>The Maven Team uses several software. Here is a partial list:</p>
+<ul>
+<li><a class="externalLink" href="http://www.cygwin.com/">Cygwin</a>: collection of free software tools to allow various versions of Microsoft Windows to act somewhat like a Unix system</li>
+<li><a class="externalLink" href="http://winscp.net/">WinSCP</a>: SFTP client for Windows.</li>
+<li><a class="externalLink" href="http://tortoisesvn.tigris.org/">TortoiseSVN</a>: Subversion client, implemented as a Windows shell extension.</li>
+<li><a class="externalLink" href="http://www.gnupg.org/">GnuPG</a>: GNU Privacy Guard.</li></ul></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/developers/committer-settings.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/committer-settings.html (original)
+++ websites/staging/maven/trunk/content/developers/committer-settings.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -15,7 +15,7 @@
         <meta name="author" content="Vincent Siveton
 Dennis Lundberg" />
         <meta name="Date-Creation-yyyymmdd" content="20110523" />
-    <meta name="Date-Revision-yyyymmdd" content="20130423" />
+    <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -45,7 +45,7 @@ Dennis Lundberg" />
         Developers centre - Committer Settings
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -233,7 +233,15 @@ Dennis Lundberg" />
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Introduction<a name="Introduction"></a></h2><p>This document is intended to set up the Maven committer settings, i.e. the <tt>${user.home}/.m2/settings.xml</tt>.</p><div class="section"><h3>Enable Apache Servers<a name="Enable_Apache_Servers"></a></h3><p>Maven uses several servers configuration to deploy snapshots, releases and documentation on the Apache servers. You need to tell to Maven what your Apache username is. Please note that the servers now use your LDAP credentials, which may differ from your old SVN credentials.</p><p><b>It is highly recommended to use Maven's <a href="../guides/mini/guide-encryption.html"> password encryption capabilities</a> for your passwords</b>.</p><div class="source"><pre>&lt;settings&gt;
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section">
+<h2>Introduction<a name="Introduction"></a></h2>
+<p>This document is intended to set up the Maven committer settings, i.e. the <tt>${user.home}/.m2/settings.xml</tt>.</p>
+<div class="section">
+<h3>Enable Apache Servers<a name="Enable_Apache_Servers"></a></h3>
+<p>Maven uses several servers configuration to deploy snapshots, releases and documentation on the Apache servers. You need to tell to Maven what your Apache username is. Please note that the servers now use your LDAP credentials, which may differ from your old SVN credentials.</p>
+<p><b>It is highly recommended to use Maven's <a href="../guides/mini/guide-encryption.html"> password encryption capabilities</a> for your passwords</b>.</p>
+<div class="source">
+<pre>&lt;settings&gt;
   ...
   &lt;servers&gt;
     &lt;!-- To publish a snapshot of some part of Maven --&gt;
@@ -269,7 +277,13 @@ Dennis Lundberg" />
     &lt;/server&gt;
     ...
   &lt;/servers&gt;
-&lt;/settings&gt;</pre></div><p>You also need to be a member of the group <tt>apcvs</tt> and <tt>maven</tt> on <tt>people.apache.org</tt>.</p></div><div class="section"><h3>Enable sending announcement e-mails<a name="Enable_sending_announcement_e-mails"></a></h3><p>To be able to send out announcements of Maven releases you need to add a couple of properties to the <tt>apache-release</tt> profile.</p><div class="source"><pre>&lt;settings&gt;
+&lt;/settings&gt;</pre></div>
+<p>You also need to be a member of the group <tt>apcvs</tt> and <tt>maven</tt> on <tt>people.apache.org</tt>.</p></div>
+<div class="section">
+<h3>Enable sending announcement e-mails<a name="Enable_sending_announcement_e-mails"></a></h3>
+<p>To be able to send out announcements of Maven releases you need to add a couple of properties to the <tt>apache-release</tt> profile.</p>
+<div class="source">
+<pre>&lt;settings&gt;
   ...
   &lt;profiles&gt;
     &lt;profile&gt;

Modified: websites/staging/maven/trunk/content/developers/conventions/code.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/code.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/code.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="../../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Vincent Siveton" />
         <meta name="Date-Creation-yyyymmdd" content="20080705" />
-    <meta name="Date-Revision-yyyymmdd" content="20130423" />
+    <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -44,7 +44,7 @@
         Maven Code Style And Code Conventions
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,7 +232,33 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Maven Code Style And Code Conventions<a name="Maven_Code_Style_And_Code_Conventions"></a></h2><p>This document describes how developers and contributors should write code. The reasoning of these styles and conventions is mainly for consistency, readability and maintainability reasons.</p><div class="section"><h3>Generic Code Style And Convention<a name="Generic_Code_Style_And_Convention"></a></h3><p>All working files (java, xml, others) should respect the following conventions:</p><ul><li><b>License Header</b>: Always add the current <a class="externalLink" href="http://www.apache.org/legal/src-headers.html#headers">ASF license header</a> in all versionned files.</li><li><b>Trailing Whitespaces</b>: Remove all trailing whitespaces. If your are an Eclipse user, you could use the <a class="externalLink" href="http://andrei.gmxhome.de/anyedit/">Anyedit Eclipse Plugin</a>.</li></ul><!-- * Using SVN properties like \$Id: \$ => Is it
  a wanted goal for all files like java or apt? --><p>and the following style:</p><ul><li><b>Indentation</b>: <b>Never</b> use tabs!</li><li><b>Line wrapping</b>: Always use a 120-column line width.</li></ul><p><b>Note</b>: The specific styles and conventions, listed in the next sections, could override these generic rules.</p></div><div class="section"><h3><a name="Java">Java</a></h3><div class="section"><h4><a name="Java_Code_Style">Java Code Style</a></h4><p>The Maven style for Java is mainly:</p><ul><li><b>White space</b>: One space after control statements and between arguments (i.e. <tt>if ( foo )</tt> instead of <tt>if(foo)</tt>), <tt>myFunc( foo, bar, baz )</tt> instead of <tt>myFunc(foo,bar,baz)</tt>). No spaces after methods names (i.e. <tt>void myMethod(), myMethod( &quot;foo&quot; )</tt>)</li><li><b>Indentation</b>: Always use 4 space indents and <b>never</b> use tabs!</li><li><b>Blocks</b>: Always enclose with a new line brace.</li><li><b>Line wrapping</b>: Alway
 s use a 120-column line width for Java code and Javadoc.</li><li><b>Readingness</b>: Specify code grouping members, if needed. For instance in a Mojo class, you could have:<div class="source"><pre>public class MyMojo
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section">
+<h2>Maven Code Style And Code Conventions<a name="Maven_Code_Style_And_Code_Conventions"></a></h2>
+<p>This document describes how developers and contributors should write code. The reasoning of these styles and conventions is mainly for consistency, readability and maintainability reasons.</p>
+<div class="section">
+<h3>Generic Code Style And Convention<a name="Generic_Code_Style_And_Convention"></a></h3>
+<p>All working files (java, xml, others) should respect the following conventions:</p>
+<ul>
+<li><b>License Header</b>: Always add the current <a class="externalLink" href="http://www.apache.org/legal/src-headers.html#headers">ASF license header</a> in all versionned files.</li>
+<li><b>Trailing Whitespaces</b>: Remove all trailing whitespaces. If your are an Eclipse user, you could use the <a class="externalLink" href="http://andrei.gmxhome.de/anyedit/">Anyedit Eclipse Plugin</a>.</li></ul><!-- * Using SVN properties like \$Id: \$ => Is it a wanted goal for all files like java or apt? -->
+<p>and the following style:</p>
+<ul>
+<li><b>Indentation</b>: <b>Never</b> use tabs!</li>
+<li><b>Line wrapping</b>: Always use a 120-column line width.</li></ul>
+<p><b>Note</b>: The specific styles and conventions, listed in the next sections, could override these generic rules.</p></div>
+<div class="section">
+<h3><a name="Java">Java</a></h3>
+<div class="section">
+<h4><a name="Java_Code_Style">Java Code Style</a></h4>
+<p>The Maven style for Java is mainly:</p>
+<ul>
+<li><b>White space</b>: One space after control statements and between arguments (i.e. <tt>if ( foo )</tt> instead of <tt>if(foo)</tt>), <tt>myFunc( foo, bar, baz )</tt> instead of <tt>myFunc(foo,bar,baz)</tt>). No spaces after methods names (i.e. <tt>void myMethod(), myMethod( &quot;foo&quot; )</tt>)</li>
+<li><b>Indentation</b>: Always use 4 space indents and <b>never</b> use tabs!</li>
+<li><b>Blocks</b>: Always enclose with a new line brace.</li>
+<li><b>Line wrapping</b>: Always use a 120-column line width for Java code and Javadoc.</li>
+<li><b>Readingness</b>: Specify code grouping members, if needed. For instance in a Mojo class, you could have:
+<div class="source">
+<pre>public class MyMojo
 {
     // ----------------------------------------------------------------------
     // Mojo components
@@ -293,15 +319,62 @@
     // Static methods
     // ----------------------------------------------------------------------
     ...
-}</pre></div></li></ul><p>The following sections show how to set up the code style for Maven in IDEA and Eclipse. It is strongly preferred that patches use this style before they are applied.</p><div class="section"><h5>IntelliJ IDEA 4.5+<a name="IntelliJ_IDEA_4.5"></a></h5><p>Download <tt><a href="../../developers/maven-idea-codestyle.xml">maven-idea-codestyle.xml</a></tt> and copy it to <tt>~/.IntelliJIDEA/config/codestyles</tt> then restart IDEA. On Windows, try <tt>C:\Documents and Settings&lt;username&gt;\.IntelliJIDEA\config\codestyles</tt></p><p>After this, restart IDEA and open the settings to select the new code style.</p></div><div class="section"><h5>Eclipse 3.2+<a name="Eclipse_3.2"></a></h5><p>Download <tt><a href="../../developers/maven-eclipse-codestyle.xml">maven-eclipse-codestyle.xml</a></tt>.</p><p>After this, select Window &gt; Preferences, and open up the configuration for Java &gt; Code Style &gt; Code Formatter. Click on the button labeled Import... and
  select the file you downloaded. Give the style a name, and click OK.</p></div></div><div class="section"><h4><a name="Java_Code_Convention">Java Code Convention</a></h4><p>For consistency reasons, our Java code convention is mainly:</p><ul><li><b>Naming</b>: Constants (i.e. static final members) values should always be in upper case. Using short, descriptive names for classes and methods.</li><li><b>Organization</b>: Avoid using a lot of public inner classes. Prefer interfaces instead of default implementation.</li><li><b>Modifier</b>: Avoid using final modifier on all member variables and arguments. Prefer using private or protected member instead of public member.</li><li><b>Exceptions</b>: Throw meaningful exceptions to makes debugging and testing more easy.</li><li><b>Documentation</b>: Document public interfaces well, i.e. all non-trivial public and protected functions should include Javadoc that indicates what it does. <b>Note</b>: it is an ongoing convention for the 
 Maven Team.</li><li><b>Testing</b>: All non-trivial public classes should include corresponding unit or IT tests.</li></ul></div><div class="section"><h4><a name="JavaDoc_Convention">JavaDoc Convention</a></h4><p>TO BE DISCUSSED</p></div></div><div class="section"><h3><a name="XML">XML</a></h3><div class="section"><h4><a name="XML_Code_Style">XML Code Style</a></h4><p>The Maven style for XML files is mainly:</p><ul><li><b>Indentation</b>: Always use 2 space indents, unless you're wrapping a new XML tags line in which case you should indent 4 spaces.</li><li><b>Line Breaks</b>: Always use a new line with indentation for complex XML types and no line break for simple XML types. Always use a new line to separate XML sections or blocks, for instance:<div class="source"><pre>&lt;aTag&gt;
+}</pre></div></li></ul>
+<p>The following sections show how to set up the code style for Maven in IDEA and Eclipse. It is strongly preferred that patches use this style before they are applied.</p>
+<div class="section">
+<h5>IntelliJ IDEA 4.5+<a name="IntelliJ_IDEA_4.5"></a></h5>
+<p>Download <tt><a href="../../developers/maven-idea-codestyle.xml">maven-idea-codestyle.xml</a></tt> and copy it to <tt>~/.IntelliJIDEA/config/codestyles</tt> then restart IDEA. On Windows, try <tt>C:\Documents and Settings&lt;username&gt;\.IntelliJIDEA\config\codestyles</tt></p>
+<p>After this, restart IDEA and open the settings to select the new code style.</p></div>
+<div class="section">
+<h5>Eclipse 3.2+<a name="Eclipse_3.2"></a></h5>
+<p>Download <tt><a href="../../developers/maven-eclipse-codestyle.xml">maven-eclipse-codestyle.xml</a></tt>.</p>
+<p>After this, select Window &gt; Preferences, and open up the configuration for Java &gt; Code Style &gt; Code Formatter. Click on the button labeled Import... and select the file you downloaded. Give the style a name, and click OK.</p></div></div>
+<div class="section">
+<h4><a name="Java_Code_Convention">Java Code Convention</a></h4>
+<p>For consistency reasons, our Java code convention is mainly:</p>
+<ul>
+<li><b>Naming</b>: Constants (i.e. static final members) values should always be in upper case. Using short, descriptive names for classes and methods.</li>
+<li><b>Organization</b>: Avoid using a lot of public inner classes. Prefer interfaces instead of default implementation.</li>
+<li><b>Modifier</b>: Avoid using final modifier on all member variables and arguments. Prefer using private or protected member instead of public member.</li>
+<li><b>Exceptions</b>: Throw meaningful exceptions to makes debugging and testing more easy.</li>
+<li><b>Documentation</b>: Document public interfaces well, i.e. all non-trivial public and protected functions should include Javadoc that indicates what it does. <b>Note</b>: it is an ongoing convention for the Maven Team.</li>
+<li><b>Testing</b>: All non-trivial public classes should include corresponding unit or IT tests.</li></ul></div>
+<div class="section">
+<h4><a name="JavaDoc_Convention">JavaDoc Convention</a></h4>
+<p>TO BE DISCUSSED</p></div></div>
+<div class="section">
+<h3><a name="XML">XML</a></h3>
+<div class="section">
+<h4><a name="XML_Code_Style">XML Code Style</a></h4>
+<p>The Maven style for XML files is mainly:</p>
+<ul>
+<li><b>Indentation</b>: Always use 2 space indents, unless you're wrapping a new XML tags line in which case you should indent 4 spaces.</li>
+<li><b>Line Breaks</b>: Always use a new line with indentation for complex XML types and no line break for simple XML types. Always use a new line to separate XML sections or blocks, for instance:
+<div class="source">
+<pre>&lt;aTag&gt;
   &lt;simpleType&gt;This is a simple type&lt;/simpleType&gt;
 
   &lt;complexType&gt;
     &lt;simpleType&gt;This is a complex type&lt;/simpleType&gt;
   &lt;/complexType&gt;
-&lt;/aTag&gt;</pre></div><p>In some cases, adding comments could improve the readability of blocks, for instance:</p><div class="source"><pre>    &lt;!-- Simple XML documentation                                               --&gt;</pre></div><p>or</p><div class="source"><pre>    &lt;!-- ====================================================================== --&gt;
+&lt;/aTag&gt;</pre></div>
+<p>In some cases, adding comments could improve the readability of blocks, for instance:</p>
+<div class="source">
+<pre>    &lt;!-- Simple XML documentation                                               --&gt;</pre></div>
+<p>or</p>
+<div class="source">
+<pre>    &lt;!-- ====================================================================== --&gt;
     &lt;!-- Block documentation                                                    --&gt;
-    &lt;!-- ====================================================================== --&gt;</pre></div></li></ul></div><div class="section"><h4><a name="Generic_XML_Code_Convention">Generic XML Code Convention</a></h4><p>No generic code convention exists yet for XML files.</p></div><div class="section"><h4><a name="POM_Code_Convention">POM Code Convention</a></h4><p>The team has <a class="externalLink" href="http://www.nabble.com/-Proposal--Pom-Code-Style-(WAS-svn-commit%3A-r670264----maven-plugins-trunk-maven-site-plugin-pom.xml)-td18083228.html">voted</a> during the end of June 2008 to follow a specific POM convention to ordering POM elements. The consequence of this vote is that the <a class="externalLink" href="http://maven.apache.org/ref/current/maven-model/maven.html">Maven project descriptor</a> is <b>no more</b> considered as the reference for the ordering.</p><p>The following is the recommended ordering for all Maven POM files:</p><div class="source"><pre>&lt;project 
 xmlns=&quot;http://maven.apache.org/POM/4.0.0&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd&quot;&gt;
+    &lt;!-- ====================================================================== --&gt;</pre></div></li></ul></div>
+<div class="section">
+<h4><a name="Generic_XML_Code_Convention">Generic XML Code Convention</a></h4>
+<p>No generic code convention exists yet for XML files.</p></div>
+<div class="section">
+<h4><a name="POM_Code_Convention">POM Code Convention</a></h4>
+<p>The team has <a class="externalLink" href="http://www.nabble.com/-Proposal--Pom-Code-Style-(WAS-svn-commit%3A-r670264----maven-plugins-trunk-maven-site-plugin-pom.xml)-td18083228.html">voted</a> during the end of June 2008 to follow a specific POM convention to ordering POM elements. The consequence of this vote is that the <a class="externalLink" href="http://maven.apache.org/ref/current/maven-model/maven.html">Maven project descriptor</a> is <b>no more</b> considered as the reference for the ordering.</p>
+<p>The following is the recommended ordering for all Maven POM files:</p>
+<div class="source">
+<pre>&lt;project xmlns=&quot;http://maven.apache.org/POM/4.0.0&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd&quot;&gt;
   &lt;modelVersion/&gt;
 
   &lt;parent/&gt;
@@ -345,7 +418,24 @@
   &lt;reporting/&gt;
 
   &lt;profiles/&gt;
-&lt;/project&gt;</pre></div><p><b>Comments</b>:</p><ol style="list-style-type: decimal"><li>The &lt;project/&gt; element is always on one line.</li><li>The blocks are voluntary separated by a new line to improve the readingness.</li><li>The dependencies in &lt;dependencies/&gt; and &lt;dependencyManagement/&gt; tags have no specific ordering. Developers are free to choose the ordering, but grouping dependencies by topics (like groupId i.e. <tt>org.apache.maven</tt>) is a good practice.</li></ol><p><b>Note</b>: The team plans to create a Maven plugin with reorder and reformat goals (See <a class="externalLink" href="http://jira.codehaus.org/browse/MOJO-928">MOJO-928</a>).</p></div><div class="section"><h4><a name="XDOC_Code_Convention">XDOC Code Convention</a></h4><p>For consistency and readability reasons, XDOC files should respect:</p><ul><li><b>Metadata</b>: Always specify metadata in the &lt;properties/&gt; tag.</li><li><b>Sections</b>: Always use a new line with indentat
 ion for &lt;section/&gt; tags.</li></ul></div><div class="section"><h4><a name="FML_Code_Convention">FML Code Convention</a></h4><p>For readability reasons, FML files should respect:</p><ul><li><b>FAQ</b>: Always use a new line with indentation for &lt;faq/&gt; tags.</li></ul><!-- * {APT} Do we need any specific APT style/convention? --></div></div></div>
+&lt;/project&gt;</pre></div>
+<p><b>Comments</b>:</p>
+<ol style="list-style-type: decimal">
+<li>The &lt;project/&gt; element is always on one line.</li>
+<li>The blocks are voluntary separated by a new line to improve the readingness.</li>
+<li>The dependencies in &lt;dependencies/&gt; and &lt;dependencyManagement/&gt; tags have no specific ordering. Developers are free to choose the ordering, but grouping dependencies by topics (like groupId i.e. <tt>org.apache.maven</tt>) is a good practice.</li></ol>
+<p><b>Note</b>: The team plans to create a Maven plugin with reorder and reformat goals (See <a class="externalLink" href="http://jira.codehaus.org/browse/MOJO-928">MOJO-928</a>).</p></div>
+<div class="section">
+<h4><a name="XDOC_Code_Convention">XDOC Code Convention</a></h4>
+<p>For consistency and readability reasons, XDOC files should respect:</p>
+<ul>
+<li><b>Metadata</b>: Always specify metadata in the &lt;properties/&gt; tag.</li>
+<li><b>Sections</b>: Always use a new line with indentation for &lt;section/&gt; tags.</li></ul></div>
+<div class="section">
+<h4><a name="FML_Code_Convention">FML Code Convention</a></h4>
+<p>For readability reasons, FML files should respect:</p>
+<ul>
+<li><b>FAQ</b>: Always use a new line with indentation for &lt;faq/&gt; tags.</li></ul><!-- * {APT} Do we need any specific APT style/convention? --></div></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/developers/conventions/git.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/git.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/git.html Sat Apr 27 07:29:22 2013
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at Apr 23, 2013
+ | Generated by Apache Maven Doxia at Apr 27, 2013
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="../../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Olivier Lamy" />
         <meta name="Date-Creation-yyyymmdd" content="20120912" />
-    <meta name="Date-Revision-yyyymmdd" content="20130423" />
+    <meta name="Date-Revision-yyyymmdd" content="20130427" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -44,7 +44,7 @@
         Maven Git Convention
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,19 +232,57 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Maven Git Convention<a name="Maven_Git_Convention"></a></h2><p>This document describes how developers should use Git, our SCM.</p><div class="section"><h3>Git migration<a name="Git_migration"></a></h3><p>ETA of git migration is here: <a class="externalLink" href="https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration">https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration</a></p></div><div class="section"><h3>Git Configuration<a name="Git_Configuration"></a></h3><p>TODO</p></div><div class="section"><h3><a name="Commit_Message_Template">Commit Message Template</a></h3><p>Commits should be focused on one issue at a time, because that makes it easier for others to review the commit.</p><p>A commit message should use this template:</p><div class="source"><pre>[ISSUE-1] &lt;&lt;Summary field from JIRA&gt;&gt;
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section">
+<h2>Maven Git Convention<a name="Maven_Git_Convention"></a></h2>
+<p>This document describes how developers should use Git, our SCM.</p>
+<div class="section">
+<h3>Git migration<a name="Git_migration"></a></h3>
+<p>ETA of git migration is here: <a class="externalLink" href="https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration">https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration</a></p></div>
+<div class="section">
+<h3>Git Configuration<a name="Git_Configuration"></a></h3>
+<p>TODO</p></div>
+<div class="section">
+<h3><a name="Commit_Message_Template">Commit Message Template</a></h3>
+<p>Commits should be focused on one issue at a time, because that makes it easier for others to review the commit.</p>
+<p>A commit message should use this template:</p>
+<div class="source">
+<pre>[ISSUE-1] &lt;&lt;Summary field from JIRA&gt;&gt;
 Submitted by: &lt;&lt;Name of non-committer&gt;&gt;
 
-o Comments</pre></div><p>Where:</p><ul><li><b>ISSUE-1</b> can be omitted if there was no relevant JIRA issue, though you are strongly encouraged to create one for significant changes.</li><li><b>Submitted by</b> only needs to be specified when a patch is being applied for a non-committer.</li><li><b>Comments</b> some optional words about the solution.</li></ul></div></div><div class="section"><h2>eg:<a name="eg:"></a></h2><div class="source"><pre>[MNG-1456] Added the foo to the bar
+o Comments</pre></div>
+<p>Where:</p>
+<ul>
+<li><b>ISSUE-1</b> can be omitted if there was no relevant JIRA issue, though you are strongly encouraged to create one for significant changes.</li>
+<li><b>Submitted by</b> only needs to be specified when a patch is being applied for a non-committer.</li>
+<li><b>Comments</b> some optional words about the solution.</li></ul></div></div>
+<div class="section">
+<h2>eg:<a name="eg:"></a></h2>
+<div class="source">
+<pre>[MNG-1456] Added the foo to the bar
 Submitted by: Baz Bazman
 
-o Applied without change</pre></div><div class="section"><h3>Apply User Patch<a name="Apply_User_Patch"></a></h3><p>By default, the committer should apply the patch without any <b>major</b> modifications. In a second step, the committer could apply any changes as usual.</p></div><div class="section"><h3>Edit Commit Message<a name="Edit_Commit_Message"></a></h3><div><pre> git commit --amend to edit last commit comment</pre></div></div><div class="section"><h3>Workflow<a name="Workflow"></a></h3><p>Workflow for svn folks is something like :</p><div><pre> $ git pull
+o Applied without change</pre></div>
+<div class="section">
+<h3>Apply User Patch<a name="Apply_User_Patch"></a></h3>
+<p>By default, the committer should apply the patch without any <b>major</b> modifications. In a second step, the committer could apply any changes as usual.</p></div>
+<div class="section">
+<h3>Edit Commit Message<a name="Edit_Commit_Message"></a></h3>
+<div>
+<pre> git commit --amend to edit last commit comment</pre></div></div>
+<div class="section">
+<h3>Workflow<a name="Workflow"></a></h3>
+<p>Workflow for svn folks is something like :</p>
+<div>
+<pre> $ git pull
  $ hack hack hack
  $ git push
  // fails, because someone else has already pushed to master
  $ git pull
  // this creates some merges
- $ git push</pre></div><p>A more quiet workflow :</p><div><pre>$ git pull
+ $ git push</pre></div>
+<p>A more quiet workflow :</p>
+<div>
+<pre>$ git pull
 $ hack hack hack
 $ git push
 // fails, because someone else has already pushed to master
@@ -252,13 +290,43 @@ $ git fetch
 // this moves 'origin/master'
 $ git rebase origin/master
 // this reapplies your local changes on top of origin/master
-$ git push</pre></div></div><div class="section"><h3>Other useful Git commands while developing<a name="Other_useful_Git_commands_while_developing"></a></h3><p>If you've done a chunk of work and you would like ditch your changes and start from scratch use this command to revert to the original checkout:</p><div><pre>$ git checkout .</pre></div><p>TODO .gitignore</p></div><div class="section"><h3>power-git checkout<a name="power-git_checkout"></a></h3><p>This checkout is typical for highly experienced git users, and may serve as inspiration for others; as usual the best way to learn is by doing. Sample shown for maven-surefire</p><p>Go to https://github.com/apache/maven-surefire and fork surefire to your own github account.</p><p>Starting with nothing (no existing clone)</p><div><pre>git clone https://github.com/&lt;youraccount&gt;/maven-surefire.git
+$ git push</pre></div></div>
+<div class="section">
+<h3>Other useful Git commands while developing<a name="Other_useful_Git_commands_while_developing"></a></h3>
+<p>If you've done a chunk of work and you would like ditch your changes and start from scratch use this command to revert to the original checkout:</p>
+<div>
+<pre>$ git checkout .</pre></div>
+<p>TODO .gitignore</p></div>
+<div class="section">
+<h3>power-git checkout<a name="power-git_checkout"></a></h3>
+<p>This checkout is typical for highly experienced git users, and may serve as inspiration for others; as usual the best way to learn is by doing. Sample shown for maven-surefire</p>
+<p>Go to https://github.com/apache/maven-surefire and fork surefire to your own github account.</p>
+<p>Starting with nothing (no existing clone)</p>
+<div>
+<pre>git clone https://github.com/&lt;youraccount&gt;/maven-surefire.git
 git remote add apache https://git-wip-us.apache.org/repos/asf/maven-surefire.git
 git remote add asfgithub https://github.com/apache/maven-surefire.git
 git config --add remote.asfgithub.fetch &quot;+refs/pull/*/head:refs/remotes/asfgithub/pr/*&quot;
-git fetch --all</pre></div><p>(You may consider adding --global to the git config statement above to always fetch pull requests for any remote named &quot;asfgithub&quot;)</p><p>In this setup, running &quot;git push&quot; will normally push to your personal github account. Furthermore, all pull requests from github are also fetched to your local clone, use</p><div><pre>gitk --all</pre></div><p>to try to make some sense of it all. This is an important command to understand! (gitk may need to be installed additionally)</p></div></div><div class="section"><h2>gitk also has a quite excellent context menu that is far more context sensitive than most people realize at first impression. Right-clicking on a commit in a github pull-request will allow you to cherry-pick straight in the gui.<a name="gitk_also_has_a_quite_excellent_context_menu_that_is_far_more_context_sensitive_than_most_people_realize_at_first_impression._Right-clicking_on_a_commit_in_a_github_pull-request_will_allow_
 you_to_cherry-pick_straight_in_the_gui."></a></h2><p>If you're working on the master branch, you can do stuff like this:</p><div><pre>git push # your github account
-git push apache # the authorative apache repo</pre></div><p>Using your github account as a storage for half-finished work is excellent if you switch between multiple computers, always push to github before leaving your current computer and start by pulling at the next computer.</p><p>To merge a pull request</p><div><pre>git merge pr/10 # merge pull request number 10 from asf@github into master
-git push apache # upload to apache</pre></div><p>Or if you're comfortable with rebasing;</p><div><pre>
+git fetch --all</pre></div>
+<p>(You may consider adding --global to the git config statement above to always fetch pull requests for any remote named &quot;asfgithub&quot;)</p>
+<p>In this setup, running &quot;git push&quot; will normally push to your personal github account. Furthermore, all pull requests from github are also fetched to your local clone, use</p>
+<div>
+<pre>gitk --all</pre></div>
+<p>to try to make some sense of it all. This is an important command to understand! (gitk may need to be installed additionally)</p></div></div>
+<div class="section">
+<h2>gitk also has a quite excellent context menu that is far more context sensitive than most people realize at first impression. Right-clicking on a commit in a github pull-request will allow you to cherry-pick straight in the gui.<a name="gitk_also_has_a_quite_excellent_context_menu_that_is_far_more_context_sensitive_than_most_people_realize_at_first_impression._Right-clicking_on_a_commit_in_a_github_pull-request_will_allow_you_to_cherry-pick_straight_in_the_gui."></a></h2>
+<p>If you're working on the master branch, you can do stuff like this:</p>
+<div>
+<pre>git push # your github account
+git push apache # the authorative apache repo</pre></div>
+<p>Using your github account as a storage for half-finished work is excellent if you switch between multiple computers, always push to github before leaving your current computer and start by pulling at the next computer.</p>
+<p>To merge a pull request</p>
+<div>
+<pre>git merge pr/10 # merge pull request number 10 from asf@github into master
+git push apache # upload to apache</pre></div>
+<p>Or if you're comfortable with rebasing;</p>
+<div>
+<pre>
 git checkout pr/10
 git rebase apache/master
 git push apache</pre></div></div>



Mime
View raw message