You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/01/19 19:00:20 UTC

svn commit: r847301 [20/45] - in /websites/production/maven/content/ref/3.1-SNAPSHOT: ./ apache-maven/ apidocs/ apidocs/org/apache/maven/artifact/ apidocs/org/apache/maven/repository/internal/ apidocs/src-html/org/apache/maven/artifact/ apidocs/src-htm...

Modified: websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/RemoteSnapshotMetadata.html
==============================================================================
--- websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/RemoteSnapshotMetadata.html (original)
+++ websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/RemoteSnapshotMetadata.html Sat Jan 19 17:59:58 2013
@@ -33,195 +33,133 @@
 <a class="jxr_linenumber" name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.text.DateFormat;
 <a class="jxr_linenumber" name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> java.text.SimpleDateFormat;
 <a class="jxr_linenumber" name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> java.util.ArrayList;
-<a class="jxr_linenumber" name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> java.util.Collection;
-<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> java.util.Date;
-<a class="jxr_linenumber" name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedHashMap;
-<a class="jxr_linenumber" name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> java.util.TimeZone;
-<a class="jxr_linenumber" name="31" href="#31">31</a>  
-<a class="jxr_linenumber" name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.Metadata;
-<a class="jxr_linenumber" name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.Snapshot;
-<a class="jxr_linenumber" name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.SnapshotVersion;
-<a class="jxr_linenumber" name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.Versioning;
-<a class="jxr_linenumber" name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> org.sonatype.aether.artifact.Artifact;
-<a class="jxr_linenumber" name="37" href="#37">37</a>  
-<a class="jxr_linenumber" name="38" href="#38">38</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="39" href="#39">39</a>  <em class="jxr_javadoccomment"> * @author Benjamin Bentmann</em>
-<a class="jxr_linenumber" name="40" href="#40">40</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="41" href="#41">41</a>  <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>
-<a class="jxr_linenumber" name="42" href="#42">42</a>      <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/maven/repository/internal/MavenMetadata.html">MavenMetadata</a>
-<a class="jxr_linenumber" name="43" href="#43">43</a>  {
-<a class="jxr_linenumber" name="44" href="#44">44</a>  
-<a class="jxr_linenumber" name="45" href="#45">45</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SNAPSHOT = <span class="jxr_string">"SNAPSHOT"</span>;
-<a class="jxr_linenumber" name="46" href="#46">46</a>  
-<a class="jxr_linenumber" name="47" href="#47">47</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Collection&lt;Artifact&gt; artifacts = <strong class="jxr_keyword">new</strong> ArrayList&lt;Artifact&gt;();
-<a class="jxr_linenumber" name="48" href="#48">48</a>  
-<a class="jxr_linenumber" name="49" href="#49">49</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, SnapshotVersion&gt; versions = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, SnapshotVersion&gt;();
+<a class="jxr_linenumber" name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> java.util.Date;
+<a class="jxr_linenumber" name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedHashMap;
+<a class="jxr_linenumber" name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> java.util.TimeZone;
+<a class="jxr_linenumber" name="30" href="#30">30</a>  
+<a class="jxr_linenumber" name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.Metadata;
+<a class="jxr_linenumber" name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.Snapshot;
+<a class="jxr_linenumber" name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.SnapshotVersion;
+<a class="jxr_linenumber" name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.maven.artifact.repository.metadata.Versioning;
+<a class="jxr_linenumber" name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> org.sonatype.aether.artifact.Artifact;
+<a class="jxr_linenumber" name="36" href="#36">36</a>  
+<a class="jxr_linenumber" name="37" href="#37">37</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="38" href="#38">38</a>  <em class="jxr_javadoccomment"> * @author Benjamin Bentmann</em>
+<a class="jxr_linenumber" name="39" href="#39">39</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="40" href="#40">40</a>  <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>
+<a class="jxr_linenumber" name="41" href="#41">41</a>      <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/maven/repository/internal/MavenSnapshotMetadata.html">MavenSnapshotMetadata</a>
+<a class="jxr_linenumber" name="42" href="#42">42</a>  {
+<a class="jxr_linenumber" name="43" href="#43">43</a>  
+<a class="jxr_linenumber" name="44" href="#44">44</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, SnapshotVersion&gt; versions = <strong class="jxr_keyword">new</strong> LinkedHashMap&lt;String, SnapshotVersion&gt;();
+<a class="jxr_linenumber" name="45" href="#45">45</a>  
+<a class="jxr_linenumber" name="46" href="#46">46</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>( Artifact artifact, <strong class="jxr_keyword">boolean</strong> legacyFormat )
+<a class="jxr_linenumber" name="47" href="#47">47</a>      {
+<a class="jxr_linenumber" name="48" href="#48">48</a>          <strong class="jxr_keyword">super</strong>( createRepositoryMetadata( artifact, legacyFormat ), <strong class="jxr_keyword">null</strong>, legacyFormat );
+<a class="jxr_linenumber" name="49" href="#49">49</a>      }
 <a class="jxr_linenumber" name="50" href="#50">50</a>  
-<a class="jxr_linenumber" name="51" href="#51">51</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> legacyFormat;
-<a class="jxr_linenumber" name="52" href="#52">52</a>  
-<a class="jxr_linenumber" name="53" href="#53">53</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>( Artifact artifact, <strong class="jxr_keyword">boolean</strong> legacyFormat )
-<a class="jxr_linenumber" name="54" href="#54">54</a>      {
-<a class="jxr_linenumber" name="55" href="#55">55</a>          <strong class="jxr_keyword">super</strong>( createMetadata( artifact, legacyFormat ), <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="56" href="#56">56</a>          <strong class="jxr_keyword">this</strong>.legacyFormat = legacyFormat;
-<a class="jxr_linenumber" name="57" href="#57">57</a>      }
-<a class="jxr_linenumber" name="58" href="#58">58</a>  
-<a class="jxr_linenumber" name="59" href="#59">59</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>( Metadata metadata, File file, <strong class="jxr_keyword">boolean</strong> legacyFormat )
-<a class="jxr_linenumber" name="60" href="#60">60</a>      {
-<a class="jxr_linenumber" name="61" href="#61">61</a>          <strong class="jxr_keyword">super</strong>( metadata, file );
-<a class="jxr_linenumber" name="62" href="#62">62</a>          <strong class="jxr_keyword">this</strong>.legacyFormat = legacyFormat;
-<a class="jxr_linenumber" name="63" href="#63">63</a>      }
-<a class="jxr_linenumber" name="64" href="#64">64</a>  
-<a class="jxr_linenumber" name="65" href="#65">65</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Metadata createMetadata( Artifact artifact, <strong class="jxr_keyword">boolean</strong> legacyFormat )
-<a class="jxr_linenumber" name="66" href="#66">66</a>      {
-<a class="jxr_linenumber" name="67" href="#67">67</a>          Metadata metadata = <strong class="jxr_keyword">new</strong> Metadata();
-<a class="jxr_linenumber" name="68" href="#68">68</a>          <strong class="jxr_keyword">if</strong> ( !legacyFormat )
-<a class="jxr_linenumber" name="69" href="#69">69</a>          {
-<a class="jxr_linenumber" name="70" href="#70">70</a>              metadata.setModelVersion( <span class="jxr_string">"1.1.0"</span> );
-<a class="jxr_linenumber" name="71" href="#71">71</a>          }
-<a class="jxr_linenumber" name="72" href="#72">72</a>          metadata.setGroupId( artifact.getGroupId() );
-<a class="jxr_linenumber" name="73" href="#73">73</a>          metadata.setArtifactId( artifact.getArtifactId() );
-<a class="jxr_linenumber" name="74" href="#74">74</a>          metadata.setVersion( artifact.getBaseVersion() );
-<a class="jxr_linenumber" name="75" href="#75">75</a>  
-<a class="jxr_linenumber" name="76" href="#76">76</a>          <strong class="jxr_keyword">return</strong> metadata;
-<a class="jxr_linenumber" name="77" href="#77">77</a>      }
-<a class="jxr_linenumber" name="78" href="#78">78</a>  
-<a class="jxr_linenumber" name="79" href="#79">79</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> bind( Artifact artifact )
-<a class="jxr_linenumber" name="80" href="#80">80</a>      {
-<a class="jxr_linenumber" name="81" href="#81">81</a>          artifacts.add( artifact );
-<a class="jxr_linenumber" name="82" href="#82">82</a>      }
-<a class="jxr_linenumber" name="83" href="#83">83</a>  
-<a class="jxr_linenumber" name="84" href="#84">84</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/MavenMetadata.html">MavenMetadata</a> setFile( File file )
-<a class="jxr_linenumber" name="85" href="#85">85</a>      {
-<a class="jxr_linenumber" name="86" href="#86">86</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>( metadata, file, legacyFormat );
-<a class="jxr_linenumber" name="87" href="#87">87</a>      }
-<a class="jxr_linenumber" name="88" href="#88">88</a>  
-<a class="jxr_linenumber" name="89" href="#89">89</a>      <strong class="jxr_keyword">public</strong> Object getKey()
-<a class="jxr_linenumber" name="90" href="#90">90</a>      {
-<a class="jxr_linenumber" name="91" href="#91">91</a>          <strong class="jxr_keyword">return</strong> getGroupId() + ':' + getArtifactId() + ':' + getVersion();
-<a class="jxr_linenumber" name="92" href="#92">92</a>      }
-<a class="jxr_linenumber" name="93" href="#93">93</a>  
-<a class="jxr_linenumber" name="94" href="#94">94</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Object getKey( Artifact artifact )
-<a class="jxr_linenumber" name="95" href="#95">95</a>      {
-<a class="jxr_linenumber" name="96" href="#96">96</a>          <strong class="jxr_keyword">return</strong> artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getBaseVersion();
-<a class="jxr_linenumber" name="97" href="#97">97</a>      }
+<a class="jxr_linenumber" name="51" href="#51">51</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>( Metadata metadata, File file, <strong class="jxr_keyword">boolean</strong> legacyFormat )
+<a class="jxr_linenumber" name="52" href="#52">52</a>      {
+<a class="jxr_linenumber" name="53" href="#53">53</a>          <strong class="jxr_keyword">super</strong>( metadata, file, legacyFormat );
+<a class="jxr_linenumber" name="54" href="#54">54</a>      }
+<a class="jxr_linenumber" name="55" href="#55">55</a>  
+<a class="jxr_linenumber" name="56" href="#56">56</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/MavenMetadata.html">MavenMetadata</a> setFile( File file )
+<a class="jxr_linenumber" name="57" href="#57">57</a>      {
+<a class="jxr_linenumber" name="58" href="#58">58</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/repository/internal/RemoteSnapshotMetadata.html">RemoteSnapshotMetadata</a>( metadata, file, legacyFormat );
+<a class="jxr_linenumber" name="59" href="#59">59</a>      }
+<a class="jxr_linenumber" name="60" href="#60">60</a>  
+<a class="jxr_linenumber" name="61" href="#61">61</a>      <strong class="jxr_keyword">public</strong> String getExpandedVersion( Artifact artifact )
+<a class="jxr_linenumber" name="62" href="#62">62</a>      {
+<a class="jxr_linenumber" name="63" href="#63">63</a>          String key = getKey( artifact.getClassifier(), artifact.getExtension() );
+<a class="jxr_linenumber" name="64" href="#64">64</a>          <strong class="jxr_keyword">return</strong> versions.get( key ).getVersion();
+<a class="jxr_linenumber" name="65" href="#65">65</a>      }
+<a class="jxr_linenumber" name="66" href="#66">66</a>  
+<a class="jxr_linenumber" name="67" href="#67">67</a>      @Override
+<a class="jxr_linenumber" name="68" href="#68">68</a>      <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> merge( Metadata recessive )
+<a class="jxr_linenumber" name="69" href="#69">69</a>      {
+<a class="jxr_linenumber" name="70" href="#70">70</a>          Snapshot snapshot;
+<a class="jxr_linenumber" name="71" href="#71">71</a>          String lastUpdated = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="72" href="#72">72</a>  
+<a class="jxr_linenumber" name="73" href="#73">73</a>          <strong class="jxr_keyword">if</strong> ( metadata.getVersioning() == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="74" href="#74">74</a>          {
+<a class="jxr_linenumber" name="75" href="#75">75</a>              DateFormat utcDateFormatter = <strong class="jxr_keyword">new</strong> SimpleDateFormat( <span class="jxr_string">"yyyyMMdd.HHmmss"</span> );
+<a class="jxr_linenumber" name="76" href="#76">76</a>              utcDateFormatter.setTimeZone( TimeZone.getTimeZone( <span class="jxr_string">"UTC"</span> ) );
+<a class="jxr_linenumber" name="77" href="#77">77</a>  
+<a class="jxr_linenumber" name="78" href="#78">78</a>              snapshot = <strong class="jxr_keyword">new</strong> Snapshot();
+<a class="jxr_linenumber" name="79" href="#79">79</a>              snapshot.setBuildNumber( getBuildNumber( recessive ) + 1 );
+<a class="jxr_linenumber" name="80" href="#80">80</a>              snapshot.setTimestamp( utcDateFormatter.format( <strong class="jxr_keyword">new</strong> Date() ) );
+<a class="jxr_linenumber" name="81" href="#81">81</a>  
+<a class="jxr_linenumber" name="82" href="#82">82</a>              Versioning versioning = <strong class="jxr_keyword">new</strong> Versioning();
+<a class="jxr_linenumber" name="83" href="#83">83</a>              versioning.setSnapshot( snapshot );
+<a class="jxr_linenumber" name="84" href="#84">84</a>              versioning.setLastUpdated( snapshot.getTimestamp().replace( <span class="jxr_string">"."</span>, <span class="jxr_string">""</span> ) );
+<a class="jxr_linenumber" name="85" href="#85">85</a>              lastUpdated = versioning.getLastUpdated();
+<a class="jxr_linenumber" name="86" href="#86">86</a>  
+<a class="jxr_linenumber" name="87" href="#87">87</a>              metadata.setVersioning( versioning );
+<a class="jxr_linenumber" name="88" href="#88">88</a>          }
+<a class="jxr_linenumber" name="89" href="#89">89</a>          <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="90" href="#90">90</a>          {
+<a class="jxr_linenumber" name="91" href="#91">91</a>              snapshot = metadata.getVersioning().getSnapshot();
+<a class="jxr_linenumber" name="92" href="#92">92</a>              lastUpdated = metadata.getVersioning().getLastUpdated();
+<a class="jxr_linenumber" name="93" href="#93">93</a>          }
+<a class="jxr_linenumber" name="94" href="#94">94</a>  
+<a class="jxr_linenumber" name="95" href="#95">95</a>          <strong class="jxr_keyword">for</strong> ( Artifact artifact : artifacts )
+<a class="jxr_linenumber" name="96" href="#96">96</a>          {
+<a class="jxr_linenumber" name="97" href="#97">97</a>              String version = artifact.getVersion();
 <a class="jxr_linenumber" name="98" href="#98">98</a>  
-<a class="jxr_linenumber" name="99" href="#99">99</a>      <strong class="jxr_keyword">public</strong> String getExpandedVersion( Artifact artifact )
-<a class="jxr_linenumber" name="100" href="#100">100</a>     {
-<a class="jxr_linenumber" name="101" href="#101">101</a>         String key = getKey( artifact.getClassifier(), artifact.getExtension() );
-<a class="jxr_linenumber" name="102" href="#102">102</a>         <strong class="jxr_keyword">return</strong> versions.get( key ).getVersion();
-<a class="jxr_linenumber" name="103" href="#103">103</a>     }
+<a class="jxr_linenumber" name="99" href="#99">99</a>              <strong class="jxr_keyword">if</strong> ( version.endsWith( SNAPSHOT ) )
+<a class="jxr_linenumber" name="100" href="#100">100</a>             {
+<a class="jxr_linenumber" name="101" href="#101">101</a>                 String qualifier = snapshot.getTimestamp() + '-' + snapshot.getBuildNumber();
+<a class="jxr_linenumber" name="102" href="#102">102</a>                 version = version.substring( 0, version.length() - SNAPSHOT.length() ) + qualifier;
+<a class="jxr_linenumber" name="103" href="#103">103</a>             }
 <a class="jxr_linenumber" name="104" href="#104">104</a> 
-<a class="jxr_linenumber" name="105" href="#105">105</a>     @Override
-<a class="jxr_linenumber" name="106" href="#106">106</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> merge( Metadata recessive )
-<a class="jxr_linenumber" name="107" href="#107">107</a>     {
-<a class="jxr_linenumber" name="108" href="#108">108</a>         Snapshot snapshot;
-<a class="jxr_linenumber" name="109" href="#109">109</a>         String lastUpdated = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="105" href="#105">105</a>             SnapshotVersion sv = <strong class="jxr_keyword">new</strong> SnapshotVersion();
+<a class="jxr_linenumber" name="106" href="#106">106</a>             sv.setClassifier( artifact.getClassifier() );
+<a class="jxr_linenumber" name="107" href="#107">107</a>             sv.setExtension( artifact.getExtension() );
+<a class="jxr_linenumber" name="108" href="#108">108</a>             sv.setVersion( version );
+<a class="jxr_linenumber" name="109" href="#109">109</a>             sv.setUpdated( lastUpdated );
 <a class="jxr_linenumber" name="110" href="#110">110</a> 
-<a class="jxr_linenumber" name="111" href="#111">111</a>         <strong class="jxr_keyword">if</strong> ( metadata.getVersioning() == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="112" href="#112">112</a>         {
-<a class="jxr_linenumber" name="113" href="#113">113</a>             DateFormat utcDateFormatter = <strong class="jxr_keyword">new</strong> SimpleDateFormat( <span class="jxr_string">"yyyyMMdd.HHmmss"</span> );
-<a class="jxr_linenumber" name="114" href="#114">114</a>             utcDateFormatter.setTimeZone( TimeZone.getTimeZone( <span class="jxr_string">"UTC"</span> ) );
+<a class="jxr_linenumber" name="111" href="#111">111</a>             versions.put( getKey( sv.getClassifier(), sv.getExtension() ), sv );
+<a class="jxr_linenumber" name="112" href="#112">112</a>         }
+<a class="jxr_linenumber" name="113" href="#113">113</a> 
+<a class="jxr_linenumber" name="114" href="#114">114</a>         artifacts.clear();
 <a class="jxr_linenumber" name="115" href="#115">115</a> 
-<a class="jxr_linenumber" name="116" href="#116">116</a>             snapshot = <strong class="jxr_keyword">new</strong> Snapshot();
-<a class="jxr_linenumber" name="117" href="#117">117</a>             snapshot.setBuildNumber( getBuildNumber( recessive ) + 1 );
-<a class="jxr_linenumber" name="118" href="#118">118</a>             snapshot.setTimestamp( utcDateFormatter.format( <strong class="jxr_keyword">new</strong> Date() ) );
-<a class="jxr_linenumber" name="119" href="#119">119</a> 
-<a class="jxr_linenumber" name="120" href="#120">120</a>             Versioning versioning = <strong class="jxr_keyword">new</strong> Versioning();
-<a class="jxr_linenumber" name="121" href="#121">121</a>             versioning.setSnapshot( snapshot );
-<a class="jxr_linenumber" name="122" href="#122">122</a>             versioning.setLastUpdated( snapshot.getTimestamp().replace( <span class="jxr_string">"."</span>, <span class="jxr_string">""</span> ) );
-<a class="jxr_linenumber" name="123" href="#123">123</a>             lastUpdated = versioning.getLastUpdated();
-<a class="jxr_linenumber" name="124" href="#124">124</a> 
-<a class="jxr_linenumber" name="125" href="#125">125</a>             metadata.setVersioning( versioning );
-<a class="jxr_linenumber" name="126" href="#126">126</a>         }
-<a class="jxr_linenumber" name="127" href="#127">127</a>         <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="128" href="#128">128</a>         {
-<a class="jxr_linenumber" name="129" href="#129">129</a>             snapshot = metadata.getVersioning().getSnapshot();
-<a class="jxr_linenumber" name="130" href="#130">130</a>             lastUpdated = metadata.getVersioning().getLastUpdated();
-<a class="jxr_linenumber" name="131" href="#131">131</a>         }
-<a class="jxr_linenumber" name="132" href="#132">132</a> 
-<a class="jxr_linenumber" name="133" href="#133">133</a>         <strong class="jxr_keyword">for</strong> ( Artifact artifact : artifacts )
-<a class="jxr_linenumber" name="134" href="#134">134</a>         {
-<a class="jxr_linenumber" name="135" href="#135">135</a>             String version = artifact.getVersion();
-<a class="jxr_linenumber" name="136" href="#136">136</a> 
-<a class="jxr_linenumber" name="137" href="#137">137</a>             <strong class="jxr_keyword">if</strong> ( version.endsWith( SNAPSHOT ) )
-<a class="jxr_linenumber" name="138" href="#138">138</a>             {
-<a class="jxr_linenumber" name="139" href="#139">139</a>                 String qualifier = snapshot.getTimestamp() + <span class="jxr_string">"-"</span> + snapshot.getBuildNumber();
-<a class="jxr_linenumber" name="140" href="#140">140</a>                 version = version.substring( 0, version.length() - SNAPSHOT.length() ) + qualifier;
-<a class="jxr_linenumber" name="141" href="#141">141</a>             }
-<a class="jxr_linenumber" name="142" href="#142">142</a> 
-<a class="jxr_linenumber" name="143" href="#143">143</a>             SnapshotVersion sv = <strong class="jxr_keyword">new</strong> SnapshotVersion();
-<a class="jxr_linenumber" name="144" href="#144">144</a>             sv.setClassifier( artifact.getClassifier() );
-<a class="jxr_linenumber" name="145" href="#145">145</a>             sv.setExtension( artifact.getExtension() );
-<a class="jxr_linenumber" name="146" href="#146">146</a>             sv.setVersion( version );
-<a class="jxr_linenumber" name="147" href="#147">147</a>             sv.setUpdated( lastUpdated );
-<a class="jxr_linenumber" name="148" href="#148">148</a>             versions.put( getKey( sv.getClassifier(), sv.getExtension() ), sv );
-<a class="jxr_linenumber" name="149" href="#149">149</a>         }
-<a class="jxr_linenumber" name="150" href="#150">150</a> 
-<a class="jxr_linenumber" name="151" href="#151">151</a>         artifacts.clear();
-<a class="jxr_linenumber" name="152" href="#152">152</a> 
-<a class="jxr_linenumber" name="153" href="#153">153</a>         Versioning versioning = recessive.getVersioning();
-<a class="jxr_linenumber" name="154" href="#154">154</a>         <strong class="jxr_keyword">if</strong> ( versioning != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="155" href="#155">155</a>         {
-<a class="jxr_linenumber" name="156" href="#156">156</a>             <strong class="jxr_keyword">for</strong> ( SnapshotVersion sv : versioning.getSnapshotVersions() )
-<a class="jxr_linenumber" name="157" href="#157">157</a>             {
-<a class="jxr_linenumber" name="158" href="#158">158</a>                 String key = getKey( sv.getClassifier(), sv.getExtension() );
-<a class="jxr_linenumber" name="159" href="#159">159</a>                 <strong class="jxr_keyword">if</strong> ( !versions.containsKey( key ) )
-<a class="jxr_linenumber" name="160" href="#160">160</a>                 {
-<a class="jxr_linenumber" name="161" href="#161">161</a>                     versions.put( key, sv );
-<a class="jxr_linenumber" name="162" href="#162">162</a>                 }
-<a class="jxr_linenumber" name="163" href="#163">163</a>             }
-<a class="jxr_linenumber" name="164" href="#164">164</a>         }
-<a class="jxr_linenumber" name="165" href="#165">165</a> 
-<a class="jxr_linenumber" name="166" href="#166">166</a>         <strong class="jxr_keyword">if</strong> ( !legacyFormat )
-<a class="jxr_linenumber" name="167" href="#167">167</a>         {
-<a class="jxr_linenumber" name="168" href="#168">168</a>             metadata.getVersioning().setSnapshotVersions( <strong class="jxr_keyword">new</strong> ArrayList&lt;SnapshotVersion&gt;( versions.values() ) );
-<a class="jxr_linenumber" name="169" href="#169">169</a>         }
-<a class="jxr_linenumber" name="170" href="#170">170</a>     }
-<a class="jxr_linenumber" name="171" href="#171">171</a> 
-<a class="jxr_linenumber" name="172" href="#172">172</a>     <strong class="jxr_keyword">private</strong> String getKey( String classifier, String extension )
-<a class="jxr_linenumber" name="173" href="#173">173</a>     {
-<a class="jxr_linenumber" name="174" href="#174">174</a>         <strong class="jxr_keyword">return</strong> classifier + ':' + extension;
-<a class="jxr_linenumber" name="175" href="#175">175</a>     }
-<a class="jxr_linenumber" name="176" href="#176">176</a> 
-<a class="jxr_linenumber" name="177" href="#177">177</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> getBuildNumber( Metadata metadata )
-<a class="jxr_linenumber" name="178" href="#178">178</a>     {
-<a class="jxr_linenumber" name="179" href="#179">179</a>         <strong class="jxr_keyword">int</strong> number = 0;
-<a class="jxr_linenumber" name="180" href="#180">180</a> 
-<a class="jxr_linenumber" name="181" href="#181">181</a>         Versioning versioning = metadata.getVersioning();
-<a class="jxr_linenumber" name="182" href="#182">182</a>         <strong class="jxr_keyword">if</strong> ( versioning != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="183" href="#183">183</a>         {
-<a class="jxr_linenumber" name="184" href="#184">184</a>             Snapshot snapshot = versioning.getSnapshot();
-<a class="jxr_linenumber" name="185" href="#185">185</a>             <strong class="jxr_keyword">if</strong> ( snapshot != <strong class="jxr_keyword">null</strong> &amp;&amp; snapshot.getBuildNumber() &gt; 0 )
-<a class="jxr_linenumber" name="186" href="#186">186</a>             {
-<a class="jxr_linenumber" name="187" href="#187">187</a>                 number = snapshot.getBuildNumber();
-<a class="jxr_linenumber" name="188" href="#188">188</a>             }
-<a class="jxr_linenumber" name="189" href="#189">189</a>         }
-<a class="jxr_linenumber" name="190" href="#190">190</a> 
-<a class="jxr_linenumber" name="191" href="#191">191</a>         <strong class="jxr_keyword">return</strong> number;
-<a class="jxr_linenumber" name="192" href="#192">192</a>     }
-<a class="jxr_linenumber" name="193" href="#193">193</a> 
-<a class="jxr_linenumber" name="194" href="#194">194</a>     <strong class="jxr_keyword">public</strong> String getGroupId()
-<a class="jxr_linenumber" name="195" href="#195">195</a>     {
-<a class="jxr_linenumber" name="196" href="#196">196</a>         <strong class="jxr_keyword">return</strong> metadata.getGroupId();
-<a class="jxr_linenumber" name="197" href="#197">197</a>     }
-<a class="jxr_linenumber" name="198" href="#198">198</a> 
-<a class="jxr_linenumber" name="199" href="#199">199</a>     <strong class="jxr_keyword">public</strong> String getArtifactId()
-<a class="jxr_linenumber" name="200" href="#200">200</a>     {
-<a class="jxr_linenumber" name="201" href="#201">201</a>         <strong class="jxr_keyword">return</strong> metadata.getArtifactId();
-<a class="jxr_linenumber" name="202" href="#202">202</a>     }
-<a class="jxr_linenumber" name="203" href="#203">203</a> 
-<a class="jxr_linenumber" name="204" href="#204">204</a>     <strong class="jxr_keyword">public</strong> String getVersion()
-<a class="jxr_linenumber" name="205" href="#205">205</a>     {
-<a class="jxr_linenumber" name="206" href="#206">206</a>         <strong class="jxr_keyword">return</strong> metadata.getVersion();
-<a class="jxr_linenumber" name="207" href="#207">207</a>     }
-<a class="jxr_linenumber" name="208" href="#208">208</a> 
-<a class="jxr_linenumber" name="209" href="#209">209</a>     <strong class="jxr_keyword">public</strong> Nature getNature()
-<a class="jxr_linenumber" name="210" href="#210">210</a>     {
-<a class="jxr_linenumber" name="211" href="#211">211</a>         <strong class="jxr_keyword">return</strong> Nature.SNAPSHOT;
-<a class="jxr_linenumber" name="212" href="#212">212</a>     }
-<a class="jxr_linenumber" name="213" href="#213">213</a> 
-<a class="jxr_linenumber" name="214" href="#214">214</a> }
+<a class="jxr_linenumber" name="116" href="#116">116</a>         Versioning versioning = recessive.getVersioning();
+<a class="jxr_linenumber" name="117" href="#117">117</a>         <strong class="jxr_keyword">if</strong> ( versioning != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="118" href="#118">118</a>         {
+<a class="jxr_linenumber" name="119" href="#119">119</a>             <strong class="jxr_keyword">for</strong> ( SnapshotVersion sv : versioning.getSnapshotVersions() )
+<a class="jxr_linenumber" name="120" href="#120">120</a>             {
+<a class="jxr_linenumber" name="121" href="#121">121</a>                 String key = getKey( sv.getClassifier(), sv.getExtension() );
+<a class="jxr_linenumber" name="122" href="#122">122</a>                 <strong class="jxr_keyword">if</strong> ( !versions.containsKey( key ) )
+<a class="jxr_linenumber" name="123" href="#123">123</a>                 {
+<a class="jxr_linenumber" name="124" href="#124">124</a>                     versions.put( key, sv );
+<a class="jxr_linenumber" name="125" href="#125">125</a>                 }
+<a class="jxr_linenumber" name="126" href="#126">126</a>             }
+<a class="jxr_linenumber" name="127" href="#127">127</a>         }
+<a class="jxr_linenumber" name="128" href="#128">128</a> 
+<a class="jxr_linenumber" name="129" href="#129">129</a>         <strong class="jxr_keyword">if</strong> ( !legacyFormat )
+<a class="jxr_linenumber" name="130" href="#130">130</a>         {
+<a class="jxr_linenumber" name="131" href="#131">131</a>             metadata.getVersioning().setSnapshotVersions( <strong class="jxr_keyword">new</strong> ArrayList&lt;SnapshotVersion&gt;( versions.values() ) );
+<a class="jxr_linenumber" name="132" href="#132">132</a>         }
+<a class="jxr_linenumber" name="133" href="#133">133</a>     }
+<a class="jxr_linenumber" name="134" href="#134">134</a> 
+<a class="jxr_linenumber" name="135" href="#135">135</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">int</strong> getBuildNumber( Metadata metadata )
+<a class="jxr_linenumber" name="136" href="#136">136</a>     {
+<a class="jxr_linenumber" name="137" href="#137">137</a>         <strong class="jxr_keyword">int</strong> number = 0;
+<a class="jxr_linenumber" name="138" href="#138">138</a> 
+<a class="jxr_linenumber" name="139" href="#139">139</a>         Versioning versioning = metadata.getVersioning();
+<a class="jxr_linenumber" name="140" href="#140">140</a>         <strong class="jxr_keyword">if</strong> ( versioning != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="141" href="#141">141</a>         {
+<a class="jxr_linenumber" name="142" href="#142">142</a>             Snapshot snapshot = versioning.getSnapshot();
+<a class="jxr_linenumber" name="143" href="#143">143</a>             <strong class="jxr_keyword">if</strong> ( snapshot != <strong class="jxr_keyword">null</strong> &amp;&amp; snapshot.getBuildNumber() &gt; 0 )
+<a class="jxr_linenumber" name="144" href="#144">144</a>             {
+<a class="jxr_linenumber" name="145" href="#145">145</a>                 number = snapshot.getBuildNumber();
+<a class="jxr_linenumber" name="146" href="#146">146</a>             }
+<a class="jxr_linenumber" name="147" href="#147">147</a>         }
+<a class="jxr_linenumber" name="148" href="#148">148</a> 
+<a class="jxr_linenumber" name="149" href="#149">149</a>         <strong class="jxr_keyword">return</strong> number;
+<a class="jxr_linenumber" name="150" href="#150">150</a>     }
+<a class="jxr_linenumber" name="151" href="#151">151</a> 
+<a class="jxr_linenumber" name="152" href="#152">152</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/VersionsMetadata.html
==============================================================================
--- websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/VersionsMetadata.html (original)
+++ websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/VersionsMetadata.html Sat Jan 19 17:59:58 2013
@@ -50,96 +50,97 @@
 <a class="jxr_linenumber" name="40" href="#40">40</a>  
 <a class="jxr_linenumber" name="41" href="#41">41</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/VersionsMetadata.html">VersionsMetadata</a>( Artifact artifact )
 <a class="jxr_linenumber" name="42" href="#42">42</a>      {
-<a class="jxr_linenumber" name="43" href="#43">43</a>          <strong class="jxr_keyword">super</strong>( createMetadata( artifact ), <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="43" href="#43">43</a>          <strong class="jxr_keyword">super</strong>( createRepositoryMetadata( artifact ), <strong class="jxr_keyword">null</strong> );
 <a class="jxr_linenumber" name="44" href="#44">44</a>          <strong class="jxr_keyword">this</strong>.artifact = artifact;
 <a class="jxr_linenumber" name="45" href="#45">45</a>      }
 <a class="jxr_linenumber" name="46" href="#46">46</a>  
 <a class="jxr_linenumber" name="47" href="#47">47</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/VersionsMetadata.html">VersionsMetadata</a>( Artifact artifact, File file )
 <a class="jxr_linenumber" name="48" href="#48">48</a>      {
-<a class="jxr_linenumber" name="49" href="#49">49</a>          <strong class="jxr_keyword">super</strong>( createMetadata( artifact ), file );
+<a class="jxr_linenumber" name="49" href="#49">49</a>          <strong class="jxr_keyword">super</strong>( createRepositoryMetadata( artifact ), file );
 <a class="jxr_linenumber" name="50" href="#50">50</a>          <strong class="jxr_keyword">this</strong>.artifact = artifact;
 <a class="jxr_linenumber" name="51" href="#51">51</a>      }
 <a class="jxr_linenumber" name="52" href="#52">52</a>  
-<a class="jxr_linenumber" name="53" href="#53">53</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Metadata createMetadata( Artifact artifact )
+<a class="jxr_linenumber" name="53" href="#53">53</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Metadata createRepositoryMetadata( Artifact artifact )
 <a class="jxr_linenumber" name="54" href="#54">54</a>      {
-<a class="jxr_linenumber" name="55" href="#55">55</a>          Versioning versioning = <strong class="jxr_keyword">new</strong> Versioning();
-<a class="jxr_linenumber" name="56" href="#56">56</a>          versioning.addVersion( artifact.getBaseVersion() );
-<a class="jxr_linenumber" name="57" href="#57">57</a>          <strong class="jxr_keyword">if</strong> ( !artifact.isSnapshot() )
-<a class="jxr_linenumber" name="58" href="#58">58</a>          {
-<a class="jxr_linenumber" name="59" href="#59">59</a>              versioning.setRelease( artifact.getBaseVersion() );
-<a class="jxr_linenumber" name="60" href="#60">60</a>          }
-<a class="jxr_linenumber" name="61" href="#61">61</a>          <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"maven-plugin"</span>.equals( artifact.getProperty( ArtifactProperties.TYPE, <span class="jxr_string">""</span> ) ) )
+<a class="jxr_linenumber" name="55" href="#55">55</a>          Metadata metadata = <strong class="jxr_keyword">new</strong> Metadata();
+<a class="jxr_linenumber" name="56" href="#56">56</a>          metadata.setGroupId( artifact.getGroupId() );
+<a class="jxr_linenumber" name="57" href="#57">57</a>          metadata.setArtifactId( artifact.getArtifactId() );
+<a class="jxr_linenumber" name="58" href="#58">58</a>  
+<a class="jxr_linenumber" name="59" href="#59">59</a>          Versioning versioning = <strong class="jxr_keyword">new</strong> Versioning();
+<a class="jxr_linenumber" name="60" href="#60">60</a>          versioning.addVersion( artifact.getBaseVersion() );
+<a class="jxr_linenumber" name="61" href="#61">61</a>          <strong class="jxr_keyword">if</strong> ( !artifact.isSnapshot() )
 <a class="jxr_linenumber" name="62" href="#62">62</a>          {
-<a class="jxr_linenumber" name="63" href="#63">63</a>              versioning.setLatest( artifact.getBaseVersion() );
+<a class="jxr_linenumber" name="63" href="#63">63</a>              versioning.setRelease( artifact.getBaseVersion() );
 <a class="jxr_linenumber" name="64" href="#64">64</a>          }
-<a class="jxr_linenumber" name="65" href="#65">65</a>  
-<a class="jxr_linenumber" name="66" href="#66">66</a>          Metadata metadata = <strong class="jxr_keyword">new</strong> Metadata();
-<a class="jxr_linenumber" name="67" href="#67">67</a>          metadata.setVersioning( versioning );
-<a class="jxr_linenumber" name="68" href="#68">68</a>          metadata.setGroupId( artifact.getGroupId() );
-<a class="jxr_linenumber" name="69" href="#69">69</a>          metadata.setArtifactId( artifact.getArtifactId() );
-<a class="jxr_linenumber" name="70" href="#70">70</a>  
-<a class="jxr_linenumber" name="71" href="#71">71</a>          <strong class="jxr_keyword">return</strong> metadata;
-<a class="jxr_linenumber" name="72" href="#72">72</a>      }
-<a class="jxr_linenumber" name="73" href="#73">73</a>  
-<a class="jxr_linenumber" name="74" href="#74">74</a>      @Override
-<a class="jxr_linenumber" name="75" href="#75">75</a>      <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> merge( Metadata recessive )
-<a class="jxr_linenumber" name="76" href="#76">76</a>      {
-<a class="jxr_linenumber" name="77" href="#77">77</a>          Versioning versioning = metadata.getVersioning();
-<a class="jxr_linenumber" name="78" href="#78">78</a>          versioning.updateTimestamp();
-<a class="jxr_linenumber" name="79" href="#79">79</a>  
-<a class="jxr_linenumber" name="80" href="#80">80</a>          <strong class="jxr_keyword">if</strong> ( recessive.getVersioning() != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="81" href="#81">81</a>          {
-<a class="jxr_linenumber" name="82" href="#82">82</a>              <strong class="jxr_keyword">if</strong> ( versioning.getLatest() == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="83" href="#83">83</a>              {
-<a class="jxr_linenumber" name="84" href="#84">84</a>                  versioning.setLatest( recessive.getVersioning().getLatest() );
-<a class="jxr_linenumber" name="85" href="#85">85</a>              }
-<a class="jxr_linenumber" name="86" href="#86">86</a>              <strong class="jxr_keyword">if</strong> ( versioning.getRelease() == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="87" href="#87">87</a>              {
-<a class="jxr_linenumber" name="88" href="#88">88</a>                  versioning.setRelease( recessive.getVersioning().getRelease() );
-<a class="jxr_linenumber" name="89" href="#89">89</a>              }
-<a class="jxr_linenumber" name="90" href="#90">90</a>  
-<a class="jxr_linenumber" name="91" href="#91">91</a>              Collection&lt;String&gt; versions = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;String&gt;( recessive.getVersioning().getVersions() );
-<a class="jxr_linenumber" name="92" href="#92">92</a>              versions.addAll( versioning.getVersions() );
-<a class="jxr_linenumber" name="93" href="#93">93</a>              versioning.setVersions( <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;( versions ) );
-<a class="jxr_linenumber" name="94" href="#94">94</a>          }
-<a class="jxr_linenumber" name="95" href="#95">95</a>      }
-<a class="jxr_linenumber" name="96" href="#96">96</a>  
-<a class="jxr_linenumber" name="97" href="#97">97</a>      <strong class="jxr_keyword">public</strong> Object getKey()
-<a class="jxr_linenumber" name="98" href="#98">98</a>      {
-<a class="jxr_linenumber" name="99" href="#99">99</a>          <strong class="jxr_keyword">return</strong> getGroupId() + ':' + getArtifactId();
-<a class="jxr_linenumber" name="100" href="#100">100</a>     }
-<a class="jxr_linenumber" name="101" href="#101">101</a> 
-<a class="jxr_linenumber" name="102" href="#102">102</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Object getKey( Artifact artifact )
-<a class="jxr_linenumber" name="103" href="#103">103</a>     {
-<a class="jxr_linenumber" name="104" href="#104">104</a>         <strong class="jxr_keyword">return</strong> artifact.getGroupId() + ':' + artifact.getArtifactId();
-<a class="jxr_linenumber" name="105" href="#105">105</a>     }
-<a class="jxr_linenumber" name="106" href="#106">106</a> 
-<a class="jxr_linenumber" name="107" href="#107">107</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/MavenMetadata.html">MavenMetadata</a> setFile( File file )
-<a class="jxr_linenumber" name="108" href="#108">108</a>     {
-<a class="jxr_linenumber" name="109" href="#109">109</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/repository/internal/VersionsMetadata.html">VersionsMetadata</a>( artifact, file );
-<a class="jxr_linenumber" name="110" href="#110">110</a>     }
-<a class="jxr_linenumber" name="111" href="#111">111</a> 
-<a class="jxr_linenumber" name="112" href="#112">112</a>     <strong class="jxr_keyword">public</strong> String getGroupId()
-<a class="jxr_linenumber" name="113" href="#113">113</a>     {
-<a class="jxr_linenumber" name="114" href="#114">114</a>         <strong class="jxr_keyword">return</strong> artifact.getGroupId();
-<a class="jxr_linenumber" name="115" href="#115">115</a>     }
-<a class="jxr_linenumber" name="116" href="#116">116</a> 
-<a class="jxr_linenumber" name="117" href="#117">117</a>     <strong class="jxr_keyword">public</strong> String getArtifactId()
-<a class="jxr_linenumber" name="118" href="#118">118</a>     {
-<a class="jxr_linenumber" name="119" href="#119">119</a>         <strong class="jxr_keyword">return</strong> artifact.getArtifactId();
-<a class="jxr_linenumber" name="120" href="#120">120</a>     }
-<a class="jxr_linenumber" name="121" href="#121">121</a> 
-<a class="jxr_linenumber" name="122" href="#122">122</a>     <strong class="jxr_keyword">public</strong> String getVersion()
-<a class="jxr_linenumber" name="123" href="#123">123</a>     {
-<a class="jxr_linenumber" name="124" href="#124">124</a>         <strong class="jxr_keyword">return</strong> <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="125" href="#125">125</a>     }
-<a class="jxr_linenumber" name="126" href="#126">126</a> 
-<a class="jxr_linenumber" name="127" href="#127">127</a>     <strong class="jxr_keyword">public</strong> Nature getNature()
-<a class="jxr_linenumber" name="128" href="#128">128</a>     {
-<a class="jxr_linenumber" name="129" href="#129">129</a>         <strong class="jxr_keyword">return</strong> artifact.isSnapshot() ? Nature.RELEASE_OR_SNAPSHOT : Nature.RELEASE;
-<a class="jxr_linenumber" name="130" href="#130">130</a>     }
-<a class="jxr_linenumber" name="131" href="#131">131</a> 
-<a class="jxr_linenumber" name="132" href="#132">132</a> }
+<a class="jxr_linenumber" name="65" href="#65">65</a>          <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"maven-plugin"</span>.equals( artifact.getProperty( ArtifactProperties.TYPE, <span class="jxr_string">""</span> ) ) )
+<a class="jxr_linenumber" name="66" href="#66">66</a>          {
+<a class="jxr_linenumber" name="67" href="#67">67</a>              versioning.setLatest( artifact.getBaseVersion() );
+<a class="jxr_linenumber" name="68" href="#68">68</a>          }
+<a class="jxr_linenumber" name="69" href="#69">69</a>  
+<a class="jxr_linenumber" name="70" href="#70">70</a>          metadata.setVersioning( versioning );
+<a class="jxr_linenumber" name="71" href="#71">71</a>  
+<a class="jxr_linenumber" name="72" href="#72">72</a>          <strong class="jxr_keyword">return</strong> metadata;
+<a class="jxr_linenumber" name="73" href="#73">73</a>      }
+<a class="jxr_linenumber" name="74" href="#74">74</a>  
+<a class="jxr_linenumber" name="75" href="#75">75</a>      @Override
+<a class="jxr_linenumber" name="76" href="#76">76</a>      <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> merge( Metadata recessive )
+<a class="jxr_linenumber" name="77" href="#77">77</a>      {
+<a class="jxr_linenumber" name="78" href="#78">78</a>          Versioning versioning = metadata.getVersioning();
+<a class="jxr_linenumber" name="79" href="#79">79</a>          versioning.updateTimestamp();
+<a class="jxr_linenumber" name="80" href="#80">80</a>  
+<a class="jxr_linenumber" name="81" href="#81">81</a>          <strong class="jxr_keyword">if</strong> ( recessive.getVersioning() != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="82" href="#82">82</a>          {
+<a class="jxr_linenumber" name="83" href="#83">83</a>              <strong class="jxr_keyword">if</strong> ( versioning.getLatest() == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="84" href="#84">84</a>              {
+<a class="jxr_linenumber" name="85" href="#85">85</a>                  versioning.setLatest( recessive.getVersioning().getLatest() );
+<a class="jxr_linenumber" name="86" href="#86">86</a>              }
+<a class="jxr_linenumber" name="87" href="#87">87</a>              <strong class="jxr_keyword">if</strong> ( versioning.getRelease() == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="88" href="#88">88</a>              {
+<a class="jxr_linenumber" name="89" href="#89">89</a>                  versioning.setRelease( recessive.getVersioning().getRelease() );
+<a class="jxr_linenumber" name="90" href="#90">90</a>              }
+<a class="jxr_linenumber" name="91" href="#91">91</a>  
+<a class="jxr_linenumber" name="92" href="#92">92</a>              Collection&lt;String&gt; versions = <strong class="jxr_keyword">new</strong> LinkedHashSet&lt;String&gt;( recessive.getVersioning().getVersions() );
+<a class="jxr_linenumber" name="93" href="#93">93</a>              versions.addAll( versioning.getVersions() );
+<a class="jxr_linenumber" name="94" href="#94">94</a>              versioning.setVersions( <strong class="jxr_keyword">new</strong> ArrayList&lt;String&gt;( versions ) );
+<a class="jxr_linenumber" name="95" href="#95">95</a>          }
+<a class="jxr_linenumber" name="96" href="#96">96</a>      }
+<a class="jxr_linenumber" name="97" href="#97">97</a>  
+<a class="jxr_linenumber" name="98" href="#98">98</a>      <strong class="jxr_keyword">public</strong> Object getKey()
+<a class="jxr_linenumber" name="99" href="#99">99</a>      {
+<a class="jxr_linenumber" name="100" href="#100">100</a>         <strong class="jxr_keyword">return</strong> getGroupId() + ':' + getArtifactId();
+<a class="jxr_linenumber" name="101" href="#101">101</a>     }
+<a class="jxr_linenumber" name="102" href="#102">102</a> 
+<a class="jxr_linenumber" name="103" href="#103">103</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Object getKey( Artifact artifact )
+<a class="jxr_linenumber" name="104" href="#104">104</a>     {
+<a class="jxr_linenumber" name="105" href="#105">105</a>         <strong class="jxr_keyword">return</strong> artifact.getGroupId() + ':' + artifact.getArtifactId();
+<a class="jxr_linenumber" name="106" href="#106">106</a>     }
+<a class="jxr_linenumber" name="107" href="#107">107</a> 
+<a class="jxr_linenumber" name="108" href="#108">108</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/repository/internal/MavenMetadata.html">MavenMetadata</a> setFile( File file )
+<a class="jxr_linenumber" name="109" href="#109">109</a>     {
+<a class="jxr_linenumber" name="110" href="#110">110</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/repository/internal/VersionsMetadata.html">VersionsMetadata</a>( artifact, file );
+<a class="jxr_linenumber" name="111" href="#111">111</a>     }
+<a class="jxr_linenumber" name="112" href="#112">112</a> 
+<a class="jxr_linenumber" name="113" href="#113">113</a>     <strong class="jxr_keyword">public</strong> String getGroupId()
+<a class="jxr_linenumber" name="114" href="#114">114</a>     {
+<a class="jxr_linenumber" name="115" href="#115">115</a>         <strong class="jxr_keyword">return</strong> artifact.getGroupId();
+<a class="jxr_linenumber" name="116" href="#116">116</a>     }
+<a class="jxr_linenumber" name="117" href="#117">117</a> 
+<a class="jxr_linenumber" name="118" href="#118">118</a>     <strong class="jxr_keyword">public</strong> String getArtifactId()
+<a class="jxr_linenumber" name="119" href="#119">119</a>     {
+<a class="jxr_linenumber" name="120" href="#120">120</a>         <strong class="jxr_keyword">return</strong> artifact.getArtifactId();
+<a class="jxr_linenumber" name="121" href="#121">121</a>     }
+<a class="jxr_linenumber" name="122" href="#122">122</a> 
+<a class="jxr_linenumber" name="123" href="#123">123</a>     <strong class="jxr_keyword">public</strong> String getVersion()
+<a class="jxr_linenumber" name="124" href="#124">124</a>     {
+<a class="jxr_linenumber" name="125" href="#125">125</a>         <strong class="jxr_keyword">return</strong> <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="126" href="#126">126</a>     }
+<a class="jxr_linenumber" name="127" href="#127">127</a> 
+<a class="jxr_linenumber" name="128" href="#128">128</a>     <strong class="jxr_keyword">public</strong> Nature getNature()
+<a class="jxr_linenumber" name="129" href="#129">129</a>     {
+<a class="jxr_linenumber" name="130" href="#130">130</a>         <strong class="jxr_keyword">return</strong> artifact.isSnapshot() ? Nature.RELEASE_OR_SNAPSHOT : Nature.RELEASE;
+<a class="jxr_linenumber" name="131" href="#131">131</a>     }
+<a class="jxr_linenumber" name="132" href="#132">132</a> 
+<a class="jxr_linenumber" name="133" href="#133">133</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/package-frame.html
==============================================================================
--- websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/package-frame.html (original)
+++ websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/package-frame.html Sat Jan 19 17:59:58 2013
@@ -55,6 +55,9 @@
             	<a href="MavenServiceLocator.html" target="classFrame">MavenServiceLocator</a>
           	</li>
           	          	<li>
+            	<a href="MavenSnapshotMetadata.html" target="classFrame">MavenSnapshotMetadata</a>
+          	</li>
+          	          	<li>
             	<a href="DefaultVersionResolver.html" target="classFrame">Record</a>
           	</li>
           	          	<li>

Modified: websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/package-summary.html
==============================================================================
--- websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/package-summary.html (original)
+++ websites/production/maven/content/ref/3.1-SNAPSHOT/maven-aether-provider/xref/org/apache/maven/repository/internal/package-summary.html Sat Jan 19 17:59:58 2013
@@ -102,6 +102,11 @@
             	</tr>
 				            	<tr>
               		<td>
+                		<a href="MavenSnapshotMetadata.html" target="classFrame">MavenSnapshotMetadata</a>
+              		</td>
+            	</tr>
+				            	<tr>
+              		<td>
                 		<a href="DefaultVersionResolver.html" target="classFrame">Record</a>
               		</td>
             	</tr>

Modified: websites/production/maven/content/ref/3.1-SNAPSHOT/maven-artifact/apidocs/index-all.html
==============================================================================
--- websites/production/maven/content/ref/3.1-SNAPSHOT/maven-artifact/apidocs/index-all.html (original)
+++ websites/production/maven/content/ref/3.1-SNAPSHOT/maven-artifact/apidocs/index-all.html Sat Jan 19 17:59:58 2013
@@ -102,7 +102,7 @@ Method in interface org.apache.maven.art
 <DT><A HREF="./org/apache/maven/artifact/DefaultArtifact.html#addMetadata(org.apache.maven.artifact.metadata.ArtifactMetadata)"><B>addMetadata(ArtifactMetadata)</B></A> - 
 Method in class org.apache.maven.artifact.<A HREF="./org/apache/maven/artifact/DefaultArtifact.html" title="class in org.apache.maven.artifact">DefaultArtifact</A>
 <DD>&nbsp;
-<DT><A HREF="./org/apache/maven/artifact/Artifact.html" title="interface in org.apache.maven.artifact"><B>Artifact</B></A> - Interface in <A HREF="./org/apache/maven/artifact/package-summary.html">org.apache.maven.artifact</A><DD>&nbsp;<DT><A HREF="./org/apache/maven/artifact/resolver/filter/ArtifactFilter.html" title="interface in org.apache.maven.artifact.resolver.filter"><B>ArtifactFilter</B></A> - Interface in <A HREF="./org/apache/maven/artifact/resolver/filter/package-summary.html">org.apache.maven.artifact.resolver.filter</A><DD>&nbsp;<DT><A HREF="./org/apache/maven/artifact/handler/ArtifactHandler.html" title="interface in org.apache.maven.artifact.handler"><B>ArtifactHandler</B></A> - Interface in <A HREF="./org/apache/maven/artifact/handler/package-summary.html">org.apache.maven.artifact.handler</A><DD>&nbsp;<DT><A HREF="./org/apache/maven/artifact/ArtifactUtils.html#artifactMapByVersionlessId(java.util.Collection)"><B>artifactMapByVersionlessId(Collection&lt;Artif
 act&gt;)</B></A> - 
+<DT><A HREF="./org/apache/maven/artifact/Artifact.html" title="interface in org.apache.maven.artifact"><B>Artifact</B></A> - Interface in <A HREF="./org/apache/maven/artifact/package-summary.html">org.apache.maven.artifact</A><DD>Maven Artifact interface.<DT><A HREF="./org/apache/maven/artifact/resolver/filter/ArtifactFilter.html" title="interface in org.apache.maven.artifact.resolver.filter"><B>ArtifactFilter</B></A> - Interface in <A HREF="./org/apache/maven/artifact/resolver/filter/package-summary.html">org.apache.maven.artifact.resolver.filter</A><DD>&nbsp;<DT><A HREF="./org/apache/maven/artifact/handler/ArtifactHandler.html" title="interface in org.apache.maven.artifact.handler"><B>ArtifactHandler</B></A> - Interface in <A HREF="./org/apache/maven/artifact/handler/package-summary.html">org.apache.maven.artifact.handler</A><DD>&nbsp;<DT><A HREF="./org/apache/maven/artifact/ArtifactUtils.html#artifactMapByVersionlessId(java.util.Collection)"><B>artifactMapByVersionlessId(
 Collection&lt;Artifact&gt;)</B></A> - 
 Static method in class org.apache.maven.artifact.<A HREF="./org/apache/maven/artifact/ArtifactUtils.html" title="class in org.apache.maven.artifact">ArtifactUtils</A>
 <DD>&nbsp;
 <DT><A HREF="./org/apache/maven/artifact/metadata/ArtifactMetadata.html" title="interface in org.apache.maven.artifact.metadata"><B>ArtifactMetadata</B></A> - Interface in <A HREF="./org/apache/maven/artifact/metadata/package-summary.html">org.apache.maven.artifact.metadata</A><DD><B>Deprecated.</B>&nbsp;<DT><A HREF="./org/apache/maven/repository/legacy/metadata/ArtifactMetadata.html" title="interface in org.apache.maven.repository.legacy.metadata"><B>ArtifactMetadata</B></A> - Interface in <A HREF="./org/apache/maven/repository/legacy/metadata/package-summary.html">org.apache.maven.repository.legacy.metadata</A><DD>Contains metadata about an artifact, and methods to retrieve/store it from an artifact repository.<DT><A HREF="./org/apache/maven/artifact/resolver/ArtifactNotFoundException.html" title="class in org.apache.maven.artifact.resolver"><B>ArtifactNotFoundException</B></A> - Exception in <A HREF="./org/apache/maven/artifact/resolver/package-summary.html">org.apache.ma
 ven.artifact.resolver</A><DD>&nbsp;<DT><A HREF="./org/apache/maven/artifact/resolver/ArtifactNotFoundException.html#ArtifactNotFoundException(java.lang.String, org.apache.maven.artifact.Artifact, java.util.List)"><B>ArtifactNotFoundException(String, Artifact, List&lt;ArtifactRepository&gt;)</B></A> -