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 [28/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/ doc...

Modified: websites/staging/maven/trunk/content/maven-1.x-eol.html
==============================================================================
--- websites/staging/maven/trunk/content/maven-1.x-eol.html (original)
+++ websites/staging/maven/trunk/content/maven-1.x-eol.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="20130418" />
-    <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 @@
         Apache Maven 1.x End Of Life
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,7 +232,18 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>End Of Life Apache Maven 1.x<a name="End_Of_Life_Apache_Maven_1.x"></a></h2><p>The Apache Maven Project Team would like to inform you that the Apache Maven 1.x has reached its end of life and is no longer supported.</p><p>Apache Maven 1.x had its last release - version 1.1 - in June 2007.</p><p>This means:</p><ul><li>security vulnerability reports will not be checked against the 1.x branch</li><li>the 1.x download pages will be removed.</li><li>the latest 1.x release will be removed from the mirror system</li><li>the 1.x branch in svn will move from /maven/maven-1/ to /maven/archives/maven-1/</li><li>the links to the 1.x documentation will be moved from http://maven.apache.org/maven-1.x/ to http://maven.apache.org/archives/maven-1.x/</li></ul><p>The Apache Maven Team.</p></div>
+        <div class="section">
+<h2>End Of Life Apache Maven 1.x<a name="End_Of_Life_Apache_Maven_1.x"></a></h2>
+<p>The Apache Maven Project Team would like to inform you that the Apache Maven 1.x has reached its end of life and is no longer supported.</p>
+<p>Apache Maven 1.x had its last release - version 1.1 - in June 2007.</p>
+<p>This means:</p>
+<ul>
+<li>security vulnerability reports will not be checked against the 1.x branch</li>
+<li>the 1.x download pages will be removed.</li>
+<li>the latest 1.x release will be removed from the mirror system</li>
+<li>the 1.x branch in svn will move from /maven/maven-1/ to /maven/archives/maven-1/</li>
+<li>the links to the 1.x documentation will be moved from http://maven.apache.org/maven-1.x/ to http://maven.apache.org/archives/maven-1.x/</li></ul>
+<p>The Apache Maven Team.</p></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/maven-conventions.html
==============================================================================
--- websites/staging/maven/trunk/content/maven-conventions.html (original)
+++ websites/staging/maven/trunk/content/maven-conventions.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="Jason van Zyl
 Brett Porter" />
-        <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 @@ Brett Porter" />
         Maven Features
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,10 +232,26 @@ Brett Porter" />
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Maven Conventions<a name="Maven_Conventions"></a></h2><p>This document defines some conventions that Maven recommends projects adopt. This is especially important if you intend to distribute your project publicly.</p></div><div class="section"><h2>Artifact Naming<a name="Artifact_Naming"></a></h2><p>This section outlines the naming conventions used in the Maven project object model (POM). This document is an attempt to try and unify the many various ways projects name the artifacts that they publish for general consumption by the Java developer community (regardless of whether they are using Maven).</p><p>The first thing you will do when creating a project is to select a group ID and an artifact ID. If you are building a project to be part of a larger product that is already using Maven, you should attempt to follow any patterns already established by other projects for consistency.</p><p>These identifiers should be comprised of <i>lowercase<
 /i> letters, digits, and hyphens only.</p><p>In general you should select a group ID that describes the entire product, and artifact IDs that are the basis of filenames for each item you distribute. The artifact ID may or may not overlap the group ID.</p><p>For example:</p><div class="source"><pre>
+        <div class="section">
+<h2>Maven Conventions<a name="Maven_Conventions"></a></h2>
+<p>This document defines some conventions that Maven recommends projects adopt. This is especially important if you intend to distribute your project publicly.</p></div>
+<div class="section">
+<h2>Artifact Naming<a name="Artifact_Naming"></a></h2>
+<p>This section outlines the naming conventions used in the Maven project object model (POM). This document is an attempt to try and unify the many various ways projects name the artifacts that they publish for general consumption by the Java developer community (regardless of whether they are using Maven).</p>
+<p>The first thing you will do when creating a project is to select a group ID and an artifact ID. If you are building a project to be part of a larger product that is already using Maven, you should attempt to follow any patterns already established by other projects for consistency.</p>
+<p>These identifiers should be comprised of <i>lowercase</i> letters, digits, and hyphens only.</p>
+<p>In general you should select a group ID that describes the entire product, and artifact IDs that are the basis of filenames for each item you distribute. The artifact ID may or may not overlap the group ID.</p>
+<p>For example:</p>
+<div class="source">
+<pre>
 maven : maven-core
 maven : wagon-api
-</pre></div><p>As previously mentioned, the artifact ID should be the basis of the filename for the project, as by default Maven will use that and the version to assemble the filename. Having the version as part of the filename is strongly recommended to ensure that the version can be determined at a glance without having to check a possibly non-existant manifest, or compare file sizes with the official releases.</p><p>Following these guidelines are particularly encouraged when distributing via the Maven Repository, to ensure that it can easily fit alongside other projects and reduce the risk of conflicts and confusion.</p></div><div class="section"><h2>Directory Structure<a name="Directory_Structure"></a></h2><p>Maven encourages a common directory structure for a project. For more information on this please refer to our <a href="./guides/introduction/introduction-to-the-standard-directory-layout.html">Introduction to the standard directory structure</a>.</p></div>
+</pre></div>
+<p>As previously mentioned, the artifact ID should be the basis of the filename for the project, as by default Maven will use that and the version to assemble the filename. Having the version as part of the filename is strongly recommended to ensure that the version can be determined at a glance without having to check a possibly non-existant manifest, or compare file sizes with the official releases.</p>
+<p>Following these guidelines are particularly encouraged when distributing via the Maven Repository, to ensure that it can easily fit alongside other projects and reduce the risk of conflicts and confusion.</p></div>
+<div class="section">
+<h2>Directory Structure<a name="Directory_Structure"></a></h2>
+<p>Maven encourages a common directory structure for a project. For more information on this please refer to our <a href="./guides/introduction/introduction-to-the-standard-directory-layout.html">Introduction to the standard directory structure</a>.</p></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/maven-features.html
==============================================================================
--- websites/staging/maven/trunk/content/maven-features.html (original)
+++ websites/staging/maven/trunk/content/maven-features.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 @@
         Maven Features
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -231,7 +231,22 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Feature Summary<a name="Feature_Summary"></a></h2><p>The following are the key features of Maven in a nutshell:</p><ul><li>Simple project setup that follows best practices - get a new project or module started in seconds</li><li>Consistent usage across all projects means no ramp up time for new developers coming onto a project</li><li>Superior dependency management including automatic updating, dependency closures (also known as transitive dependencies)</li><li>Able to easily work with multiple projects at the same time</li><li>A large and growing repository of libraries and metadata to use out of the box, and arrangements in place with the largest Open Source projects for real-time availability of their latest releases</li><li>Extensible, with the ability to easily write plugins in Java or scripting languages</li><li>Instant access to new features with little or no extra configuration</li><li>Ant tasks for dependency management and deploymen
 t outside of Maven</li><li>Model based builds: Maven is able to build any number of projects into predefined output types such as a JAR, WAR, or distribution based on metadata about the project, without the need to do any scripting in most cases.</li><li>Coherent site of project information: Using the same metadata as for the build process, Maven is able to generate a web site or PDF including any documentation you care to add, and adds to that standard reports about the state of development of the project. Examples of this information can be seen at the bottom of the left-hand navigation of this site under the &quot;Project Information&quot; and &quot;Project Reports&quot; submenus.</li><li>Release management and distribution publication: Without much additional configuration, Maven will integrate with your source control system such as CVS and manage the release of a project based on a certain tag. It can also publish this to a distribution location for use by other projec
 ts. Maven is able to publish individual outputs such as a JAR, an archive including other dependencies and documentation, or as a source distribution.</li><li>Dependency management: Maven encourages the use of a central repository of JARs and other dependencies. Maven comes with a mechanism that your project's clients can use to download any JARs required for building your project from a central JAR repository much like Perl's CPAN. This allows users of Maven to reuse JARs across projects and encourages communication between projects to ensure that backward compatibility issues are dealt with. We are collaborating with the folks at <a class="externalLink" href="http://www.ibiblio.org">Ibiblio</a> who have graciously allowed the central repository to live on their servers.</li></ul><!-- this needs to be greatly expanded and is too detailed here ... jvz --></div>
+        <div class="section">
+<h2>Feature Summary<a name="Feature_Summary"></a></h2>
+<p>The following are the key features of Maven in a nutshell:</p>
+<ul>
+<li>Simple project setup that follows best practices - get a new project or module started in seconds</li>
+<li>Consistent usage across all projects means no ramp up time for new developers coming onto a project</li>
+<li>Superior dependency management including automatic updating, dependency closures (also known as transitive dependencies)</li>
+<li>Able to easily work with multiple projects at the same time</li>
+<li>A large and growing repository of libraries and metadata to use out of the box, and arrangements in place with the largest Open Source projects for real-time availability of their latest releases</li>
+<li>Extensible, with the ability to easily write plugins in Java or scripting languages</li>
+<li>Instant access to new features with little or no extra configuration</li>
+<li>Ant tasks for dependency management and deployment outside of Maven</li>
+<li>Model based builds: Maven is able to build any number of projects into predefined output types such as a JAR, WAR, or distribution based on metadata about the project, without the need to do any scripting in most cases.</li>
+<li>Coherent site of project information: Using the same metadata as for the build process, Maven is able to generate a web site or PDF including any documentation you care to add, and adds to that standard reports about the state of development of the project. Examples of this information can be seen at the bottom of the left-hand navigation of this site under the &quot;Project Information&quot; and &quot;Project Reports&quot; submenus.</li>
+<li>Release management and distribution publication: Without much additional configuration, Maven will integrate with your source control system such as CVS and manage the release of a project based on a certain tag. It can also publish this to a distribution location for use by other projects. Maven is able to publish individual outputs such as a JAR, an archive including other dependencies and documentation, or as a source distribution.</li>
+<li>Dependency management: Maven encourages the use of a central repository of JARs and other dependencies. Maven comes with a mechanism that your project's clients can use to download any JARs required for building your project from a central JAR repository much like Perl's CPAN. This allows users of Maven to reuse JARs across projects and encourages communication between projects to ensure that backward compatibility issues are dealt with. We are collaborating with the folks at <a class="externalLink" href="http://www.ibiblio.org">Ibiblio</a> who have graciously allowed the central repository to live on their servers.</li></ul><!-- this needs to be greatly expanded and is too detailed here ... jvz --></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/maven-jsr330.html
==============================================================================
--- websites/staging/maven/trunk/content/maven-jsr330.html (original)
+++ websites/staging/maven/trunk/content/maven-jsr330.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 @@
         
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -230,17 +230,39 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <h1>Maven &amp; JSR-330</h1><div class="section"><h2>Why JSR-330?<a name="Why_JSR-330"></a></h2><p>Maven has a long history of using dependency injection (DI) by way of <a class="externalLink" href="http://plexus.codehaus.org/">Plexus</a>, so the intent of using <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=330">JSR-330</a> is to replace a custom DI mechanism with something standard. The implementation Maven uses - since 3.0-beta-3 - is based on <a class="externalLink" href="http://code.google.com/p/google-guice/">Guice 3.x</a>, which directly supports JSR-330.</p><p>If you are using <a class="externalLink" href="http://plexus.codehaus.org/plexus-containers/">Plexus annotations and APIs</a> currently, there is no rush to switch and no big bang conversions are necessary: Plexus, JSR-330 and Guice APIs all happily co-exist within Maven's core and you can choose to use JSR-330 when you wish. There are hundreds of components written using the Plexus A
 PIs, particularly components and plugins compatible with Maven 2, then those APIs will be supported forever, or at least until Maven fully drops Maven 2 support. </p><p>If you want to use JSR-330, you must understand that your code won't be compatible with Maven 2 or 3.0.x but only with Maven 3.1.0+: even if JSR-330 is available in core since Maven 3.0-beta-3, it was made available to plugins and extensions only in Maven 3.1.0 (see <a class="externalLink" href="http://jira.codehaus.org/browse/MNG-5343">MNG-5343</a> for more details).</p><p>If you are interested the background of moving from Plexus to Guice and JSR-330, you can refer to the following articles:</p>
+        <h1>Maven &amp; JSR-330</h1>
+<div class="section">
+<h2>Why JSR-330?<a name="Why_JSR-330"></a></h2>
+<p>Maven has a long history of using dependency injection (DI) by way of <a class="externalLink" href="http://plexus.codehaus.org/">Plexus</a>, so the intent of using <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=330">JSR-330</a> is to replace a custom DI mechanism with something standard. The implementation Maven uses - since 3.0-beta-3 - is based on <a class="externalLink" href="http://code.google.com/p/google-guice/">Guice 3.x</a>, which directly supports JSR-330.</p>
+<p>If you are using <a class="externalLink" href="http://plexus.codehaus.org/plexus-containers/">Plexus annotations and APIs</a> currently, there is no rush to switch and no big bang conversions are necessary: Plexus, JSR-330 and Guice APIs all happily co-exist within Maven's core and you can choose to use JSR-330 when you wish. There are hundreds of components written using the Plexus APIs, particularly components and plugins compatible with Maven 2, then those APIs will be supported forever, or at least until Maven fully drops Maven 2 support. </p>
+<p>If you want to use JSR-330, you must understand that your code won't be compatible with Maven 2 or 3.0.x but only with Maven 3.1.0+: even if JSR-330 is available in core since Maven 3.0-beta-3, it was made available to plugins and extensions only in Maven 3.1.0 (see <a class="externalLink" href="http://jira.codehaus.org/browse/MNG-5343">MNG-5343</a> for more details).</p>
+<p>If you are interested the background of moving from Plexus to Guice and JSR-330, you can refer to the following articles:</p>
+
 <ul>
-  <li><a class="externalLink" href="http://www.sonatype.com/people/2010/01/from-plexus-to-guice-1-why-guice/">Plexus to Guice Part 1</a></li>
-  <li><a class="externalLink" href="http://www.sonatype.com/people/2010/01/from-plexus-to-guice-2-the-guiceplexus-bridge-and-custom-bean-injection/">Plexus to Guice Part 2</a></li>
-  <li><a class="externalLink" href="http://www.sonatype.com/people/2010/01/from-plexus-to-guice-3-creating-a-guice-bean-extension-layer/">Plexus to Guice Part 3</a></li>
-</ul></div><div class="section"><h2>How to use JSR-330<a name="How_to_use_JSR-330"></a></h2><p>When you use JSR-330 in Maven plugins or extensions, there are two things you need to setup in your build. First you want a dependency on <tt>javax.inject</tt> so you can use the <tt>@Inject</tt>, <tt>@Named</tt>, and <tt>@Singleton</tt> annotations in your plugins and extensions. Second you need to setup the <a class="externalLink" href="http://sonatype.github.com/sisu-maven-plugin/"><tt>sisu-maven-plugin</tt></a> to index the JSR-330 components you want made available to Maven. The <tt>sisu-maven-plugin</tt> creates its index in <tt>META-INF/sisu/javax.inject.Named</tt>. If you take a look in that file you will see something like the following:</p>
-<div class="source"><pre>org.apache.maven.lifecycle.profiler.LifecycleProfiler
+  
+<li><a class="externalLink" href="http://www.sonatype.com/people/2010/01/from-plexus-to-guice-1-why-guice/">Plexus to Guice Part 1</a></li>
+  
+<li><a class="externalLink" href="http://www.sonatype.com/people/2010/01/from-plexus-to-guice-2-the-guiceplexus-bridge-and-custom-bean-injection/">Plexus to Guice Part 2</a></li>
+  
+<li><a class="externalLink" href="http://www.sonatype.com/people/2010/01/from-plexus-to-guice-3-creating-a-guice-bean-extension-layer/">Plexus to Guice Part 3</a></li>
+</ul></div>
+<div class="section">
+<h2>How to use JSR-330<a name="How_to_use_JSR-330"></a></h2>
+<p>When you use JSR-330 in Maven plugins or extensions, there are two things you need to setup in your build. First you want a dependency on <tt>javax.inject</tt> so you can use the <tt>@Inject</tt>, <tt>@Named</tt>, and <tt>@Singleton</tt> annotations in your plugins and extensions. Second you need to setup the <a class="externalLink" href="http://sonatype.github.com/sisu-maven-plugin/"><tt>sisu-maven-plugin</tt></a> to index the JSR-330 components you want made available to Maven. The <tt>sisu-maven-plugin</tt> creates its index in <tt>META-INF/sisu/javax.inject.Named</tt>. If you take a look in that file you will see something like the following:</p>
+
+<div class="source">
+<pre>org.apache.maven.lifecycle.profiler.LifecycleProfiler
 org.apache.maven.lifecycle.profiler.internal.DefaultSessionProfileRenderer
 org.apache.maven.lifecycle.profiler.internal.DefaultTimer
-</pre></div><p>Enumerating the implementations means that no classpath scanning is required in runtime to find them, which keeps Maven's startup time fast. Note that our container is configured by default to only use the index. While this keeps things fast, if you use JSR-330 components in dependencies that do not contain an index, those implementations will currently not be discovered. This is a compromise that is reasonable given Maven is a command-line tool where startup speed is important.</p></div><div class="section"><h2>How to use JSR-330 in extensions<a name="How_to_use_JSR-330_in_extensions"></a></h2><p>Let's take a look at an example extension. We'll take a look at the POM, and a little bit of the implementation so you can get an idea of how JSR-330 extensions work. Really, it's just a simple JSR-330 component. If you want to look at the full implementation, you can find it <a class="externalLink" href="https://github.com/tesla/tesla-profiler">here</a> on Github.</
 p><p>Ok, so let's take a look at the POM:</p>
-<div class="source"><pre>&lt;?xml version=&quot;1.0&quot;?&gt;
+</pre></div>
+<p>Enumerating the implementations means that no classpath scanning is required in runtime to find them, which keeps Maven's startup time fast. Note that our container is configured by default to only use the index. While this keeps things fast, if you use JSR-330 components in dependencies that do not contain an index, those implementations will currently not be discovered. This is a compromise that is reasonable given Maven is a command-line tool where startup speed is important.</p></div>
+<div class="section">
+<h2>How to use JSR-330 in extensions<a name="How_to_use_JSR-330_in_extensions"></a></h2>
+<p>Let's take a look at an example extension. We'll take a look at the POM, and a little bit of the implementation so you can get an idea of how JSR-330 extensions work. Really, it's just a simple JSR-330 component. If you want to look at the full implementation, you can find it <a class="externalLink" href="https://github.com/tesla/tesla-profiler">here</a> on Github.</p>
+<p>Ok, so let's take a look at the POM:</p>
+
+<div class="source">
+<pre>&lt;?xml version=&quot;1.0&quot;?&gt;
 &lt;project xsi:schemaLocation=&quot;http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd&quot; xmlns=&quot;http://maven.apache.org/POM/4.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;&gt;
   &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
@@ -287,8 +309,11 @@ org.apache.maven.lifecycle.profiler.inte
     &lt;/plugins&gt;
   &lt;/build&gt;
 &lt;/project&gt;
-</pre></div><p>So, as mentioned, we have the <tt>javax.inject</tt> dependency and the <tt>sisu-maven-plugin</tt> configured to create the JSR-330 component index. When you build and place the extension JAR in the <tt>${MAVEN_HOME}/lib/ext</tt> folder, it will automatically get picked up by Maven. In the case of this example, we have an implementation of an <tt>EventSpy</tt> that times the executions of individual mojos within a phase in the lifecycle.</p>
-<div class="source"><pre>package org.apache.maven.lifecycle.profiler;
+</pre></div>
+<p>So, as mentioned, we have the <tt>javax.inject</tt> dependency and the <tt>sisu-maven-plugin</tt> configured to create the JSR-330 component index. When you build and place the extension JAR in the <tt>${MAVEN_HOME}/lib/ext</tt> folder, it will automatically get picked up by Maven. In the case of this example, we have an implementation of an <tt>EventSpy</tt> that times the executions of individual mojos within a phase in the lifecycle.</p>
+
+<div class="source">
+<pre>package org.apache.maven.lifecycle.profiler;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -376,8 +401,13 @@ public class LifecycleProfiler extends A
     }
   }
 }
-</pre></div></div><div class="section"><h2>How to use JSR-330 in plugins<a name="How_to_use_JSR-330_in_plugins"></a></h2><p>Let's take a look at an example plugin. The POM is setup in a similar way to an extension, but we add a dependency to <tt>maven-plugin-api</tt> and <tt>maven-plugin-annotations</tt> to extend the <tt>AbstractMojo</tt> and use the Java 5 plugin annotations in our example.</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;
+</pre></div></div>
+<div class="section">
+<h2>How to use JSR-330 in plugins<a name="How_to_use_JSR-330_in_plugins"></a></h2>
+<p>Let's take a look at an example plugin. The POM is setup in a similar way to an extension, but we add a dependency to <tt>maven-plugin-api</tt> and <tt>maven-plugin-annotations</tt> to extend the <tt>AbstractMojo</tt> and use the Java 5 plugin annotations in our example.</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;4.0.0&lt;/modelVersion&gt;
 
@@ -460,8 +490,11 @@ public class LifecycleProfiler extends A
     &lt;/plugins&gt;
   &lt;/build&gt;
 &lt;/project&gt;
-</pre></div><p>Now let's take a look at the plugin code. You'll notice that we're using constructor injection which makes testing a lot easier. If you want to test your <tt>Jsr330Component</tt>, you do not need the container to instantiate the <tt>Mojo</tt>. In this simple case, you can actually test this plugin without using the plugin testing harness because you can instantiate the <tt>Jsr330Component</tt> and <tt>Jsr330Mojo</tt> directly and wire everything up manually using the constructor. Constructor injection, which Plexus lacks, greatly simplies testing. </p>
-<div class="source"><pre>package org.apache.maven.plugins;
+</pre></div>
+<p>Now let's take a look at the plugin code. You'll notice that we're using constructor injection which makes testing a lot easier. If you want to test your <tt>Jsr330Component</tt>, you do not need the container to instantiate the <tt>Mojo</tt>. In this simple case, you can actually test this plugin without using the plugin testing harness because you can instantiate the <tt>Jsr330Component</tt> and <tt>Jsr330Mojo</tt> directly and wire everything up manually using the constructor. Constructor injection, which Plexus lacks, greatly simplies testing. </p>
+
+<div class="source">
+<pre>package org.apache.maven.plugins;
 
 import javax.inject.Inject;
 
@@ -492,7 +525,8 @@ public class Jsr330Mojo
         component.hello();
     }
 }
-</pre></div><p>If you want to look at this example project, you can find the code <a class="externalLink" href="http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5382/">in Maven Core ITs</a>.</p></div>
+</pre></div>
+<p>If you want to look at this example project, you can find the code <a class="externalLink" href="http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5382/">in Maven Core ITs</a>.</p></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/maven-logging.html
==============================================================================
--- websites/staging/maven/trunk/content/maven-logging.html (original)
+++ websites/staging/maven/trunk/content/maven-logging.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 @@
         
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -246,8 +246,15 @@ software distributed under the License i
 "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. --><h1>Maven 3.1.x logging</h1><p>Maven 2.x and 3.0.x use <a class="externalLink" href="http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html">Plexus logging API</a> with basic Maven implementation writing to stdout.</p><p>We have reached the decision that <a class="externalLink" href="http://slf4j.org">SLF4J</a> is the best option for a logging API. SLF4J has reached a certain level of ubiquity and while SLF4J may not be perfect, it's the de facto standard and it's pointless to try and remake another one. SLF4J is used by many prominent Java OSS projects including 15 Apache projects already.</p><p>There are many implementations to choose from, including <a class="externalLink" href="http://logback.qos.ch">Logback</a> and <a class="externalLink" href="http://logging.apache.org/log4j/2.x/log4j-slf4j-impl/">Log4j2</a>. All the hard work has been done. All the bridges and funnels for oth
 er systems function well, which allows others to use whatever logging implementation they like in their components while still being able to have integrated logging.</p><p>The standard Maven distribution, from Maven 3.1.0 onward, uses the <a class="externalLink" href="http://slf4j.org/apidocs/">SLF4J API</a> for logging combined with the <a class="externalLink" href="http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html">SLF4J Simple</a> implementation. Future versions may use a more advanced implementation, but we chose to start simple.</p><p>Looking at the distribution you will see the following layout where the <tt>simplelogger.properties</tt>, <tt>slf4j-api-x.y.z-jar</tt> and <tt>slf4j-simple-x.y.z.jar</tt> specifically relate to the SLF4J implementation:</p>
-<div class="source"><pre>
+under the License. --><h1>Maven 3.1.x logging</h1>
+<p>Maven 2.x and 3.0.x use <a class="externalLink" href="http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html">Plexus logging API</a> with basic Maven implementation writing to stdout.</p>
+<p>We have reached the decision that <a class="externalLink" href="http://slf4j.org">SLF4J</a> is the best option for a logging API. SLF4J has reached a certain level of ubiquity and while SLF4J may not be perfect, it's the de facto standard and it's pointless to try and remake another one. SLF4J is used by many prominent Java OSS projects including 15 Apache projects already.</p>
+<p>There are many implementations to choose from, including <a class="externalLink" href="http://logback.qos.ch">Logback</a> and <a class="externalLink" href="http://logging.apache.org/log4j/2.x/log4j-slf4j-impl/">Log4j2</a>. All the hard work has been done. All the bridges and funnels for other systems function well, which allows others to use whatever logging implementation they like in their components while still being able to have integrated logging.</p>
+<p>The standard Maven distribution, from Maven 3.1.0 onward, uses the <a class="externalLink" href="http://slf4j.org/apidocs/">SLF4J API</a> for logging combined with the <a class="externalLink" href="http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html">SLF4J Simple</a> implementation. Future versions may use a more advanced implementation, but we chose to start simple.</p>
+<p>Looking at the distribution you will see the following layout where the <tt>simplelogger.properties</tt>, <tt>slf4j-api-x.y.z-jar</tt> and <tt>slf4j-simple-x.y.z.jar</tt> specifically relate to the SLF4J implementation:</p>
+
+<div class="source">
+<pre>
 m2
 &#x251c;&#x2500;&#x2500; LICENSE.txt
 &#x251c;&#x2500;&#x2500; NOTICE.txt
@@ -265,57 +272,94 @@ m2
     &#x251c;&#x2500;&#x2500; slf4j-api-x.y.z.jar
     &#x251c;&#x2500;&#x2500; slf4j-simple-x.y.z.jar
     &#x2514;&#x2500;&#x2500; ...
-</pre></div><div class="section"><h2>Configuring logging<a name="Configuring_logging"></a></h2><p>To configure logging with the <a class="externalLink" href="http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html">SLF4J Simple</a>, you can edit the properties in the <tt>${MAVEN_HOME}/conf/logging/simplelogger.properties</tt> file. The following table lists the available configuration properties along with the SLF4J Simple defaults.</p>
+</pre></div>
+<div class="section">
+<h2>Configuring logging<a name="Configuring_logging"></a></h2>
+<p>To configure logging with the <a class="externalLink" href="http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html">SLF4J Simple</a>, you can edit the properties in the <tt>${MAVEN_HOME}/conf/logging/simplelogger.properties</tt> file. The following table lists the available configuration properties along with the SLF4J Simple defaults.</p>
+
 <table border="0" class="bodyTable">
+
 <tr class="b">
+
 <td><tt>org.slf4j.simpleLogger.<b>logFile</b></tt></td>
+
 <td>The output target which can be the path to a file, or the special values &quot;System.out&quot; and &quot;System.err&quot;.
 Default is &quot;System.err&quot;.</td>
 </tr>
+
 <tr class="a">
+
 <td><tt>org.slf4j.simpleLogger.<b>defaultLogLevel</b></tt></td>
+
 <td>Default log level for all instances of SimpleLogger. Must be one of (&quot;trace&quot;, &quot;debug&quot;, &quot;info&quot;,
 &quot;warn&quot;, or &quot;error&quot;). If not specified, defaults to &quot;info&quot;.</td>
 </tr>
+
 <tr class="b">
+
 <td><tt>org.slf4j.simpleLogger.<b>log.a.b.c</b></tt></td>
+
 <td>Logging detail level for a SimpleLogger instance named &quot;a.b.c&quot;. Right-side value must be one of &quot;trace&quot;,
 &quot;debug&quot;, &quot;info&quot;, &quot;warn&quot;, or &quot;error&quot;. When a SimpleLogger named &quot;a.b.c&quot; is initialized, its level is assigned
 from this property. If unspecified, the level of nearest parent logger will be used, and if none is set,
 then the value specified by org.slf4j.simpleLogger.defaultLogLevel will be used.</td>
 </tr>
+
 <tr class="a">
+
 <td><tt>org.slf4j.simpleLogger.<b>showDateTime</b></tt></td>
+
 <td>Set to true if you want the current date and time to be included in output messages. Default is true</td>
 </tr>
+
 <tr class="b">
+
 <td><tt>org.slf4j.simpleLogger.<b>dateTimeFormat</b></tt></td>
+
 <td>The date and time format to be used in the output messages. The pattern describing the date and
 time format is defined by SimpleDateFormat. If the format is not specified or is invalid, the number
 of milliseconds since start up will be output.</td>
 </tr>
+
 <tr class="a">
+
 <td><tt>org.slf4j.simpleLogger.<b>showThreadName</b></tt></td>
+
 <td>Set to true if you want to output the current thread name. Defaults to true.</td>
 </tr>
+
 <tr class="b">
+
 <td><tt>org.slf4j.simpleLogger.<b>showLogName</b></tt></td>
+
 <td>Set to true if you want the Logger instance name to be included in output messages. Defaults to true.</td>
 </tr>
+
 <tr class="a">
+
 <td><tt>org.slf4j.simpleLogger.<b>showShortLogName</b></tt></td>
+
 <td>Set to true if you want the last component of the name to be included in output messages. Defaults to false.</td>
 </tr>
+
 <tr class="b">
+
 <td><tt>org.slf4j.simpleLogger.<b>levelInBrackets</b></tt></td>
+
 <td>Should the level string be output in brackets? Defaults to false.</td>
 </tr>
+
 <tr class="a">
+
 <td><tt>org.slf4j.simpleLogger.<b>warnLevelString</b></tt></td>
+
 <td>The string value output for the warn level. Defaults to WARN.</td>
 </tr>
-</table><p>The default configuration for Maven looks like the following:</p>
-<div class="source"><pre>
+</table>
+<p>The default configuration for Maven looks like the following:</p>
+
+<div class="source">
+<pre>
 # Default Maven logging configuration
 #
 org.slf4j.simpleLogger.defaultLogLevel=info
@@ -326,7 +370,10 @@ org.slf4j.simpleLogger.logFile=System.ou
 org.slf4j.simpleLogger.levelInBrackets=true
 org.slf4j.simpleLogger.log.Sisu=info
 org.slf4j.simpleLogger.warnLevelString=WARNING
-</pre></div></div><div class="section"><h2>Changing the SLF4J implementation<a name="Changing_the_SLF4J_implementation"></a></h2><p>If you want use a different logging implementation it is simply a matter of removing the slf4j-simple JAR from the <tt>lib</tt> directory and replacing it with one of the alternative implementations, like <a class="externalLink" href="http://logging.apache.org/log4j/2.x/log4j-slf4j-impl/">Log4j2</a> or <a class="externalLink" href="http://logback.qos.ch">Logback</a>. </p></div>
+</pre></div></div>
+<div class="section">
+<h2>Changing the SLF4J implementation<a name="Changing_the_SLF4J_implementation"></a></h2>
+<p>If you want use a different logging implementation it is simply a matter of removing the slf4j-simple JAR from the <tt>lib</tt> directory and replacing it with one of the alternative implementations, like <a class="externalLink" href="http://logging.apache.org/log4j/2.x/log4j-slf4j-impl/">Log4j2</a> or <a class="externalLink" href="http://logback.qos.ch">Logback</a>. </p></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.

Modified: websites/staging/maven/trunk/content/maven1.html
==============================================================================
--- websites/staging/maven/trunk/content/maven1.html (original)
+++ websites/staging/maven/trunk/content/maven1.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 @@
         Information for Maven 1.0 Users
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -245,107 +245,152 @@
   "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. --><div class="section"><h2><a name="top">Information for Maven 1.0 Users</a><a name="Information_for_Maven_1.0_Users"></a></h2><ol style="list-style-type: decimal"><li><a href="#changed">What's Changed?</a></li><li><a href="#m1-or-m2">Should I use Maven 2.x, Maven 3.x, or Maven 1.0?</a></li><li><a href="#m1-future">What will happen to Maven 1.0?</a></li><li><a href="#m1-plugins">Will my Maven 1.0 plugins be supported?</a></li><li><a href="#m1-maven-xml">How do I write custom scripts without a
+  under the License. --><div class="section">
+<h2><a name="top">Information for Maven 1.0 Users</a><a name="Information_for_Maven_1.0_Users"></a></h2>
+<ol style="list-style-type: decimal">
+<li><a href="#changed">What's Changed?</a></li>
+<li><a href="#m1-or-m2">Should I use Maven 2.x, Maven 3.x, or Maven 1.0?</a></li>
+<li><a href="#m1-future">What will happen to Maven 1.0?</a></li>
+<li><a href="#m1-plugins">Will my Maven 1.0 plugins be supported?</a></li>
+<li><a href="#m1-maven-xml">How do I write custom scripts without a
         <tt>maven.xml</tt>
         file?
-      </a></li><li><a href="#convert">How do I convert from Maven 1.x to Maven 2.x or 3.x?</a></li></ol></div><dl><dt><a name="changed">What's Changed?</a></dt><dd>
-        <p>
+      </a></li>
+<li><a href="#convert">How do I convert from Maven 1.x to Maven 2.x or 3.x?</a></li></ol></div>
+<dl>
+<dt><a name="changed">What's Changed?</a></dt>
+<dd>
+        
+<p>
           Maven 2.0 &amp; 3.0 will feel very different to a Maven 1.0 user - and perhaps a little strange. But it is a lot simpler
           to work with and closer to how Maven was always meant to be! The key changes from Maven 1.0 are:
        </p>
-        <ul>
-          <li>
+        
+<ul>
+          
+<li>
             <i>Faster and smaller</i>
             - The Maven core no longer uses Ant, Jelly or Xerces making it much smaller, has
             fewer dependencies, and is perfect for embedding in other tools.
          </li>
-          <li>
+          
+<li>
             <i>Defined build lifecycle</i>
             - No more <tt>prereqs</tt>, <tt>preGoals</tt> and <tt>postGoals</tt>.
             The build is a series of well defined phases. This also means that the normal goal names are not used -
             <tt>compile</tt>, <tt>test</tt> and <tt>install</tt>
             work for any project type.
          </li>
-          <li>
+          
+<li>
             <i>Built-in multiple project handling</i>
             - Use the same goals on a set of projects, and aggregate the
             results.
          </li>
-          <li>
+          
+<li>
             <i>Improved <tt>SNAPSHOT</tt> handling</i>
             - Snapshots are now checked for updates only once per day by
             default - though can be configured to be once per build, on a particular interval, or never. A command line
             option can force a check - making it more like updating from an SCM.
          </li>
-          <li>
+          
+<li>
             <i>No more properties files</i>
             - All plugins are now configured from the POM (which is now called <tt>pom.xml</tt>).
          </li>
-          <li>
+          
+<li>
             <i>No more <tt>maven.xml</tt></i>
             - Plugins are now easier to build and integrate, and are the only way
             to script your builds. (Note that additions may later be made to the POM to allow simple things that
             scripting
             was used for, such as goal aliasing).
          </li>
-          <li>
+          
+<li>
             <i>No more Jelly</i>
             - Plugins are primarily written in Java, though there are providers for other scripting languages.
          </li>
-          <li>
+          
+<li>
             <i>Improved repository layout</i>
             - Maven 2.0 supports both the existing layout (not Maven 3), and an improved repository
             layout that has deeper, partitioned structure making it easier to browse.
          </li>
        </ul>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="m1-or-m2">Should I use Maven 2.x, Maven 3.x, or Maven 1.0?</a></dt><dd>
-        <p>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="m1-or-m2">Should I use Maven 2.x, Maven 3.x, or Maven 1.0?</a></dt>
+<dd>
+        
+<p>
           Maven 3.x is the latest stable release, and we certainly recommend it for all new projects.
        </p>
-        <p>
+        
+<p>
           If you are already using Maven 1.0 - you should try out Maven 3.x, as it is very much improved.
           However, we still continue to support the Maven 1.x releases at this time.
        </p>
-        <p>
+        
+<p>
           If you do use Maven 1.0, and would like to upgrade in the future, you should carefully consider following some
           of the
           <a class="externalLink" href="http://maven.apache.org/maven-1.x/using/bestpractices.html">Best Practices</a>
           listed. These will make your project a lot easier to migrate in the future.
        </p>
-        <p>
+        
+<p>
           The following are the known limitations in the current Maven 2.x release compared to Maven 1.x: none.
        </p>
-        <p>
+        
+<p>
           The following are the known limitations in the current Maven 3.x release compared to Maven 1.x:
        </p>
-        <ul>
-          <li>Maven 1 repository layout is not supported</li>
+        
+<ul>
+          
+<li>Maven 1 repository layout is not supported</li>
        </ul>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="m1-future">What will happen to Maven 1.0?</a></dt><dd>
-        <p>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="m1-future">What will happen to Maven 1.0?</a></dt>
+<dd>
+        
+<p>
           Support for Maven 1.0.2 has been discontinued with the release of Maven 1.1.
           While significant new features will not be added to the
           <a class="externalLink" href="http://maven.apache.org/maven-1.x/">Maven 1.x</a> core
           (such as transitive dependencies), bugfixes and support continue and the
           repository is still available.
        </p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="m1-plugins">Will my Maven 1.0 plugins be supported?</a></dt><dd>
-        <p>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="m1-plugins">Will my Maven 1.0 plugins be supported?</a></dt>
+<dd>
+        
+<p>
           Not directly.
        </p>
-        <p>
+        
+<p>
           We recommend building your Jelly plugins as thin wrappers around Java beans that do not use Maven 1.0 API's,
           which will allow easy migration to Maven 2.0.
        </p>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="m1-maven-xml">How do I write custom scripts without a
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="m1-maven-xml">How do I write custom scripts without a
         <tt>maven.xml</tt>
         file?
-      </a></dt><dd>
-        <p>Taken from
+      </a></dt>
+<dd>
+        
+<p>Taken from
           <a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/maven-users/200504.mbox/%3c1113788711.5625.30.camel@172.16.1.36%3e">
             this post to the Maven User's List</a>:
        </p>
-        <blockquote>
+        
+<blockquote>
           Everything in m2 is a plugin so for doing any sort of custom work like
           that you will need to make a plugin. This 1) greatly reduces the
           complexity within m2 because we only deal with proper plugins. The
@@ -358,17 +403,22 @@
           solutions will generalize their solutions so they can be shared with
           others. That's what we're trying to encourage.
        </blockquote>
-        <blockquote>
+        
+<blockquote>
           We estimate that there's a lot of work bound up in project's maven.xml
           that is not being shared and we'd like to try and change that. We plan
           to make it dead simple to share plugins and hopefully people can use
           other project's plugins as a start for a plugin that they may need
           themselves.
        </blockquote>
-      <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="convert">How do I convert from Maven 1.x to Maven 2.x or 3.x?</a></dt><dd>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
+<dt><a name="convert">How do I convert from Maven 1.x to Maven 2.x or 3.x?</a></dt>
+<dd>
         This is discussed in <a class="externalLink" href="http://maven.apache.org/guides/mini/guide-m1-m2.html">Guide to Moving from Maven 1.x to Maven 2.x</a>
         (Maven 3.x is mostly equivalent to Maven 2.x).
-      <p align="right"><a href="#top">[top]</a></p></dd></dl>
+      
+<p align="right"><a href="#top">[top]</a></p></dd></dl>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/netbeans-module.html
==============================================================================
--- websites/staging/maven/trunk/content/netbeans-module.html (original)
+++ websites/staging/maven/trunk/content/netbeans-module.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="Milos Kleint, Jesse Glick" />
         <meta name="Date-Creation-yyyymmdd" content="20111026" />
-    <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 Support for NetBeans
         </div>
             <div class="xright">        
-                                    Last Published: 2013-04-23
+                                    Last Published: 2013-04-27
             </div>
       <div class="clear">
         <hr/>
@@ -232,7 +232,9 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <div class="section"><h2>Maven Support for NetBeans<a name="Maven_Support_for_NetBeans"></a></h2><p>NetBeans includes full Maven support since 6.7, including Maven 3 support in 7.0+. You can open any Maven project in the IDE and start coding immediately. For more information see the <a class="externalLink" href="http://wiki.netbeans.org/Maven">NetBeans.org wiki page</a>.</p></div>
+        <div class="section">
+<h2>Maven Support for NetBeans<a name="Maven_Support_for_NetBeans"></a></h2>
+<p>NetBeans includes full Maven support since 6.7, including Maven 3 support in 7.0+. You can open any Maven project in the IDE and start coding immediately. For more information see the <a class="externalLink" href="http://wiki.netbeans.org/Maven">NetBeans.org wiki page</a>.</p></div>
       </div>
     </div>
     <div class="clear">