You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bu...@apache.org on 2013/04/27 09:29:25 UTC

svn commit: r860084 [3/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...

Modified: websites/staging/maven/trunk/content/developers/conventions/jira.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/jira.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/jira.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 JIRA Convention
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,7 +232,46 @@
     </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 JIRA Convention<a name="Maven_JIRA_Convention"></a></h2><p>This document describes how Maven developers should use JIRA, our issue tracking.</p><div class="section"><h3>When To Create a JIRA Issue?<a name="When_To_Create_a_JIRA_Issue"></a></h3><p>This section discusses when to create a JIRA issue versus just committing a change in SVN.</p><ul><li><b>Minor changes</b>, like code reformatting, documentation fixes, etc. that aren't going to impact other users can be committed without much issue.</li><li><b>Larger changes</b>, like bug fixes, API changes, significant refactoring, new classes, and pretty much any change of more than 100 lines, should have a JIRA ticket associated with it, or at least an email discussion.</li></ul></div><div class="section"><h3>How To Use Issue Details?<a name="How_To_Use_Issue_Details"></a></h3><p>This section presents some conventions about the issue fields.</p><div class="section"><h4>Priori
 ty<a name="Priority"></a></h4><p>Committers has the responsibility to realign priority by editing the issue.</p><p><b>Reasoning</b>: having a correct release note.</p></div><div class="section"><h4>Assignee<a name="Assignee"></a></h4><p>Committers could assign an issue to a specific committer if he thinks it is the right committer.</p></div><div class="section"><h4>Component/s<a name="Components"></a></h4><p>Committers has the responsibility to specify the correct the component by editing the issue.</p><p><b>Reasoning</b>: having a correct release note.</p></div><div class="section"><h4>Affects Version/s<a name="Affects_Versions"></a></h4><p>By default, the Maven team considers that an issue, which affects a given version, affects also precedent versions, i.e. issue which affects Maven 2.0.9 will affect also 2.0, 2.0.1 ... 2.0.9. If it is a regression, the committers should specify the affected versions.</p><p><b>Reasoning</b>: having a correct release note.</p></div><div cl
 ass="section"><h4>Fix Version/s<a name="Fix_Versions"></a></h4><p>TO BE DISCUSSED</p><!-- Since the Maven team works on the trunk (2.1) and the main branch (2.0.x), the committers should always mark issues that are both 2.0.x and 2.1. --><!-- Reasoning: it's good housekeeping to always say both to keep track of the changes in both branches. --></div><div class="section"><h4>Time Tracking<a name="Time_Tracking"></a></h4><p>The Maven team never uses it. Committers could do it, but like said, it will never be used.</p></div></div><div class="section"><h3>Further Links<a name="Further_Links"></a></h3><ul><li><a class="externalLink" href="http://www.atlassian.com/software/jira/docs/latest/">JIRA Documentation</a></li><li><a class="externalLink" href="http://www.atlassian.com/software/jira/docs/latest/issues.html">What is an Issue?</a></li><li><a class="externalLink" href="http://www.atlassian.com/software/jira/docs/latest/projects.html">What is a project?</a></li><li><a class="ex
 ternalLink" href="http://markmail.org/message/wfv2lw66i2gggnaq">how we handle JIRA versions Thread</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>Maven JIRA Convention<a name="Maven_JIRA_Convention"></a></h2>
+<p>This document describes how Maven developers should use JIRA, our issue tracking.</p>
+<div class="section">
+<h3>When To Create a JIRA Issue?<a name="When_To_Create_a_JIRA_Issue"></a></h3>
+<p>This section discusses when to create a JIRA issue versus just committing a change in SVN.</p>
+<ul>
+<li><b>Minor changes</b>, like code reformatting, documentation fixes, etc. that aren't going to impact other users can be committed without much issue.</li>
+<li><b>Larger changes</b>, like bug fixes, API changes, significant refactoring, new classes, and pretty much any change of more than 100 lines, should have a JIRA ticket associated with it, or at least an email discussion.</li></ul></div>
+<div class="section">
+<h3>How To Use Issue Details?<a name="How_To_Use_Issue_Details"></a></h3>
+<p>This section presents some conventions about the issue fields.</p>
+<div class="section">
+<h4>Priority<a name="Priority"></a></h4>
+<p>Committers has the responsibility to realign priority by editing the issue.</p>
+<p><b>Reasoning</b>: having a correct release note.</p></div>
+<div class="section">
+<h4>Assignee<a name="Assignee"></a></h4>
+<p>Committers could assign an issue to a specific committer if he thinks it is the right committer.</p></div>
+<div class="section">
+<h4>Component/s<a name="Components"></a></h4>
+<p>Committers has the responsibility to specify the correct the component by editing the issue.</p>
+<p><b>Reasoning</b>: having a correct release note.</p></div>
+<div class="section">
+<h4>Affects Version/s<a name="Affects_Versions"></a></h4>
+<p>By default, the Maven team considers that an issue, which affects a given version, affects also precedent versions, i.e. issue which affects Maven 2.0.9 will affect also 2.0, 2.0.1 ... 2.0.9. If it is a regression, the committers should specify the affected versions.</p>
+<p><b>Reasoning</b>: having a correct release note.</p></div>
+<div class="section">
+<h4>Fix Version/s<a name="Fix_Versions"></a></h4>
+<p>TO BE DISCUSSED</p><!-- Since the Maven team works on the trunk (2.1) and the main branch (2.0.x), the committers should always mark issues that are both 2.0.x and 2.1. --><!-- Reasoning: it's good housekeeping to always say both to keep track of the changes in both branches. --></div>
+<div class="section">
+<h4>Time Tracking<a name="Time_Tracking"></a></h4>
+<p>The Maven team never uses it. Committers could do it, but like said, it will never be used.</p></div></div>
+<div class="section">
+<h3>Further Links<a name="Further_Links"></a></h3>
+<ul>
+<li><a class="externalLink" href="http://www.atlassian.com/software/jira/docs/latest/">JIRA Documentation</a></li>
+<li><a class="externalLink" href="http://www.atlassian.com/software/jira/docs/latest/issues.html">What is an Issue?</a></li>
+<li><a class="externalLink" href="http://www.atlassian.com/software/jira/docs/latest/projects.html">What is a project?</a></li>
+<li><a class="externalLink" href="http://markmail.org/message/wfv2lw66i2gggnaq">how we handle JIRA versions Thread</a></li></ul></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/developers/conventions/svn.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/svn.html (original)
+++ websites/staging/maven/trunk/content/developers/conventions/svn.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="20110604" />
-    <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" />
         Maven SVN Convention
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -233,13 +233,54 @@ 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>Maven SVN Convention<a name="Maven_SVN_Convention"></a></h2><p>This document describes how developers should use SVN, our SCM.</p><div class="section"><h3>Subversion Configuration<a name="Subversion_Configuration"></a></h3><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="../../developers/svn-eol-style.txt">svn-eol-style.txt</a></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 SVN Convention<a name="Maven_SVN_Convention"></a></h2>
+<p>This document describes how developers should use SVN, our SCM.</p>
+<div class="section">
+<h3>Subversion Configuration<a name="Subversion_Configuration"></a></h3>
+<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="../../developers/svn-eol-style.txt">svn-eol-style.txt</a></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><p>If you want to edit a commit message, you could call:</p><div class="source"><pre>svn pe svn:log --revprop -r XXX</pre></div><p>where <b>XXX</b> is the wanted version</p></div><div class="section"><h3>Other useful Subversion commands while developing<a name="Other_useful_Subversion_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>$ svn revert -R .</pre></div><p>The <tt>-R</tt> argument means that the command will recurse down all directories and revert all changes.</p><p
 >Before committing code to the Subversion repository we always set the <tt>svn:ignore</tt> property on the directory to prevent some files and directories to be checked in. We always exclude the IDE project files and the <tt>target/</tt> directory. Instead of keeping all of the excludes in mind all the time it's useful to put them all in a file and reference the file with the <tt>-F</tt> option:</p><div><pre>$ svn propset svn:ignore -F ~/bin/svnignore .</pre></div><p>A typical svnignore file:</p><div><pre>target
+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>
+<p>If you want to edit a commit message, you could call:</p>
+<div class="source">
+<pre>svn pe svn:log --revprop -r XXX</pre></div>
+<p>where <b>XXX</b> is the wanted version</p></div>
+<div class="section">
+<h3>Other useful Subversion commands while developing<a name="Other_useful_Subversion_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>$ svn revert -R .</pre></div>
+<p>The <tt>-R</tt> argument means that the command will recurse down all directories and revert all changes.</p>
+<p>Before committing code to the Subversion repository we always set the <tt>svn:ignore</tt> property on the directory to prevent some files and directories to be checked in. We always exclude the IDE project files and the <tt>target/</tt> directory. Instead of keeping all of the excludes in mind all the time it's useful to put them all in a file and reference the file with the <tt>-F</tt> option:</p>
+<div>
+<pre>$ svn propset svn:ignore -F ~/bin/svnignore .</pre></div>
+<p>A typical svnignore file:</p>
+<div>
+<pre>target
 *~
 *.log
 .classpath

Modified: websites/staging/maven/trunk/content/developers/dependency-policies.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/dependency-policies.html (original)
+++ websites/staging/maven/trunk/content/developers/dependency-policies.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="Stephen Connolly" />
         <meta name="Date-Creation-yyyymmdd" content="20110201" />
-    <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 Dependency Policies
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,7 +232,31 @@
     </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 Dependency Policies<a name="Maven_Dependency_Policies"></a></h2><div class="section"><h3>Scope<a name="Scope"></a></h3><p>This page describes the policies around the use of dependencies by the Apache Maven Developers in the process of developing Apache Maven itself.</p><p>This page does not apply to projects hosted outside of the Apache Maven project. In order to remove all doubt, this page only applies to code which has a Subversion URL that starts with <tt>https://svn.apache.org/repo/asf/maven/</tt></p><p>If you have stumbled across this page and you are working on code that does not have a Subversion URL starting with <tt>https://svn.apache.org/repo/asf/maven/</tt> then this page does not apply to you. Or git repositories starting with: https://git-wip-us.apache.org/repos/asf/maven*</p></div><div class="section"><h3>Background<a name="Background"></a></h3><p>The Apache Maven PMC is tasked with ensuring (among other thi
 ngs) that all legal issues are addressed and that each and every release is the product of the community as a whole.</p><p>The Apache Maven project consists of quite a number of components. For the purposes of this policy, we will make a distinction between the core Maven distribution and all the other components.</p><p>The core Maven distribution is the binary and source distributions made available from the http://maven.apache.org/download page. </p></div><div class="section"><h3>Applicability<a name="Applicability"></a></h3><p>This policy applies to all changes to dependencies as and from Subversion revision 1067464.</p></div><div class="section"><h3>Core Maven Distribution Dependencies<a name="Core_Maven_Distribution_Dependencies"></a></h3><p>All dependencies which are included in the Core Maven Distribution must either:</p><ul><li>be licensed under a <a class="externalLink" href="http://www.apache.org/legal/resolved.html#category-a">Category A license</a>; or</li><li>be
  licensed under a <a class="externalLink" href="http://www.apache.org/legal/resolved.html#category-b">Category B license</a> and approved by a majority vote of the Apache Maven PMC.</li></ul><p>Votes for Category B licenses will be held on the dev@maven.apache.org mailing list. A majority of the PMC must vote in favour of a Category B licensed dependency before a release can be made containing that dependency.</p></div><div class="section"><h3>Non-Core Dependencies<a name="Non-Core_Dependencies"></a></h3><p>Non-Core components may only use Category A or Category B licenses.</p></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>Maven Dependency Policies<a name="Maven_Dependency_Policies"></a></h2>
+<div class="section">
+<h3>Scope<a name="Scope"></a></h3>
+<p>This page describes the policies around the use of dependencies by the Apache Maven Developers in the process of developing Apache Maven itself.</p>
+<p>This page does not apply to projects hosted outside of the Apache Maven project. In order to remove all doubt, this page only applies to code which has a Subversion URL that starts with <tt>https://svn.apache.org/repo/asf/maven/</tt></p>
+<p>If you have stumbled across this page and you are working on code that does not have a Subversion URL starting with <tt>https://svn.apache.org/repo/asf/maven/</tt> then this page does not apply to you. Or git repositories starting with: https://git-wip-us.apache.org/repos/asf/maven*</p></div>
+<div class="section">
+<h3>Background<a name="Background"></a></h3>
+<p>The Apache Maven PMC is tasked with ensuring (among other things) that all legal issues are addressed and that each and every release is the product of the community as a whole.</p>
+<p>The Apache Maven project consists of quite a number of components. For the purposes of this policy, we will make a distinction between the core Maven distribution and all the other components.</p>
+<p>The core Maven distribution is the binary and source distributions made available from the http://maven.apache.org/download page. </p></div>
+<div class="section">
+<h3>Applicability<a name="Applicability"></a></h3>
+<p>This policy applies to all changes to dependencies as and from Subversion revision 1067464.</p></div>
+<div class="section">
+<h3>Core Maven Distribution Dependencies<a name="Core_Maven_Distribution_Dependencies"></a></h3>
+<p>All dependencies which are included in the Core Maven Distribution must either:</p>
+<ul>
+<li>be licensed under a <a class="externalLink" href="http://www.apache.org/legal/resolved.html#category-a">Category A license</a>; or</li>
+<li>be licensed under a <a class="externalLink" href="http://www.apache.org/legal/resolved.html#category-b">Category B license</a> and approved by a majority vote of the Apache Maven PMC.</li></ul>
+<p>Votes for Category B licenses will be held on the dev@maven.apache.org mailing list. A majority of the PMC must vote in favour of a Category B licensed dependency before a release can be made containing that dependency.</p></div>
+<div class="section">
+<h3>Non-Core Dependencies<a name="Non-Core_Dependencies"></a></h3>
+<p>Non-Core components may only use Category A or Category B licenses.</p></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/developers/index.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/index.html (original)
+++ websites/staging/maven/trunk/content/developers/index.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
 Brett Porter" />
         <meta name="Date-Creation-yyyymmdd" content="20080703" />
-    <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 @@ Brett Porter" />
         Maven Developer Centre
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -233,7 +233,56 @@ Brett Porter" />
     </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 Developer Centre<a name="Maven_Developer_Centre"></a></h2><p>This documentation centre is for people who are Maven developers, or would like to contribute.</p><p>If you cannot find your answers here, feel free to ask the <a class="externalLink" href="mailto:dev@maven.apache.org">Maven Developer List</a>.</p><div class="section"><h3>Contributors Resources<a name="Contributors_Resources"></a></h3><ul><li><a href="../guides/development/guide-helping.html">Guide to helping with Maven</a></li><li><a href="../guides/development/guide-m2-development.html">Developing Maven</a></li><li><a href="../plugin-developers/common-bugs.html"> Common Bugs and Pitfalls</a></li><li><a href="../guides/development/guide-building-m2.html">Building Maven</a></li><li><a href="../continuous-integration.html">Continuous Integration</a></li><li><a href="../source-repository.html">Source Repository</a></li></ul></div><div class="section"><h3>Committer
 s Resources<a name="Committers_Resources"></a></h3><div class="section"><h4>General Resources<a name="General_Resources"></a></h4><ul><li><a href="./welcome-to-new-committers.html">Guide for new Maven committers</a></li><li><a href="./committer-environment.html">Committer Environment</a></li><li><a href="./committer-settings.html">Committer Settings</a></li><li><a href="./java5.html">Java 5 in Plugins and Components</a></li><li><a href="./retirement-plan-plugins.html">Retirement Plan for Plugins</a></li><li><a href="./dependency-policies.html">Maven Dependency Policies</a></li></ul></div></div><div class="section"><h3>Developers Conventions<a name="Developers_Conventions"></a></h3><p>There are a number of conventions used in the Maven projects, which contributors and developers alike should follow for consistency's sake.</p><ul><li><a href="./conventions/code.html">Maven Code Style And Conventions</a></li><li><a href="./conventions/jira.html">Maven JIRA Convention</a></li><l
 i><a href="./conventions/svn.html">Maven SVN Convention</a></li><li><a href="./conventions/git.html">Maven Git Convention</a></li></ul><p><b>Note</b>: If you cannot find your answers here, feel free to ask the <a class="externalLink" href="mailto:dev@maven.apache.org">Maven Developer List</a>.</p></div><div class="section"><h3>Making Releases<a name="Making_Releases"></a></h3><ul><li><a href="./release/pmc-gpg-keys.html">Making GPG Keys</a></li><li><a href="./release/releasing.html">Release Process</a></li></ul></div><div class="section"><h3>Maven Website<a name="Maven_Website"></a></h3><ul><li><a href="./website/deploy-maven-website.html">Deploy Maven Website</a></li><li><a href="./website/deploy-maven-current-ref.html">Deploy Maven Current References</a></li></ul></div><div class="section"><h3>Others Resources<a name="Others_Resources"></a></h3><ul><li><a class="externalLink" href="http://people.apache.org/~vgritsenko/stats/projects/maven.html">Maven Web Stats</a></li><li>
 <a class="externalLink" href="http://people.apache.org/~coar/mlists.html#maven.apache.org">Maven Mailing List Stats</a></li><li><a class="externalLink" href="http://www.apache.org/dev/">ASF Development Infrastructure Information</a></li><li><a class="externalLink" href="http://www.apache.org/foundation/">About the Apache Software Foundation</a></li></ul><!-- TODO: tasks as buttons? --><!-- TODO: de-dupe with existing documents in community --><!-- TODO: clean up, have cookbook with more in depth documents like cutting releases, etc. --></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>Maven Developer Centre<a name="Maven_Developer_Centre"></a></h2>
+<p>This documentation centre is for people who are Maven developers, or would like to contribute.</p>
+<p>If you cannot find your answers here, feel free to ask the <a class="externalLink" href="mailto:dev@maven.apache.org">Maven Developer List</a>.</p>
+<div class="section">
+<h3>Contributors Resources<a name="Contributors_Resources"></a></h3>
+<ul>
+<li><a href="../guides/development/guide-helping.html">Guide to helping with Maven</a></li>
+<li><a href="../guides/development/guide-m2-development.html">Developing Maven</a></li>
+<li><a href="../plugin-developers/common-bugs.html"> Common Bugs and Pitfalls</a></li>
+<li><a href="../guides/development/guide-building-m2.html">Building Maven</a></li>
+<li><a href="../continuous-integration.html">Continuous Integration</a></li>
+<li><a href="../source-repository.html">Source Repository</a></li></ul></div>
+<div class="section">
+<h3>Committers Resources<a name="Committers_Resources"></a></h3>
+<div class="section">
+<h4>General Resources<a name="General_Resources"></a></h4>
+<ul>
+<li><a href="./welcome-to-new-committers.html">Guide for new Maven committers</a></li>
+<li><a href="./committer-environment.html">Committer Environment</a></li>
+<li><a href="./committer-settings.html">Committer Settings</a></li>
+<li><a href="./java5.html">Java 5 in Plugins and Components</a></li>
+<li><a href="./retirement-plan-plugins.html">Retirement Plan for Plugins</a></li>
+<li><a href="./dependency-policies.html">Maven Dependency Policies</a></li></ul></div></div>
+<div class="section">
+<h3>Developers Conventions<a name="Developers_Conventions"></a></h3>
+<p>There are a number of conventions used in the Maven projects, which contributors and developers alike should follow for consistency's sake.</p>
+<ul>
+<li><a href="./conventions/code.html">Maven Code Style And Conventions</a></li>
+<li><a href="./conventions/jira.html">Maven JIRA Convention</a></li>
+<li><a href="./conventions/svn.html">Maven SVN Convention</a></li>
+<li><a href="./conventions/git.html">Maven Git Convention</a></li></ul>
+<p><b>Note</b>: If you cannot find your answers here, feel free to ask the <a class="externalLink" href="mailto:dev@maven.apache.org">Maven Developer List</a>.</p></div>
+<div class="section">
+<h3>Making Releases<a name="Making_Releases"></a></h3>
+<ul>
+<li><a href="./release/pmc-gpg-keys.html">Making GPG Keys</a></li>
+<li><a href="./release/releasing.html">Release Process</a></li></ul></div>
+<div class="section">
+<h3>Maven Website<a name="Maven_Website"></a></h3>
+<ul>
+<li><a href="./website/deploy-maven-website.html">Deploy Maven Website</a></li>
+<li><a href="./website/deploy-maven-current-ref.html">Deploy Maven Current References</a></li></ul></div>
+<div class="section">
+<h3>Others Resources<a name="Others_Resources"></a></h3>
+<ul>
+<li><a class="externalLink" href="http://people.apache.org/~vgritsenko/stats/projects/maven.html">Maven Web Stats</a></li>
+<li><a class="externalLink" href="http://people.apache.org/~coar/mlists.html#maven.apache.org">Maven Mailing List Stats</a></li>
+<li><a class="externalLink" href="http://www.apache.org/dev/">ASF Development Infrastructure Information</a></li>
+<li><a class="externalLink" href="http://www.apache.org/foundation/">About the Apache Software Foundation</a></li></ul><!-- TODO: tasks as buttons? --><!-- TODO: de-dupe with existing documents in community --><!-- TODO: clean up, have cookbook with more in depth documents like cutting releases, etc. --></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/developers/java5.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/java5.html (original)
+++ websites/staging/maven/trunk/content/developers/java5.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="Dennis Lundberg" />
         <meta name="Date-Creation-yyyymmdd" content="20110204" />
-    <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 @@
         Java 5 in Plugins and Components
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,7 +232,11 @@
     </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>Java 5 in Plugins and Components<a name="Java_5_in_Plugins_and_Components"></a></h2><p>When you want to start using Java 5 features in a plugin, or shared component, this process must be used as decided by the Maven PMC.</p><p>A plugin can start using Java 5 features and/or dependencies when the need arises, but if there are issues that have been fixed but not released yet, the current trunk of the plugin must be released first, targeting Java 1.4. In the announcement for that last Java 1.4 version of the plugin, we inform the users that this is the last version that will be able to run on Java 1.4.</p><p>When a plugin, or other component, decides to switch to Java 5, you should use the description field in JIRA to label the versions for the plugin, so that it is clear which version runs on which version of Java. See <a class="externalLink" href="http://jira.codehaus.org/browse/MCHANGES#selectedTab=com.atlassian.jira.plugin.sys
 tem.project%3Aversions-panel">Maven Changes Plugin</a> for an example.</p></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>Java 5 in Plugins and Components<a name="Java_5_in_Plugins_and_Components"></a></h2>
+<p>When you want to start using Java 5 features in a plugin, or shared component, this process must be used as decided by the Maven PMC.</p>
+<p>A plugin can start using Java 5 features and/or dependencies when the need arises, but if there are issues that have been fixed but not released yet, the current trunk of the plugin must be released first, targeting Java 1.4. In the announcement for that last Java 1.4 version of the plugin, we inform the users that this is the last version that will be able to run on Java 1.4.</p>
+<p>When a plugin, or other component, decides to switch to Java 5, you should use the description field in JIRA to label the versions for the plugin, so that it is clear which version runs on which version of Java. See <a class="externalLink" href="http://jira.codehaus.org/browse/MCHANGES#selectedTab=com.atlassian.jira.plugin.system.project%3Aversions-panel">Maven Changes Plugin</a> for an example.</p></div>
       </div>
     </div>
     <div class="clear">