You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by hb...@apache.org on 2015/09/09 08:18:33 UTC

svn commit: r964850 [13/25] - in /websites/production/maven/components/ref/3-LATEST: ./ apache-maven/ apidocs/ apidocs/org/apache/maven/model/ apidocs/src-html/org/apache/maven/model/ maven-aether-provider/ maven-artifact/ maven-builder-support/ maven-...

Modified: websites/production/maven/components/ref/3-LATEST/maven-model-builder/xref-test/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.html
==============================================================================
--- websites/production/maven/components/ref/3-LATEST/maven-model-builder/xref-test/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.html (original)
+++ websites/production/maven/components/ref/3-LATEST/maven-model-builder/xref-test/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.html Wed Sep  9 06:18:29 2015
@@ -36,75 +36,157 @@
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.custommonkey.xmlunit.XMLAssert;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.custommonkey.xmlunit.XMLUnit;
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> java.io.FileInputStream;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> java.io.Reader;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> * @author Hervé Boutemy</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.html">DefaultInheritanceAssemblerTest</a>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>      <strong class="jxr_keyword">extends</strong> PlexusTestCase
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  {
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>      <strong class="jxr_keyword">private</strong> ModelReader reader;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>      <strong class="jxr_keyword">private</strong> ModelWriter writer;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> junit.framework.AssertionFailedError;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> java.io.File;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> java.io.FileInputStream;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> java.io.Reader;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * @author Hervé Boutemy</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.html">DefaultInheritanceAssemblerTest</a>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>      <strong class="jxr_keyword">extends</strong> PlexusTestCase
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  {
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>      <strong class="jxr_keyword">private</strong> ModelReader reader;
 <a class="jxr_linenumber" name="L46" href="#L46">46</a>  
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>      <strong class="jxr_keyword">private</strong> InheritanceAssembler assembler;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>      <strong class="jxr_keyword">private</strong> ModelWriter writer;
 <a class="jxr_linenumber" name="L48" href="#L48">48</a>  
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>      @Override
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>      <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setUp()
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>          <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>      {
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>          <strong class="jxr_keyword">super</strong>.setUp();
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>          reader = lookup( ModelReader.<strong class="jxr_keyword">class</strong> );
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>          writer = lookup( ModelWriter.<strong class="jxr_keyword">class</strong> );
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>          assembler = lookup( InheritanceAssembler.<strong class="jxr_keyword">class</strong> );
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>      }
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>      <strong class="jxr_keyword">private</strong> File getPom( String name )
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>      {
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>          <strong class="jxr_keyword">return</strong> getTestFile( <span class="jxr_string">"src/test/resources/poms/inheritance/"</span> + name + <span class="jxr_string">".xml"</span> );
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>      }
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>      <strong class="jxr_keyword">private</strong> Model getModel( String name )
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>          <strong class="jxr_keyword">throws</strong> ModelParseException, IOException
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>      {
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>          <strong class="jxr_keyword">return</strong> reader.read( getPom( name ), <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>      }
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPluginConfiguration()
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>          <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>      {
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>          Model parent = getModel( <span class="jxr_string">"plugin-configuration-parent"</span> );
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>          Model child = getModel( <span class="jxr_string">"plugin-configuration-child"</span> );
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>          <a href="../../../../../org/apache/maven/model/building/SimpleProblemCollector.html">SimpleProblemCollector</a> problems = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/model/building/SimpleProblemCollector.html">SimpleProblemCollector</a>();
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>          assembler.assembleModelInheritance( child, parent, <strong class="jxr_keyword">null</strong>, problems );
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>  
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>          File actual = getTestFile( <span class="jxr_string">"target/test-classes/poms/inheritance/plugin-configuration-actual.xml"</span> );
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>          writer.write( actual, <strong class="jxr_keyword">null</strong>, child );
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>          <em class="jxr_comment">// check with getPom( "plugin-configuration-effective" )</em>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>          File expected = getPom( <span class="jxr_string">"plugin-configuration-expected"</span> );
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>          <strong class="jxr_keyword">try</strong> ( Reader control = <strong class="jxr_keyword">new</strong> InputStreamReader( <strong class="jxr_keyword">new</strong> FileInputStream( expected ), <span class="jxr_string">"UTF-8"</span> );
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>                Reader test = <strong class="jxr_keyword">new</strong> InputStreamReader( <strong class="jxr_keyword">new</strong> FileInputStream( actual ), <span class="jxr_string">"UTF-8"</span> ) )
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>          {
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>  
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>              XMLUnit.setIgnoreComments( <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>              XMLUnit.setIgnoreWhitespace( <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>              XMLAssert.assertXMLEqual( control, test );
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>          }
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>      }
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>  }
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>      <strong class="jxr_keyword">private</strong> InheritanceAssembler assembler;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>      @Override
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>      <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setUp()
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>          <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>      {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>          <strong class="jxr_keyword">super</strong>.setUp();
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>          reader = lookup( ModelReader.<strong class="jxr_keyword">class</strong> );
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>          writer = lookup( ModelWriter.<strong class="jxr_keyword">class</strong> );
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>          assembler = lookup( InheritanceAssembler.<strong class="jxr_keyword">class</strong> );
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>      }
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>      <strong class="jxr_keyword">private</strong> File getPom( String name )
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>      {
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>          <strong class="jxr_keyword">return</strong> getTestFile( <span class="jxr_string">"src/test/resources/poms/inheritance/"</span> + name + <span class="jxr_string">".xml"</span> );
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>      }
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>      <strong class="jxr_keyword">private</strong> Model getModel( String name )
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>          <strong class="jxr_keyword">throws</strong> ModelParseException, IOException
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>      {
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>          <strong class="jxr_keyword">return</strong> reader.read( getPom( name ), <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>      }
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPluginConfiguration()
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>          <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>      {
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>          testInheritance( <span class="jxr_string">"plugin-configuration"</span> );
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>      }
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">     * Check most classical urls inheritance: directory structure where parent POM in parent directory</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">     * and child directory == artifatId</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment">     * @throws Exception</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUrls()
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>          <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>      {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>          testInheritance( <span class="jxr_string">"urls"</span> );
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>      }
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  <em class="jxr_javadoccomment">     * Flat directory structure: parent &amp; child POMs in sibling directories, child directory == artifactId.</em>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  <em class="jxr_javadoccomment">     * @throws Exception</em>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlatUrls()
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>          <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>      {
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>          testInheritance( <span class="jxr_string">"flat-urls"</span> );
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>      }
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment">     * Tricky case: flat directory structure, but child directory != artifactId.</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment">     * Model interpolation does not give same result when calculated from build or from repo...</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment">     * This is why MNG-5000 fix in code is marked as bad practice (uses file names)</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment">     * @throws Exception</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testFlatTrickyUrls()
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>         <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>     {
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>         <em class="jxr_comment">// parent references child with artifactId (which is not directory name)</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>         <em class="jxr_comment">// then relative path calculation will fail during build from disk but success when calculated from repo</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>         {
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>             <em class="jxr_comment">// build from disk expected to fail</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>             testInheritance( <span class="jxr_string">"tricky-flat-artifactId-urls"</span>, false );
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>             fail( <span class="jxr_string">"should have failed since module reference == artifactId != directory name"</span> );
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>         }
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>         <strong class="jxr_keyword">catch</strong> ( AssertionFailedError afe )
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>         {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>             <em class="jxr_comment">// expected failure: wrong relative path calculation</em>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>             assertTrue( afe.getMessage().contains( <span class="jxr_string">"http://www.apache.org/path/to/parent/child-artifact-id/"</span> ) );
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>         }
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>         <em class="jxr_comment">// but ok from repo: local disk is ignored</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>         testInheritance( <span class="jxr_string">"tricky-flat-artifactId-urls"</span>, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>         <em class="jxr_comment">// parent references child with directory name (which is not artifact id)</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         <em class="jxr_comment">// then relative path calculation will success during build from disk but failwhen calculated from repo</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>         testInheritance( <span class="jxr_string">"tricky-flat-directory-urls"</span>, false );
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>         {
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>             testInheritance( <span class="jxr_string">"tricky-flat-directory-urls"</span>, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>             fail( <span class="jxr_string">"should have failed since module reference == directory name != artifactId"</span> );
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>         }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>         <strong class="jxr_keyword">catch</strong> ( AssertionFailedError afe )
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>         {
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>             <em class="jxr_comment">// expected failure</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>             assertTrue( afe.getMessage().contains( <span class="jxr_string">"http://www.apache.org/path/to/parent/child-artifact-id/"</span> ) );
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>         }
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>     }
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInheritance( String baseName )
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>         <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>     {
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>         testInheritance( baseName, false );
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>         testInheritance( baseName, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>     }
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInheritance( String baseName, <strong class="jxr_keyword">boolean</strong> fromRepo )
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>         <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>     {
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>         Model parent = getModel( baseName + <span class="jxr_string">"-parent"</span> );
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>         Model child = getModel( baseName + <span class="jxr_string">"-child"</span> );
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>         <strong class="jxr_keyword">if</strong> ( fromRepo )
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>         {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>             <em class="jxr_comment">// when model is read from repo, a stream is used, then pomFile == null</em>
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>             <em class="jxr_comment">// (has consequences in inheritance algorithm since getProjectDirectory() returns null)</em>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>             parent.setPomFile( <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>             child.setPomFile( <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>         }
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 
+<a class="jxr_linenumber" name="L162" href="#L162">162</a>         <a href="../../../../../org/apache/maven/model/building/SimpleProblemCollector.html">SimpleProblemCollector</a> problems = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/model/building/SimpleProblemCollector.html">SimpleProblemCollector</a>();
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>         assembler.assembleModelInheritance( child, parent, <strong class="jxr_keyword">null</strong>, problems );
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>         <em class="jxr_comment">// write baseName + "-actual"</em>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>         File actual = getTestFile( <span class="jxr_string">"target/test-classes/poms/inheritance/"</span> + baseName
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>             + ( fromRepo ? <span class="jxr_string">"-build"</span> : <span class="jxr_string">"-repo"</span> ) + <span class="jxr_string">"-actual.xml"</span> );
+<a class="jxr_linenumber" name="L169" href="#L169">169</a>         writer.write( actual, <strong class="jxr_keyword">null</strong>, child );
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>         <em class="jxr_comment">// check with getPom( baseName + "-expected" )</em>
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>         File expected = getPom( baseName + <span class="jxr_string">"-expected"</span> );
+<a class="jxr_linenumber" name="L173" href="#L173">173</a>         <strong class="jxr_keyword">try</strong> ( Reader control = <strong class="jxr_keyword">new</strong> InputStreamReader( <strong class="jxr_keyword">new</strong> FileInputStream( expected ), <span class="jxr_string">"UTF-8"</span> );
+<a class="jxr_linenumber" name="L174" href="#L174">174</a>               Reader test = <strong class="jxr_keyword">new</strong> InputStreamReader( <strong class="jxr_keyword">new</strong> FileInputStream( actual ), <span class="jxr_string">"UTF-8"</span> ) )
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>         {
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>             XMLUnit.setIgnoreComments( <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L177" href="#L177">177</a>             XMLUnit.setIgnoreWhitespace( <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>             XMLAssert.assertXMLEqual( control, test );
+<a class="jxr_linenumber" name="L179" href="#L179">179</a>         }
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>     }
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> }
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2001&#x2013;2015 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>

Modified: websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/Build.html
==============================================================================
--- websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/Build.html (original)
+++ websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/Build.html Wed Sep  9 06:18:29 2015
@@ -114,11 +114,12 @@
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/maven/model/Build.html#line.19">Build</a>
+<pre>public class <a href="../../../../src-html/org/apache/maven/model/Build.html#line.20">Build</a>
 extends <a href="../../../../org/apache/maven/model/BuildBase.html" title="class in org.apache.maven.model">BuildBase</a>
 implements <a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></pre>
 <div class="block">The <code>&lt;build&gt;</code> element contains
- informations required to build the project.</div>
+ informations required to build the project.
+         Default values are defined in Super POM.</div>
 <dl><dt><span class="strong">Version:</span></dt>
   <dd>$Revision$ $Date$</dd>
 <dt><span class="strong">See Also:</span></dt><dd><a href="../../../../serialized-form.html#org.apache.maven.model.Build">Serialized Form</a></dd></dl>
@@ -308,7 +309,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Build</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.19">Build</a>()</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.20">Build</a>()</pre>
 </li>
 </ul>
 </li>
@@ -325,7 +326,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>addExtension</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.84">addExtension</a>(<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&nbsp;extension)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.105">addExtension</a>(<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&nbsp;extension)</pre>
 <div class="block">Method addExtension.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>extension</code> - </dd></dl>
 </li>
@@ -336,7 +337,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>clone</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/maven/model/Build.html" title="class in org.apache.maven.model">Build</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.94">clone</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/maven/model/Build.html" title="class in org.apache.maven.model">Build</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.115">clone</a>()</pre>
 <div class="block">Method clone.</div>
 <dl>
 <dt><strong>Overrides:</strong></dt>
@@ -350,7 +351,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getExtensions</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.123">getExtensions</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.144">getExtensions</a>()</pre>
 <div class="block">Method getExtensions.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>List</dd></dl>
 </li>
@@ -361,9 +362,11 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutputDirectory</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.139">getOutputDirectory</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.162">getOutputDirectory</a>()</pre>
 <div class="block">Get the directory where compiled application classes are
- placed.</div>
+ placed.
+             The default value is
+ <code>target/classes</code>.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
@@ -373,14 +376,16 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getScriptSourceDirectory</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.155">getScriptSourceDirectory</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.180">getScriptSourceDirectory</a>()</pre>
 <div class="block">Get this element specifies a directory containing the script
  sources of the
              project. This directory is meant to be different
  from the sourceDirectory, in that its
              contents will be copied to the output directory
  in most cases (since scripts are
-             interpreted rather than compiled).</div>
+             interpreted rather than compiled).
+             The default value is
+ <code>src/main/scripts</code>.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
@@ -390,13 +395,14 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getSourceDirectory</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.170">getSourceDirectory</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.196">getSourceDirectory</a>()</pre>
 <div class="block">Get this element specifies a directory containing the source
  of the project. The
-             generated build system will compile the source
- in this directory when the project is
+             generated build system will compile the sources
+ from this directory when the project is
              built. The path given is relative to the project
- descriptor.</div>
+ descriptor.
+             The default value is <code>src/main/java</code>.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
@@ -406,8 +412,10 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getTestOutputDirectory</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.180">getTestOutputDirectory</a>()</pre>
-<div class="block">Get the directory where compiled test classes are placed.</div>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.208">getTestOutputDirectory</a>()</pre>
+<div class="block">Get the directory where compiled test classes are placed.
+             The default value is
+ <code>target/test-classes</code>.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
@@ -417,13 +425,14 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getTestSourceDirectory</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.195">getTestSourceDirectory</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.224">getTestSourceDirectory</a>()</pre>
 <div class="block">Get this element specifies a directory containing the unit
  test source of the
              project. The generated build system will compile
  these directories when the project is
              being tested. The path given is relative to the
- project descriptor.</div>
+ project descriptor.
+             The default value is <code>src/test/java</code>.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
@@ -433,7 +442,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>removeExtension</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.205">removeExtension</a>(<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&nbsp;extension)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.234">removeExtension</a>(<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&nbsp;extension)</pre>
 <div class="block">Method removeExtension.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>extension</code> - </dd></dl>
 </li>
@@ -444,7 +453,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setExtensions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.215">setExtensions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&gt;&nbsp;extensions)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.244">setExtensions</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Extension.html" title="class in org.apache.maven.model">Extension</a>&gt;&nbsp;extensions)</pre>
 <div class="block">Set a set of build extensions to use from this project.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>extensions</code> - </dd></dl>
 </li>
@@ -455,9 +464,11 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setOutputDirectory</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.226">setOutputDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;outputDirectory)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.257">setOutputDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;outputDirectory)</pre>
 <div class="block">Set the directory where compiled application classes are
- placed.</div>
+ placed.
+             The default value is
+ <code>target/classes</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>outputDirectory</code> - </dd></dl>
 </li>
 </ul>
@@ -467,14 +478,16 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setScriptSourceDirectory</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.242">setScriptSourceDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;scriptSourceDirectory)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.275">setScriptSourceDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;scriptSourceDirectory)</pre>
 <div class="block">Set this element specifies a directory containing the script
  sources of the
              project. This directory is meant to be different
  from the sourceDirectory, in that its
              contents will be copied to the output directory
  in most cases (since scripts are
-             interpreted rather than compiled).</div>
+             interpreted rather than compiled).
+             The default value is
+ <code>src/main/scripts</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>scriptSourceDirectory</code> - </dd></dl>
 </li>
 </ul>
@@ -484,13 +497,14 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setSourceDirectory</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.257">setSourceDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceDirectory)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.291">setSourceDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceDirectory)</pre>
 <div class="block">Set this element specifies a directory containing the source
  of the project. The
-             generated build system will compile the source
- in this directory when the project is
+             generated build system will compile the sources
+ from this directory when the project is
              built. The path given is relative to the project
- descriptor.</div>
+ descriptor.
+             The default value is <code>src/main/java</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>sourceDirectory</code> - </dd></dl>
 </li>
 </ul>
@@ -500,8 +514,10 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setTestOutputDirectory</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.267">setTestOutputDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;testOutputDirectory)</pre>
-<div class="block">Set the directory where compiled test classes are placed.</div>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.303">setTestOutputDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;testOutputDirectory)</pre>
+<div class="block">Set the directory where compiled test classes are placed.
+             The default value is
+ <code>target/test-classes</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>testOutputDirectory</code> - </dd></dl>
 </li>
 </ul>
@@ -511,13 +527,14 @@ implements <a href="http://docs.oracle.c
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setTestSourceDirectory</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.282">setTestSourceDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;testSourceDirectory)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Build.html#line.319">setTestSourceDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;testSourceDirectory)</pre>
 <div class="block">Set this element specifies a directory containing the unit
  test source of the
              project. The generated build system will compile
  these directories when the project is
              being tested. The path given is relative to the
- project descriptor.</div>
+ project descriptor.
+             The default value is <code>src/test/java</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>testSourceDirectory</code> - </dd></dl>
 </li>
 </ul>

Modified: websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/BuildBase.html
==============================================================================
--- websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/BuildBase.html (original)
+++ websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/BuildBase.html Wed Sep  9 06:18:29 2015
@@ -343,7 +343,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>addFilter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.79">addFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;string)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.82">addFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;string)</pre>
 <div class="block">Method addFilter.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>string</code> - </dd></dl>
 </li>
@@ -354,7 +354,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>addResource</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.89">addResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.92">addResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
 <div class="block">Method addResource.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>resource</code> - </dd></dl>
 </li>
@@ -365,7 +365,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>addTestResource</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.99">addTestResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.102">addTestResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
 <div class="block">Method addTestResource.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>resource</code> - </dd></dl>
 </li>
@@ -376,7 +376,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>clone</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/maven/model/BuildBase.html" title="class in org.apache.maven.model">BuildBase</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.109">clone</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/maven/model/BuildBase.html" title="class in org.apache.maven.model">BuildBase</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.112">clone</a>()</pre>
 <div class="block">Method clone.</div>
 <dl>
 <dt><strong>Overrides:</strong></dt>
@@ -390,7 +390,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getDefaultGoal</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.160">getDefaultGoal</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.163">getDefaultGoal</a>()</pre>
 <div class="block">Get the default goal (or phase in Maven 2) to execute when
  none is specified for
              the project. Note that in case of a multi-module
@@ -408,9 +408,10 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getDirectory</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.171">getDirectory</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.175">getDirectory</a>()</pre>
 <div class="block">Get the directory where all files generated by the build are
- placed.</div>
+ placed.
+             The default value is <code>target</code>.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
@@ -420,7 +421,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getFilters</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.181">getFilters</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.185">getFilters</a>()</pre>
 <div class="block">Method getFilters.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>List</dd></dl>
 </li>
@@ -431,7 +432,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getFinalName</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.200">getFinalName</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.204">getFinalName</a>()</pre>
 <div class="block">Get the filename (excluding the extension, and with no path
  information) that
              the produced artifact will be called.
@@ -446,7 +447,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getResources</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.210">getResources</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.214">getResources</a>()</pre>
 <div class="block">Method getResources.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>List</dd></dl>
 </li>
@@ -457,7 +458,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getTestResources</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.225">getTestResources</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.229">getTestResources</a>()</pre>
 <div class="block">Method getTestResources.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>List</dd></dl>
 </li>
@@ -468,7 +469,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>removeFilter</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.240">removeFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;string)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.244">removeFilter</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;string)</pre>
 <div class="block">Method removeFilter.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>string</code> - </dd></dl>
 </li>
@@ -479,7 +480,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>removeResource</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.250">removeResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.254">removeResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
 <div class="block">Method removeResource.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>resource</code> - </dd></dl>
 </li>
@@ -490,7 +491,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>removeTestResource</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.260">removeTestResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.264">removeTestResource</a>(<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&nbsp;resource)</pre>
 <div class="block">Method removeTestResource.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>resource</code> - </dd></dl>
 </li>
@@ -501,7 +502,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setDefaultGoal</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.277">setDefaultGoal</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;defaultGoal)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.281">setDefaultGoal</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;defaultGoal)</pre>
 <div class="block">Set the default goal (or phase in Maven 2) to execute when
  none is specified for
              the project. Note that in case of a multi-module
@@ -519,9 +520,10 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setDirectory</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.288">setDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;directory)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.293">setDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;directory)</pre>
 <div class="block">Set the directory where all files generated by the build are
- placed.</div>
+ placed.
+             The default value is <code>target</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>directory</code> - </dd></dl>
 </li>
 </ul>
@@ -531,7 +533,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setFilters</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.299">setFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;filters)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.304">setFilters</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;filters)</pre>
 <div class="block">Set the list of filter properties files that are used when
  filtering is enabled.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>filters</code> - </dd></dl>
@@ -543,7 +545,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setFinalName</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.313">setFinalName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;finalName)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.318">setFinalName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;finalName)</pre>
 <div class="block">Set the filename (excluding the extension, and with no path
  information) that
              the produced artifact will be called.
@@ -558,12 +560,14 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setResources</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.327">setResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;resources)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.334">setResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;resources)</pre>
 <div class="block">Set this element describes all of the classpath resources
  such as properties
              files associated with a project. These resources
  are often included in the final
-             package.</div>
+             package.
+             The default value is
+ <code>src/main/resources</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>resources</code> - </dd></dl>
 </li>
 </ul>
@@ -573,10 +577,12 @@ implements <a href="http://docs.oracle.c
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setTestResources</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.339">setTestResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;testResources)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/BuildBase.html#line.348">setTestResources</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/Resource.html" title="class in org.apache.maven.model">Resource</a>&gt;&nbsp;testResources)</pre>
 <div class="block">Set this element describes all of the classpath resources
  such as properties
-             files associated with a project's unit tests.</div>
+             files associated with a project's unit tests.
+             The default value is
+ <code>src/test/resources</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>testResources</code> - </dd></dl>
 </li>
 </ul>

Modified: websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/Reporting.html
==============================================================================
--- websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/Reporting.html (original)
+++ websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/org/apache/maven/model/Reporting.html Wed Sep  9 06:18:29 2015
@@ -274,7 +274,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>addPlugin</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.70">addPlugin</a>(<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&nbsp;reportPlugin)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.69">addPlugin</a>(<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&nbsp;reportPlugin)</pre>
 <div class="block">Method addPlugin.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>reportPlugin</code> - </dd></dl>
 </li>
@@ -285,7 +285,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>clone</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/maven/model/Reporting.html" title="class in org.apache.maven.model">Reporting</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.80">clone</a>()</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/maven/model/Reporting.html" title="class in org.apache.maven.model">Reporting</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.79">clone</a>()</pre>
 <div class="block">Method clone.</div>
 <dl>
 <dt><strong>Overrides:</strong></dt>
@@ -299,7 +299,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getExcludeDefaults</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.121">getExcludeDefaults</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.120">getExcludeDefaults</a>()</pre>
 <div class="block">Get if true, then the default reports are not included in
  the site generation.
              This includes the reports in the "Project Info"
@@ -317,7 +317,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getLocation</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/maven/model/InputLocation.html" title="class in org.apache.maven.model">InputLocation</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.132">getLocation</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/maven/model/InputLocation.html" title="class in org.apache.maven.model">InputLocation</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.131">getLocation</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key)</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../org/apache/maven/model/InputLocationTracker.html#getLocation(java.lang.Object)">InputLocationTracker</a></code></strong></div>
 <div class="block">Gets the location of the specified field in the input
  source.</div>
@@ -334,11 +334,10 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutputDirectory</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.145">getOutputDirectory</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.143">getOutputDirectory</a>()</pre>
 <div class="block">Get where to store all of the generated reports. The default
  is
-             <code>${project.build.directory}/site</code>
-             .</div>
+             <code>${project.build.directory}/site</code>.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
@@ -348,7 +347,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>getPlugins</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.155">getPlugins</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.153">getPlugins</a>()</pre>
 <div class="block">Method getPlugins.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>List</dd></dl>
 </li>
@@ -359,7 +358,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>removePlugin</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.170">removePlugin</a>(<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&nbsp;reportPlugin)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.168">removePlugin</a>(<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&nbsp;reportPlugin)</pre>
 <div class="block">Method removePlugin.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>reportPlugin</code> - </dd></dl>
 </li>
@@ -370,7 +369,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setExcludeDefaults</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.187">setExcludeDefaults</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;excludeDefaults)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.185">setExcludeDefaults</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;excludeDefaults)</pre>
 <div class="block">Set if true, then the default reports are not included in
  the site generation.
              This includes the reports in the "Project Info"
@@ -388,7 +387,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setLocation</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.198">setLocation</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key,
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.196">setLocation</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;key,
                <a href="../../../../org/apache/maven/model/InputLocation.html" title="class in org.apache.maven.model">InputLocation</a>&nbsp;location)</pre>
 <div class="block"><strong>Description copied from interface:&nbsp;<code><a href="../../../../org/apache/maven/model/InputLocationTracker.html#setLocation(java.lang.Object,%20org.apache.maven.model.InputLocation)">InputLocationTracker</a></code></strong></div>
 <div class="block">Sets the location of the specified field.</div>
@@ -404,11 +403,10 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setOutputDirectory</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.218">setOutputDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;outputDirectory)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.215">setOutputDirectory</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;outputDirectory)</pre>
 <div class="block">Set where to store all of the generated reports. The default
  is
-             <code>${project.build.directory}/site</code>
-             .</div>
+             <code>${project.build.directory}/site</code>.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>outputDirectory</code> - </dd></dl>
 </li>
 </ul>
@@ -418,7 +416,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setPlugins</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.228">setPlugins</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&gt;&nbsp;plugins)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.225">setPlugins</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&gt;&nbsp;plugins)</pre>
 <div class="block">Set the reporting plugins to use and their configuration.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>plugins</code> - </dd></dl>
 </li>
@@ -429,7 +427,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>isExcludeDefaults</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.235">isExcludeDefaults</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.232">isExcludeDefaults</a>()</pre>
 </li>
 </ul>
 <a name="setExcludeDefaults(boolean)">
@@ -438,7 +436,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>setExcludeDefaults</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.240">setExcludeDefaults</a>(boolean&nbsp;excludeDefaults)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.237">setExcludeDefaults</a>(boolean&nbsp;excludeDefaults)</pre>
 </li>
 </ul>
 <a name="flushReportPluginMap()">
@@ -447,7 +445,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockList">
 <li class="blockList">
 <h4>flushReportPluginMap</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.250">flushReportPluginMap</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.247">flushReportPluginMap</a>()</pre>
 <div class="block">Reset the <code>reportPluginMap</code> field to <code>null</code></div>
 </li>
 </ul>
@@ -457,7 +455,7 @@ implements <a href="http://docs.oracle.c
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getReportPluginsAsMap</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.259">getReportPluginsAsMap</a>()</pre>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../org/apache/maven/model/ReportPlugin.html" title="class in org.apache.maven.model">ReportPlugin</a>&gt;&nbsp;<a href="../../../../src-html/org/apache/maven/model/Reporting.html#line.256">getReportPluginsAsMap</a>()</pre>
 <dl><dt><span class="strong">Returns:</span></dt><dd>a Map of plugins field with <code>ReportPlugin#getKey()</code> as key</dd><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../org/apache/maven/model/ReportPlugin.html#getKey()"><code>ReportPlugin.getKey()</code></a></dd></dl>
 </li>
 </ul>

Modified: websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/serialized-form.html
==============================================================================
--- websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/serialized-form.html (original)
+++ websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/serialized-form.html Wed Sep  9 06:18:29 2015
@@ -249,43 +249,53 @@
 <li class="blockList">
 <h4>sourceDirectory</h4>
 <pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> sourceDirectory</pre>
-<div class="block">This element specifies a directory containing the source of
- the project. The
-             generated build system will compile the source
- in this directory when the project is
+<div class="block">This element specifies a directory containing
+ the source of the project. The
+             generated build system will compile the sources
+ from this directory when the project is
              built. The path given is relative to the project
- descriptor.</div>
+ descriptor.
+             The default value is <code>src/main/java</code>.</div>
 </li>
 <li class="blockList">
 <h4>scriptSourceDirectory</h4>
 <pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> scriptSourceDirectory</pre>
-<div class="block">This element specifies a directory containing the script
- sources of the
+<div class="block">This element specifies a directory containing
+ the script sources of the
              project. This directory is meant to be different
  from the sourceDirectory, in that its
              contents will be copied to the output directory
  in most cases (since scripts are
-             interpreted rather than compiled).</div>
+             interpreted rather than compiled).
+             The default value is
+ <code>src/main/scripts</code>.</div>
 </li>
 <li class="blockList">
 <h4>testSourceDirectory</h4>
 <pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> testSourceDirectory</pre>
-<div class="block">This element specifies a directory containing the unit test
- source of the
+<div class="block">This element specifies a directory containing
+ the unit test source of the
              project. The generated build system will compile
  these directories when the project is
              being tested. The path given is relative to the
- project descriptor.</div>
+ project descriptor.
+             The default value is <code>src/test/java</code>.</div>
 </li>
 <li class="blockList">
 <h4>outputDirectory</h4>
 <pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> outputDirectory</pre>
-<div class="block">The directory where compiled application classes are placed.</div>
+<div class="block">The directory where compiled application classes
+ are placed.
+             The default value is
+ <code>target/classes</code>.</div>
 </li>
 <li class="blockList">
 <h4>testOutputDirectory</h4>
 <pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> testOutputDirectory</pre>
-<div class="block">The directory where compiled test classes are placed.</div>
+<div class="block">The directory where compiled test classes are
+ placed.
+             The default value is
+ <code>target/test-classes</code>.</div>
 </li>
 <li class="blockListLast">
 <h4>extensions</h4>
@@ -331,8 +341,9 @@
 <li class="blockList">
 <h4>directory</h4>
 <pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> directory</pre>
-<div class="block">The directory where all files generated by the build are
- placed.</div>
+<div class="block">The directory where all files generated by the
+ build are placed.
+             The default value is <code>target</code>.</div>
 </li>
 <li class="blockList">
 <h4>finalName</h4>
@@ -1810,8 +1821,7 @@
 <pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> outputDirectory</pre>
 <div class="block">Where to store all of the generated reports. The
  default is
-             <code>${project.build.directory}/site</code>
-             .</div>
+             <code>${project.build.directory}/site</code>.</div>
 </li>
 <li class="blockList">
 <h4>plugins</h4>