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/05/27 23:09:00 UTC
svn commit: r863356 [1/11] - in
/websites/production/maven/content/ref/3-LATEST: ./
apidocs/org/apache/maven/model/management/
apidocs/src-html/org/apache/maven/model/management/
apidocs/src-html/org/apache/maven/model/validation/ maven-model-builder/a...
Author: hboutemy
Date: Mon May 27 21:08:59 2013
New Revision: 863356
Log:
documentation update for Maven 3.1.0-alpha-1 take 3
Modified:
websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html
websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.html
websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html
websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html
websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/validation/DefaultModelValidator.html
websites/production/maven/content/ref/3-LATEST/dependencies.html
websites/production/maven/content/ref/3-LATEST/dependency-convergence.html
websites/production/maven/content/ref/3-LATEST/dependency-info.html
websites/production/maven/content/ref/3-LATEST/dependency-management.html
websites/production/maven/content/ref/3-LATEST/distribution-management.html
websites/production/maven/content/ref/3-LATEST/index.html
websites/production/maven/content/ref/3-LATEST/integration.html
websites/production/maven/content/ref/3-LATEST/issue-tracking.html
websites/production/maven/content/ref/3-LATEST/license.html
websites/production/maven/content/ref/3-LATEST/mail-lists.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/apidocs/src-html/org/apache/maven/model/validation/DefaultModelValidator.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/testapidocs/org/apache/maven/model/validation/DefaultModelValidatorTest.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/testapidocs/src-html/org/apache/maven/model/validation/DefaultModelValidatorTest.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/xref-test/org/apache/maven/model/validation/DefaultModelValidatorTest.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/xref/org/apache/maven/model/management/DefaultPluginManagementInjector.html
websites/production/maven/content/ref/3-LATEST/maven-model-builder/xref/org/apache/maven/model/validation/DefaultModelValidator.html
websites/production/maven/content/ref/3-LATEST/modules.html
websites/production/maven/content/ref/3-LATEST/plugin-management.html
websites/production/maven/content/ref/3-LATEST/plugins.html
websites/production/maven/content/ref/3-LATEST/project-info.html
websites/production/maven/content/ref/3-LATEST/project-reports.html
websites/production/maven/content/ref/3-LATEST/project-summary.html
websites/production/maven/content/ref/3-LATEST/sonar.html
websites/production/maven/content/ref/3-LATEST/source-repository.html
websites/production/maven/content/ref/3-LATEST/surefire-report.html
websites/production/maven/content/ref/3-LATEST/team-list.html
websites/production/maven/content/ref/3-LATEST/xref/org/apache/maven/model/management/DefaultPluginManagementInjector.html
websites/production/maven/content/ref/3-LATEST/xref/org/apache/maven/model/validation/DefaultModelValidator.html
Modified: websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html (original)
+++ websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html Mon May 27 21:08:59 2013
@@ -101,7 +101,7 @@ Class DefaultPluginManagementInjector.Ma
</DL>
<HR>
<DL>
-<DT><PRE>protected static class <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.58"><B>DefaultPluginManagementInjector.ManagementModelMerger</B></A><DT>extends <A HREF="../../../../../org/apache/maven/model/merge/MavenModelMerger.html" title="class in org.apache.maven.model.merge">MavenModelMerger</A></DL>
+<DT><PRE>protected static class <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.56"><B>DefaultPluginManagementInjector.ManagementModelMerger</B></A><DT>extends <A HREF="../../../../../org/apache/maven/model/merge/MavenModelMerger.html" title="class in org.apache.maven.model.merge">MavenModelMerger</A></DL>
</PRE>
<P>
@@ -216,7 +216,7 @@ Class DefaultPluginManagementInjector.Ma
<A NAME="DefaultPluginManagementInjector.ManagementModelMerger()"><!-- --></A><H3>
DefaultPluginManagementInjector.ManagementModelMerger</H3>
<PRE>
-protected <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html#line.58"><B>DefaultPluginManagementInjector.ManagementModelMerger</B></A>()</PRE>
+protected <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html#line.56"><B>DefaultPluginManagementInjector.ManagementModelMerger</B></A>()</PRE>
<DL>
</DL>
@@ -233,7 +233,7 @@ protected <A HREF="../../../../../src-ht
<A NAME="mergeManagedBuildPlugins(org.apache.maven.model.Model)"><!-- --></A><H3>
mergeManagedBuildPlugins</H3>
<PRE>
-public void <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html#line.62"><B>mergeManagedBuildPlugins</B></A>(<A HREF="../../../../../org/apache/maven/model/Model.html" title="class in org.apache.maven.model">Model</A> model)</PRE>
+public void <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html#line.60"><B>mergeManagedBuildPlugins</B></A>(<A HREF="../../../../../org/apache/maven/model/Model.html" title="class in org.apache.maven.model">Model</A> model)</PRE>
<DL>
<DD><DL>
</DL>
@@ -244,7 +244,7 @@ public void <A HREF="../../../../../src-
<A NAME="mergePlugin_Executions(org.apache.maven.model.Plugin, org.apache.maven.model.Plugin, boolean, java.util.Map)"><!-- --></A><H3>
mergePlugin_Executions</H3>
<PRE>
-protected void <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html#line.111"><B>mergePlugin_Executions</B></A>(<A HREF="../../../../../org/apache/maven/model/Plugin.html" title="class in org.apache.maven.model">Plugin</A> target,
+protected void <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html#line.103"><B>mergePlugin_Executions</B></A>(<A HREF="../../../../../org/apache/maven/model/Plugin.html" title="class in org.apache.maven.model">Plugin</A> target,
<A HREF="../../../../../org/apache/maven/model/Plugin.html" title="class in org.apache.maven.model">Plugin</A> source,
boolean sourceDominant,
<A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</A><<A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A>,<A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A>> context)</PRE>
Modified: websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.html (original)
+++ websites/production/maven/content/ref/3-LATEST/apidocs/org/apache/maven/model/management/DefaultPluginManagementInjector.html Mon May 27 21:08:59 2013
@@ -100,7 +100,7 @@ Class DefaultPluginManagementInjector</H
<HR>
<DL>
<DT><PRE><FONT SIZE="-1"><A HREF="http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/component/annotations.Component.html?is-external=true" title="class or interface in org.codehaus.plexus.component">@Component</A>(role=<A HREF="../../../../../org/apache/maven/model/management/PluginManagementInjector.html" title="interface in org.apache.maven.model.management">PluginManagementInjector.class</A>)
-</FONT>public class <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.47"><B>DefaultPluginManagementInjector</B></A><DT>extends <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/apache/maven/model/management/PluginManagementInjector.html" title="interface in org.apache.maven.model.management">PluginManagementInjector</A></DL>
+</FONT>public class <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.45"><B>DefaultPluginManagementInjector</B></A><DT>extends <A HREF="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/apache/maven/model/management/PluginManagementInjector.html" title="interface in org.apache.maven.model.management">PluginManagementInjector</A></DL>
</PRE>
<P>
@@ -193,7 +193,7 @@ Handles injection of plugin management i
<A NAME="DefaultPluginManagementInjector()"><!-- --></A><H3>
DefaultPluginManagementInjector</H3>
<PRE>
-public <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.47"><B>DefaultPluginManagementInjector</B></A>()</PRE>
+public <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.45"><B>DefaultPluginManagementInjector</B></A>()</PRE>
<DL>
</DL>
@@ -210,7 +210,7 @@ public <A HREF="../../../../../src-html/
<A NAME="injectManagement(org.apache.maven.model.Model, org.apache.maven.model.building.ModelBuildingRequest, org.apache.maven.model.building.ModelProblemCollector)"><!-- --></A><H3>
injectManagement</H3>
<PRE>
-public void <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.53"><B>injectManagement</B></A>(<A HREF="../../../../../org/apache/maven/model/Model.html" title="class in org.apache.maven.model">Model</A> model,
+public void <A HREF="../../../../../src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html#line.51"><B>injectManagement</B></A>(<A HREF="../../../../../org/apache/maven/model/Model.html" title="class in org.apache.maven.model">Model</A> model,
<A HREF="../../../../../org/apache/maven/model/building/ModelBuildingRequest.html" title="interface in org.apache.maven.model.building">ModelBuildingRequest</A> request,
<A HREF="../../../../../org/apache/maven/model/building/ModelProblemCollector.html" title="interface in org.apache.maven.model.building">ModelProblemCollector</A> problems)</PRE>
<DL>
Modified: websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html (original)
+++ websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.ManagementModelMerger.html Mon May 27 21:08:59 2013
@@ -34,147 +34,109 @@
<FONT color="green">031</FONT> import org.apache.maven.model.PluginContainer;<a name="line.31"></a>
<FONT color="green">032</FONT> import org.apache.maven.model.PluginExecution;<a name="line.32"></a>
<FONT color="green">033</FONT> import org.apache.maven.model.PluginManagement;<a name="line.33"></a>
-<FONT color="green">034</FONT> import org.apache.maven.model.ReportPlugin;<a name="line.34"></a>
-<FONT color="green">035</FONT> import org.apache.maven.model.Reporting;<a name="line.35"></a>
-<FONT color="green">036</FONT> import org.apache.maven.model.building.ModelBuildingRequest;<a name="line.36"></a>
-<FONT color="green">037</FONT> import org.apache.maven.model.building.ModelProblemCollector;<a name="line.37"></a>
-<FONT color="green">038</FONT> import org.apache.maven.model.merge.MavenModelMerger;<a name="line.38"></a>
-<FONT color="green">039</FONT> import org.codehaus.plexus.component.annotations.Component;<a name="line.39"></a>
-<FONT color="green">040</FONT> <a name="line.40"></a>
-<FONT color="green">041</FONT> /**<a name="line.41"></a>
-<FONT color="green">042</FONT> * Handles injection of plugin management into the model.<a name="line.42"></a>
-<FONT color="green">043</FONT> *<a name="line.43"></a>
-<FONT color="green">044</FONT> * @author Benjamin Bentmann<a name="line.44"></a>
-<FONT color="green">045</FONT> */<a name="line.45"></a>
-<FONT color="green">046</FONT> @Component( role = PluginManagementInjector.class )<a name="line.46"></a>
-<FONT color="green">047</FONT> public class DefaultPluginManagementInjector<a name="line.47"></a>
-<FONT color="green">048</FONT> implements PluginManagementInjector<a name="line.48"></a>
-<FONT color="green">049</FONT> {<a name="line.49"></a>
+<FONT color="green">034</FONT> import org.apache.maven.model.building.ModelBuildingRequest;<a name="line.34"></a>
+<FONT color="green">035</FONT> import org.apache.maven.model.building.ModelProblemCollector;<a name="line.35"></a>
+<FONT color="green">036</FONT> import org.apache.maven.model.merge.MavenModelMerger;<a name="line.36"></a>
+<FONT color="green">037</FONT> import org.codehaus.plexus.component.annotations.Component;<a name="line.37"></a>
+<FONT color="green">038</FONT> <a name="line.38"></a>
+<FONT color="green">039</FONT> /**<a name="line.39"></a>
+<FONT color="green">040</FONT> * Handles injection of plugin management into the model.<a name="line.40"></a>
+<FONT color="green">041</FONT> *<a name="line.41"></a>
+<FONT color="green">042</FONT> * @author Benjamin Bentmann<a name="line.42"></a>
+<FONT color="green">043</FONT> */<a name="line.43"></a>
+<FONT color="green">044</FONT> @Component( role = PluginManagementInjector.class )<a name="line.44"></a>
+<FONT color="green">045</FONT> public class DefaultPluginManagementInjector<a name="line.45"></a>
+<FONT color="green">046</FONT> implements PluginManagementInjector<a name="line.46"></a>
+<FONT color="green">047</FONT> {<a name="line.47"></a>
+<FONT color="green">048</FONT> <a name="line.48"></a>
+<FONT color="green">049</FONT> private ManagementModelMerger merger = new ManagementModelMerger();<a name="line.49"></a>
<FONT color="green">050</FONT> <a name="line.50"></a>
-<FONT color="green">051</FONT> private ManagementModelMerger merger = new ManagementModelMerger();<a name="line.51"></a>
-<FONT color="green">052</FONT> <a name="line.52"></a>
-<FONT color="green">053</FONT> public void injectManagement( Model model, ModelBuildingRequest request, ModelProblemCollector problems )<a name="line.53"></a>
-<FONT color="green">054</FONT> {<a name="line.54"></a>
-<FONT color="green">055</FONT> merger.mergeManagedBuildPlugins( model );<a name="line.55"></a>
-<FONT color="green">056</FONT> }<a name="line.56"></a>
-<FONT color="green">057</FONT> <a name="line.57"></a>
-<FONT color="green">058</FONT> protected static class ManagementModelMerger<a name="line.58"></a>
-<FONT color="green">059</FONT> extends MavenModelMerger<a name="line.59"></a>
-<FONT color="green">060</FONT> {<a name="line.60"></a>
-<FONT color="green">061</FONT> <a name="line.61"></a>
-<FONT color="green">062</FONT> public void mergeManagedBuildPlugins( Model model )<a name="line.62"></a>
-<FONT color="green">063</FONT> {<a name="line.63"></a>
-<FONT color="green">064</FONT> Build build = model.getBuild();<a name="line.64"></a>
-<FONT color="green">065</FONT> if ( build != null )<a name="line.65"></a>
-<FONT color="green">066</FONT> {<a name="line.66"></a>
-<FONT color="green">067</FONT> PluginManagement pluginManagement = build.getPluginManagement();<a name="line.67"></a>
-<FONT color="green">068</FONT> if ( pluginManagement != null )<a name="line.68"></a>
-<FONT color="green">069</FONT> {<a name="line.69"></a>
-<FONT color="green">070</FONT> mergePluginContainer_Plugins( build, pluginManagement );<a name="line.70"></a>
-<FONT color="green">071</FONT> }<a name="line.71"></a>
+<FONT color="green">051</FONT> public void injectManagement( Model model, ModelBuildingRequest request, ModelProblemCollector problems )<a name="line.51"></a>
+<FONT color="green">052</FONT> {<a name="line.52"></a>
+<FONT color="green">053</FONT> merger.mergeManagedBuildPlugins( model );<a name="line.53"></a>
+<FONT color="green">054</FONT> }<a name="line.54"></a>
+<FONT color="green">055</FONT> <a name="line.55"></a>
+<FONT color="green">056</FONT> protected static class ManagementModelMerger<a name="line.56"></a>
+<FONT color="green">057</FONT> extends MavenModelMerger<a name="line.57"></a>
+<FONT color="green">058</FONT> {<a name="line.58"></a>
+<FONT color="green">059</FONT> <a name="line.59"></a>
+<FONT color="green">060</FONT> public void mergeManagedBuildPlugins( Model model )<a name="line.60"></a>
+<FONT color="green">061</FONT> {<a name="line.61"></a>
+<FONT color="green">062</FONT> Build build = model.getBuild();<a name="line.62"></a>
+<FONT color="green">063</FONT> if ( build != null )<a name="line.63"></a>
+<FONT color="green">064</FONT> {<a name="line.64"></a>
+<FONT color="green">065</FONT> PluginManagement pluginManagement = build.getPluginManagement();<a name="line.65"></a>
+<FONT color="green">066</FONT> if ( pluginManagement != null )<a name="line.66"></a>
+<FONT color="green">067</FONT> {<a name="line.67"></a>
+<FONT color="green">068</FONT> mergePluginContainer_Plugins( build, pluginManagement );<a name="line.68"></a>
+<FONT color="green">069</FONT> }<a name="line.69"></a>
+<FONT color="green">070</FONT> }<a name="line.70"></a>
+<FONT color="green">071</FONT> }<a name="line.71"></a>
<FONT color="green">072</FONT> <a name="line.72"></a>
-<FONT color="green">073</FONT> mergeReporting_Plugins( model.getReporting(), build );<a name="line.73"></a>
-<FONT color="green">074</FONT> if ( pluginManagement != null )<a name="line.74"></a>
-<FONT color="green">075</FONT> {<a name="line.75"></a>
-<FONT color="green">076</FONT> mergeReporting_Plugins( model.getReporting(), pluginManagement );<a name="line.76"></a>
-<FONT color="green">077</FONT> }<a name="line.77"></a>
-<FONT color="green">078</FONT> }<a name="line.78"></a>
-<FONT color="green">079</FONT> }<a name="line.79"></a>
-<FONT color="green">080</FONT> <a name="line.80"></a>
-<FONT color="green">081</FONT> private void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source )<a name="line.81"></a>
-<FONT color="green">082</FONT> {<a name="line.82"></a>
-<FONT color="green">083</FONT> List<Plugin> src = source.getPlugins();<a name="line.83"></a>
-<FONT color="green">084</FONT> if ( !src.isEmpty() )<a name="line.84"></a>
-<FONT color="green">085</FONT> {<a name="line.85"></a>
-<FONT color="green">086</FONT> List<Plugin> tgt = target.getPlugins();<a name="line.86"></a>
-<FONT color="green">087</FONT> <a name="line.87"></a>
-<FONT color="green">088</FONT> Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object, Plugin>( src.size() * 2 );<a name="line.88"></a>
+<FONT color="green">073</FONT> private void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source )<a name="line.73"></a>
+<FONT color="green">074</FONT> {<a name="line.74"></a>
+<FONT color="green">075</FONT> List<Plugin> src = source.getPlugins();<a name="line.75"></a>
+<FONT color="green">076</FONT> if ( !src.isEmpty() )<a name="line.76"></a>
+<FONT color="green">077</FONT> {<a name="line.77"></a>
+<FONT color="green">078</FONT> List<Plugin> tgt = target.getPlugins();<a name="line.78"></a>
+<FONT color="green">079</FONT> <a name="line.79"></a>
+<FONT color="green">080</FONT> Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object, Plugin>( src.size() * 2 );<a name="line.80"></a>
+<FONT color="green">081</FONT> <a name="line.81"></a>
+<FONT color="green">082</FONT> Map<Object, Object> context = Collections.emptyMap();<a name="line.82"></a>
+<FONT color="green">083</FONT> <a name="line.83"></a>
+<FONT color="green">084</FONT> for ( Plugin element : src )<a name="line.84"></a>
+<FONT color="green">085</FONT> {<a name="line.85"></a>
+<FONT color="green">086</FONT> Object key = getPluginKey( element );<a name="line.86"></a>
+<FONT color="green">087</FONT> managedPlugins.put( key, element );<a name="line.87"></a>
+<FONT color="green">088</FONT> }<a name="line.88"></a>
<FONT color="green">089</FONT> <a name="line.89"></a>
-<FONT color="green">090</FONT> Map<Object, Object> context = Collections.emptyMap();<a name="line.90"></a>
-<FONT color="green">091</FONT> <a name="line.91"></a>
-<FONT color="green">092</FONT> for ( Plugin element : src )<a name="line.92"></a>
-<FONT color="green">093</FONT> {<a name="line.93"></a>
-<FONT color="green">094</FONT> Object key = getPluginKey( element );<a name="line.94"></a>
-<FONT color="green">095</FONT> managedPlugins.put( key, element );<a name="line.95"></a>
-<FONT color="green">096</FONT> }<a name="line.96"></a>
-<FONT color="green">097</FONT> <a name="line.97"></a>
-<FONT color="green">098</FONT> for ( Plugin element : tgt )<a name="line.98"></a>
-<FONT color="green">099</FONT> {<a name="line.99"></a>
-<FONT color="green">100</FONT> Object key = getPluginKey( element );<a name="line.100"></a>
-<FONT color="green">101</FONT> Plugin managedPlugin = managedPlugins.get( key );<a name="line.101"></a>
-<FONT color="green">102</FONT> if ( managedPlugin != null )<a name="line.102"></a>
-<FONT color="green">103</FONT> {<a name="line.103"></a>
-<FONT color="green">104</FONT> mergePlugin( element, managedPlugin, false, context );<a name="line.104"></a>
-<FONT color="green">105</FONT> }<a name="line.105"></a>
-<FONT color="green">106</FONT> }<a name="line.106"></a>
-<FONT color="green">107</FONT> }<a name="line.107"></a>
-<FONT color="green">108</FONT> }<a name="line.108"></a>
-<FONT color="green">109</FONT> <a name="line.109"></a>
-<FONT color="green">110</FONT> @Override<a name="line.110"></a>
-<FONT color="green">111</FONT> protected void mergePlugin_Executions( Plugin target, Plugin source, boolean sourceDominant,<a name="line.111"></a>
-<FONT color="green">112</FONT> Map<Object, Object> context )<a name="line.112"></a>
-<FONT color="green">113</FONT> {<a name="line.113"></a>
-<FONT color="green">114</FONT> List<PluginExecution> src = source.getExecutions();<a name="line.114"></a>
-<FONT color="green">115</FONT> if ( !src.isEmpty() )<a name="line.115"></a>
-<FONT color="green">116</FONT> {<a name="line.116"></a>
-<FONT color="green">117</FONT> List<PluginExecution> tgt = target.getExecutions();<a name="line.117"></a>
-<FONT color="green">118</FONT> <a name="line.118"></a>
-<FONT color="green">119</FONT> Map<Object, PluginExecution> merged =<a name="line.119"></a>
-<FONT color="green">120</FONT> new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 );<a name="line.120"></a>
-<FONT color="green">121</FONT> <a name="line.121"></a>
-<FONT color="green">122</FONT> for ( PluginExecution element : src )<a name="line.122"></a>
-<FONT color="green">123</FONT> {<a name="line.123"></a>
-<FONT color="green">124</FONT> Object key = getPluginExecutionKey( element );<a name="line.124"></a>
-<FONT color="green">125</FONT> merged.put( key, element.clone() );<a name="line.125"></a>
-<FONT color="green">126</FONT> }<a name="line.126"></a>
-<FONT color="green">127</FONT> <a name="line.127"></a>
-<FONT color="green">128</FONT> for ( PluginExecution element : tgt )<a name="line.128"></a>
-<FONT color="green">129</FONT> {<a name="line.129"></a>
-<FONT color="green">130</FONT> Object key = getPluginExecutionKey( element );<a name="line.130"></a>
-<FONT color="green">131</FONT> PluginExecution existing = merged.get( key );<a name="line.131"></a>
-<FONT color="green">132</FONT> if ( existing != null )<a name="line.132"></a>
-<FONT color="green">133</FONT> {<a name="line.133"></a>
-<FONT color="green">134</FONT> mergePluginExecution( element, existing, sourceDominant, context );<a name="line.134"></a>
-<FONT color="green">135</FONT> }<a name="line.135"></a>
-<FONT color="green">136</FONT> merged.put( key, element );<a name="line.136"></a>
-<FONT color="green">137</FONT> }<a name="line.137"></a>
-<FONT color="green">138</FONT> <a name="line.138"></a>
-<FONT color="green">139</FONT> target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) );<a name="line.139"></a>
-<FONT color="green">140</FONT> }<a name="line.140"></a>
-<FONT color="green">141</FONT> }<a name="line.141"></a>
-<FONT color="green">142</FONT> <a name="line.142"></a>
-<FONT color="green">143</FONT> /**<a name="line.143"></a>
-<FONT color="green">144</FONT> * merge plugin version to reporting if report plugin version not set<a name="line.144"></a>
-<FONT color="green">145</FONT> */<a name="line.145"></a>
-<FONT color="green">146</FONT> private void mergeReporting_Plugins( Reporting target, PluginContainer source )<a name="line.146"></a>
-<FONT color="green">147</FONT> {<a name="line.147"></a>
-<FONT color="green">148</FONT> List<Plugin> src = source.getPlugins();<a name="line.148"></a>
-<FONT color="green">149</FONT> if ( !src.isEmpty() )<a name="line.149"></a>
-<FONT color="green">150</FONT> {<a name="line.150"></a>
-<FONT color="green">151</FONT> List<ReportPlugin> tgt = target.getPlugins();<a name="line.151"></a>
-<FONT color="green">152</FONT> <a name="line.152"></a>
-<FONT color="green">153</FONT> Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object, Plugin>( src.size() * 2 );<a name="line.153"></a>
-<FONT color="green">154</FONT> <a name="line.154"></a>
-<FONT color="green">155</FONT> for ( Plugin element : src )<a name="line.155"></a>
-<FONT color="green">156</FONT> {<a name="line.156"></a>
-<FONT color="green">157</FONT> Object key = getPluginKey( element );<a name="line.157"></a>
-<FONT color="green">158</FONT> managedPlugins.put( key, element );<a name="line.158"></a>
-<FONT color="green">159</FONT> }<a name="line.159"></a>
-<FONT color="green">160</FONT> <a name="line.160"></a>
-<FONT color="green">161</FONT> for ( ReportPlugin element : tgt )<a name="line.161"></a>
-<FONT color="green">162</FONT> {<a name="line.162"></a>
-<FONT color="green">163</FONT> Object key = getReportPluginKey( element );<a name="line.163"></a>
-<FONT color="green">164</FONT> Plugin managedPlugin = managedPlugins.get( key );<a name="line.164"></a>
-<FONT color="green">165</FONT> if ( managedPlugin != null && element.getVersion() == null )<a name="line.165"></a>
-<FONT color="green">166</FONT> {<a name="line.166"></a>
-<FONT color="green">167</FONT> element.setVersion( managedPlugin.getVersion() );<a name="line.167"></a>
-<FONT color="green">168</FONT> }<a name="line.168"></a>
-<FONT color="green">169</FONT> }<a name="line.169"></a>
-<FONT color="green">170</FONT> }<a name="line.170"></a>
-<FONT color="green">171</FONT> }<a name="line.171"></a>
-<FONT color="green">172</FONT> }<a name="line.172"></a>
-<FONT color="green">173</FONT> <a name="line.173"></a>
-<FONT color="green">174</FONT> }<a name="line.174"></a>
+<FONT color="green">090</FONT> for ( Plugin element : tgt )<a name="line.90"></a>
+<FONT color="green">091</FONT> {<a name="line.91"></a>
+<FONT color="green">092</FONT> Object key = getPluginKey( element );<a name="line.92"></a>
+<FONT color="green">093</FONT> Plugin managedPlugin = managedPlugins.get( key );<a name="line.93"></a>
+<FONT color="green">094</FONT> if ( managedPlugin != null )<a name="line.94"></a>
+<FONT color="green">095</FONT> {<a name="line.95"></a>
+<FONT color="green">096</FONT> mergePlugin( element, managedPlugin, false, context );<a name="line.96"></a>
+<FONT color="green">097</FONT> }<a name="line.97"></a>
+<FONT color="green">098</FONT> }<a name="line.98"></a>
+<FONT color="green">099</FONT> }<a name="line.99"></a>
+<FONT color="green">100</FONT> }<a name="line.100"></a>
+<FONT color="green">101</FONT> <a name="line.101"></a>
+<FONT color="green">102</FONT> @Override<a name="line.102"></a>
+<FONT color="green">103</FONT> protected void mergePlugin_Executions( Plugin target, Plugin source, boolean sourceDominant,<a name="line.103"></a>
+<FONT color="green">104</FONT> Map<Object, Object> context )<a name="line.104"></a>
+<FONT color="green">105</FONT> {<a name="line.105"></a>
+<FONT color="green">106</FONT> List<PluginExecution> src = source.getExecutions();<a name="line.106"></a>
+<FONT color="green">107</FONT> if ( !src.isEmpty() )<a name="line.107"></a>
+<FONT color="green">108</FONT> {<a name="line.108"></a>
+<FONT color="green">109</FONT> List<PluginExecution> tgt = target.getExecutions();<a name="line.109"></a>
+<FONT color="green">110</FONT> <a name="line.110"></a>
+<FONT color="green">111</FONT> Map<Object, PluginExecution> merged =<a name="line.111"></a>
+<FONT color="green">112</FONT> new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 );<a name="line.112"></a>
+<FONT color="green">113</FONT> <a name="line.113"></a>
+<FONT color="green">114</FONT> for ( PluginExecution element : src )<a name="line.114"></a>
+<FONT color="green">115</FONT> {<a name="line.115"></a>
+<FONT color="green">116</FONT> Object key = getPluginExecutionKey( element );<a name="line.116"></a>
+<FONT color="green">117</FONT> merged.put( key, element.clone() );<a name="line.117"></a>
+<FONT color="green">118</FONT> }<a name="line.118"></a>
+<FONT color="green">119</FONT> <a name="line.119"></a>
+<FONT color="green">120</FONT> for ( PluginExecution element : tgt )<a name="line.120"></a>
+<FONT color="green">121</FONT> {<a name="line.121"></a>
+<FONT color="green">122</FONT> Object key = getPluginExecutionKey( element );<a name="line.122"></a>
+<FONT color="green">123</FONT> PluginExecution existing = merged.get( key );<a name="line.123"></a>
+<FONT color="green">124</FONT> if ( existing != null )<a name="line.124"></a>
+<FONT color="green">125</FONT> {<a name="line.125"></a>
+<FONT color="green">126</FONT> mergePluginExecution( element, existing, sourceDominant, context );<a name="line.126"></a>
+<FONT color="green">127</FONT> }<a name="line.127"></a>
+<FONT color="green">128</FONT> merged.put( key, element );<a name="line.128"></a>
+<FONT color="green">129</FONT> }<a name="line.129"></a>
+<FONT color="green">130</FONT> <a name="line.130"></a>
+<FONT color="green">131</FONT> target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) );<a name="line.131"></a>
+<FONT color="green">132</FONT> }<a name="line.132"></a>
+<FONT color="green">133</FONT> }<a name="line.133"></a>
+<FONT color="green">134</FONT> }<a name="line.134"></a>
+<FONT color="green">135</FONT> <a name="line.135"></a>
+<FONT color="green">136</FONT> }<a name="line.136"></a>
Modified: websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html
==============================================================================
--- websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html (original)
+++ websites/production/maven/content/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/management/DefaultPluginManagementInjector.html Mon May 27 21:08:59 2013
@@ -34,147 +34,109 @@
<FONT color="green">031</FONT> import org.apache.maven.model.PluginContainer;<a name="line.31"></a>
<FONT color="green">032</FONT> import org.apache.maven.model.PluginExecution;<a name="line.32"></a>
<FONT color="green">033</FONT> import org.apache.maven.model.PluginManagement;<a name="line.33"></a>
-<FONT color="green">034</FONT> import org.apache.maven.model.ReportPlugin;<a name="line.34"></a>
-<FONT color="green">035</FONT> import org.apache.maven.model.Reporting;<a name="line.35"></a>
-<FONT color="green">036</FONT> import org.apache.maven.model.building.ModelBuildingRequest;<a name="line.36"></a>
-<FONT color="green">037</FONT> import org.apache.maven.model.building.ModelProblemCollector;<a name="line.37"></a>
-<FONT color="green">038</FONT> import org.apache.maven.model.merge.MavenModelMerger;<a name="line.38"></a>
-<FONT color="green">039</FONT> import org.codehaus.plexus.component.annotations.Component;<a name="line.39"></a>
-<FONT color="green">040</FONT> <a name="line.40"></a>
-<FONT color="green">041</FONT> /**<a name="line.41"></a>
-<FONT color="green">042</FONT> * Handles injection of plugin management into the model.<a name="line.42"></a>
-<FONT color="green">043</FONT> *<a name="line.43"></a>
-<FONT color="green">044</FONT> * @author Benjamin Bentmann<a name="line.44"></a>
-<FONT color="green">045</FONT> */<a name="line.45"></a>
-<FONT color="green">046</FONT> @Component( role = PluginManagementInjector.class )<a name="line.46"></a>
-<FONT color="green">047</FONT> public class DefaultPluginManagementInjector<a name="line.47"></a>
-<FONT color="green">048</FONT> implements PluginManagementInjector<a name="line.48"></a>
-<FONT color="green">049</FONT> {<a name="line.49"></a>
+<FONT color="green">034</FONT> import org.apache.maven.model.building.ModelBuildingRequest;<a name="line.34"></a>
+<FONT color="green">035</FONT> import org.apache.maven.model.building.ModelProblemCollector;<a name="line.35"></a>
+<FONT color="green">036</FONT> import org.apache.maven.model.merge.MavenModelMerger;<a name="line.36"></a>
+<FONT color="green">037</FONT> import org.codehaus.plexus.component.annotations.Component;<a name="line.37"></a>
+<FONT color="green">038</FONT> <a name="line.38"></a>
+<FONT color="green">039</FONT> /**<a name="line.39"></a>
+<FONT color="green">040</FONT> * Handles injection of plugin management into the model.<a name="line.40"></a>
+<FONT color="green">041</FONT> *<a name="line.41"></a>
+<FONT color="green">042</FONT> * @author Benjamin Bentmann<a name="line.42"></a>
+<FONT color="green">043</FONT> */<a name="line.43"></a>
+<FONT color="green">044</FONT> @Component( role = PluginManagementInjector.class )<a name="line.44"></a>
+<FONT color="green">045</FONT> public class DefaultPluginManagementInjector<a name="line.45"></a>
+<FONT color="green">046</FONT> implements PluginManagementInjector<a name="line.46"></a>
+<FONT color="green">047</FONT> {<a name="line.47"></a>
+<FONT color="green">048</FONT> <a name="line.48"></a>
+<FONT color="green">049</FONT> private ManagementModelMerger merger = new ManagementModelMerger();<a name="line.49"></a>
<FONT color="green">050</FONT> <a name="line.50"></a>
-<FONT color="green">051</FONT> private ManagementModelMerger merger = new ManagementModelMerger();<a name="line.51"></a>
-<FONT color="green">052</FONT> <a name="line.52"></a>
-<FONT color="green">053</FONT> public void injectManagement( Model model, ModelBuildingRequest request, ModelProblemCollector problems )<a name="line.53"></a>
-<FONT color="green">054</FONT> {<a name="line.54"></a>
-<FONT color="green">055</FONT> merger.mergeManagedBuildPlugins( model );<a name="line.55"></a>
-<FONT color="green">056</FONT> }<a name="line.56"></a>
-<FONT color="green">057</FONT> <a name="line.57"></a>
-<FONT color="green">058</FONT> protected static class ManagementModelMerger<a name="line.58"></a>
-<FONT color="green">059</FONT> extends MavenModelMerger<a name="line.59"></a>
-<FONT color="green">060</FONT> {<a name="line.60"></a>
-<FONT color="green">061</FONT> <a name="line.61"></a>
-<FONT color="green">062</FONT> public void mergeManagedBuildPlugins( Model model )<a name="line.62"></a>
-<FONT color="green">063</FONT> {<a name="line.63"></a>
-<FONT color="green">064</FONT> Build build = model.getBuild();<a name="line.64"></a>
-<FONT color="green">065</FONT> if ( build != null )<a name="line.65"></a>
-<FONT color="green">066</FONT> {<a name="line.66"></a>
-<FONT color="green">067</FONT> PluginManagement pluginManagement = build.getPluginManagement();<a name="line.67"></a>
-<FONT color="green">068</FONT> if ( pluginManagement != null )<a name="line.68"></a>
-<FONT color="green">069</FONT> {<a name="line.69"></a>
-<FONT color="green">070</FONT> mergePluginContainer_Plugins( build, pluginManagement );<a name="line.70"></a>
-<FONT color="green">071</FONT> }<a name="line.71"></a>
+<FONT color="green">051</FONT> public void injectManagement( Model model, ModelBuildingRequest request, ModelProblemCollector problems )<a name="line.51"></a>
+<FONT color="green">052</FONT> {<a name="line.52"></a>
+<FONT color="green">053</FONT> merger.mergeManagedBuildPlugins( model );<a name="line.53"></a>
+<FONT color="green">054</FONT> }<a name="line.54"></a>
+<FONT color="green">055</FONT> <a name="line.55"></a>
+<FONT color="green">056</FONT> protected static class ManagementModelMerger<a name="line.56"></a>
+<FONT color="green">057</FONT> extends MavenModelMerger<a name="line.57"></a>
+<FONT color="green">058</FONT> {<a name="line.58"></a>
+<FONT color="green">059</FONT> <a name="line.59"></a>
+<FONT color="green">060</FONT> public void mergeManagedBuildPlugins( Model model )<a name="line.60"></a>
+<FONT color="green">061</FONT> {<a name="line.61"></a>
+<FONT color="green">062</FONT> Build build = model.getBuild();<a name="line.62"></a>
+<FONT color="green">063</FONT> if ( build != null )<a name="line.63"></a>
+<FONT color="green">064</FONT> {<a name="line.64"></a>
+<FONT color="green">065</FONT> PluginManagement pluginManagement = build.getPluginManagement();<a name="line.65"></a>
+<FONT color="green">066</FONT> if ( pluginManagement != null )<a name="line.66"></a>
+<FONT color="green">067</FONT> {<a name="line.67"></a>
+<FONT color="green">068</FONT> mergePluginContainer_Plugins( build, pluginManagement );<a name="line.68"></a>
+<FONT color="green">069</FONT> }<a name="line.69"></a>
+<FONT color="green">070</FONT> }<a name="line.70"></a>
+<FONT color="green">071</FONT> }<a name="line.71"></a>
<FONT color="green">072</FONT> <a name="line.72"></a>
-<FONT color="green">073</FONT> mergeReporting_Plugins( model.getReporting(), build );<a name="line.73"></a>
-<FONT color="green">074</FONT> if ( pluginManagement != null )<a name="line.74"></a>
-<FONT color="green">075</FONT> {<a name="line.75"></a>
-<FONT color="green">076</FONT> mergeReporting_Plugins( model.getReporting(), pluginManagement );<a name="line.76"></a>
-<FONT color="green">077</FONT> }<a name="line.77"></a>
-<FONT color="green">078</FONT> }<a name="line.78"></a>
-<FONT color="green">079</FONT> }<a name="line.79"></a>
-<FONT color="green">080</FONT> <a name="line.80"></a>
-<FONT color="green">081</FONT> private void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source )<a name="line.81"></a>
-<FONT color="green">082</FONT> {<a name="line.82"></a>
-<FONT color="green">083</FONT> List<Plugin> src = source.getPlugins();<a name="line.83"></a>
-<FONT color="green">084</FONT> if ( !src.isEmpty() )<a name="line.84"></a>
-<FONT color="green">085</FONT> {<a name="line.85"></a>
-<FONT color="green">086</FONT> List<Plugin> tgt = target.getPlugins();<a name="line.86"></a>
-<FONT color="green">087</FONT> <a name="line.87"></a>
-<FONT color="green">088</FONT> Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object, Plugin>( src.size() * 2 );<a name="line.88"></a>
+<FONT color="green">073</FONT> private void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source )<a name="line.73"></a>
+<FONT color="green">074</FONT> {<a name="line.74"></a>
+<FONT color="green">075</FONT> List<Plugin> src = source.getPlugins();<a name="line.75"></a>
+<FONT color="green">076</FONT> if ( !src.isEmpty() )<a name="line.76"></a>
+<FONT color="green">077</FONT> {<a name="line.77"></a>
+<FONT color="green">078</FONT> List<Plugin> tgt = target.getPlugins();<a name="line.78"></a>
+<FONT color="green">079</FONT> <a name="line.79"></a>
+<FONT color="green">080</FONT> Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object, Plugin>( src.size() * 2 );<a name="line.80"></a>
+<FONT color="green">081</FONT> <a name="line.81"></a>
+<FONT color="green">082</FONT> Map<Object, Object> context = Collections.emptyMap();<a name="line.82"></a>
+<FONT color="green">083</FONT> <a name="line.83"></a>
+<FONT color="green">084</FONT> for ( Plugin element : src )<a name="line.84"></a>
+<FONT color="green">085</FONT> {<a name="line.85"></a>
+<FONT color="green">086</FONT> Object key = getPluginKey( element );<a name="line.86"></a>
+<FONT color="green">087</FONT> managedPlugins.put( key, element );<a name="line.87"></a>
+<FONT color="green">088</FONT> }<a name="line.88"></a>
<FONT color="green">089</FONT> <a name="line.89"></a>
-<FONT color="green">090</FONT> Map<Object, Object> context = Collections.emptyMap();<a name="line.90"></a>
-<FONT color="green">091</FONT> <a name="line.91"></a>
-<FONT color="green">092</FONT> for ( Plugin element : src )<a name="line.92"></a>
-<FONT color="green">093</FONT> {<a name="line.93"></a>
-<FONT color="green">094</FONT> Object key = getPluginKey( element );<a name="line.94"></a>
-<FONT color="green">095</FONT> managedPlugins.put( key, element );<a name="line.95"></a>
-<FONT color="green">096</FONT> }<a name="line.96"></a>
-<FONT color="green">097</FONT> <a name="line.97"></a>
-<FONT color="green">098</FONT> for ( Plugin element : tgt )<a name="line.98"></a>
-<FONT color="green">099</FONT> {<a name="line.99"></a>
-<FONT color="green">100</FONT> Object key = getPluginKey( element );<a name="line.100"></a>
-<FONT color="green">101</FONT> Plugin managedPlugin = managedPlugins.get( key );<a name="line.101"></a>
-<FONT color="green">102</FONT> if ( managedPlugin != null )<a name="line.102"></a>
-<FONT color="green">103</FONT> {<a name="line.103"></a>
-<FONT color="green">104</FONT> mergePlugin( element, managedPlugin, false, context );<a name="line.104"></a>
-<FONT color="green">105</FONT> }<a name="line.105"></a>
-<FONT color="green">106</FONT> }<a name="line.106"></a>
-<FONT color="green">107</FONT> }<a name="line.107"></a>
-<FONT color="green">108</FONT> }<a name="line.108"></a>
-<FONT color="green">109</FONT> <a name="line.109"></a>
-<FONT color="green">110</FONT> @Override<a name="line.110"></a>
-<FONT color="green">111</FONT> protected void mergePlugin_Executions( Plugin target, Plugin source, boolean sourceDominant,<a name="line.111"></a>
-<FONT color="green">112</FONT> Map<Object, Object> context )<a name="line.112"></a>
-<FONT color="green">113</FONT> {<a name="line.113"></a>
-<FONT color="green">114</FONT> List<PluginExecution> src = source.getExecutions();<a name="line.114"></a>
-<FONT color="green">115</FONT> if ( !src.isEmpty() )<a name="line.115"></a>
-<FONT color="green">116</FONT> {<a name="line.116"></a>
-<FONT color="green">117</FONT> List<PluginExecution> tgt = target.getExecutions();<a name="line.117"></a>
-<FONT color="green">118</FONT> <a name="line.118"></a>
-<FONT color="green">119</FONT> Map<Object, PluginExecution> merged =<a name="line.119"></a>
-<FONT color="green">120</FONT> new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 );<a name="line.120"></a>
-<FONT color="green">121</FONT> <a name="line.121"></a>
-<FONT color="green">122</FONT> for ( PluginExecution element : src )<a name="line.122"></a>
-<FONT color="green">123</FONT> {<a name="line.123"></a>
-<FONT color="green">124</FONT> Object key = getPluginExecutionKey( element );<a name="line.124"></a>
-<FONT color="green">125</FONT> merged.put( key, element.clone() );<a name="line.125"></a>
-<FONT color="green">126</FONT> }<a name="line.126"></a>
-<FONT color="green">127</FONT> <a name="line.127"></a>
-<FONT color="green">128</FONT> for ( PluginExecution element : tgt )<a name="line.128"></a>
-<FONT color="green">129</FONT> {<a name="line.129"></a>
-<FONT color="green">130</FONT> Object key = getPluginExecutionKey( element );<a name="line.130"></a>
-<FONT color="green">131</FONT> PluginExecution existing = merged.get( key );<a name="line.131"></a>
-<FONT color="green">132</FONT> if ( existing != null )<a name="line.132"></a>
-<FONT color="green">133</FONT> {<a name="line.133"></a>
-<FONT color="green">134</FONT> mergePluginExecution( element, existing, sourceDominant, context );<a name="line.134"></a>
-<FONT color="green">135</FONT> }<a name="line.135"></a>
-<FONT color="green">136</FONT> merged.put( key, element );<a name="line.136"></a>
-<FONT color="green">137</FONT> }<a name="line.137"></a>
-<FONT color="green">138</FONT> <a name="line.138"></a>
-<FONT color="green">139</FONT> target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) );<a name="line.139"></a>
-<FONT color="green">140</FONT> }<a name="line.140"></a>
-<FONT color="green">141</FONT> }<a name="line.141"></a>
-<FONT color="green">142</FONT> <a name="line.142"></a>
-<FONT color="green">143</FONT> /**<a name="line.143"></a>
-<FONT color="green">144</FONT> * merge plugin version to reporting if report plugin version not set<a name="line.144"></a>
-<FONT color="green">145</FONT> */<a name="line.145"></a>
-<FONT color="green">146</FONT> private void mergeReporting_Plugins( Reporting target, PluginContainer source )<a name="line.146"></a>
-<FONT color="green">147</FONT> {<a name="line.147"></a>
-<FONT color="green">148</FONT> List<Plugin> src = source.getPlugins();<a name="line.148"></a>
-<FONT color="green">149</FONT> if ( !src.isEmpty() )<a name="line.149"></a>
-<FONT color="green">150</FONT> {<a name="line.150"></a>
-<FONT color="green">151</FONT> List<ReportPlugin> tgt = target.getPlugins();<a name="line.151"></a>
-<FONT color="green">152</FONT> <a name="line.152"></a>
-<FONT color="green">153</FONT> Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object, Plugin>( src.size() * 2 );<a name="line.153"></a>
-<FONT color="green">154</FONT> <a name="line.154"></a>
-<FONT color="green">155</FONT> for ( Plugin element : src )<a name="line.155"></a>
-<FONT color="green">156</FONT> {<a name="line.156"></a>
-<FONT color="green">157</FONT> Object key = getPluginKey( element );<a name="line.157"></a>
-<FONT color="green">158</FONT> managedPlugins.put( key, element );<a name="line.158"></a>
-<FONT color="green">159</FONT> }<a name="line.159"></a>
-<FONT color="green">160</FONT> <a name="line.160"></a>
-<FONT color="green">161</FONT> for ( ReportPlugin element : tgt )<a name="line.161"></a>
-<FONT color="green">162</FONT> {<a name="line.162"></a>
-<FONT color="green">163</FONT> Object key = getReportPluginKey( element );<a name="line.163"></a>
-<FONT color="green">164</FONT> Plugin managedPlugin = managedPlugins.get( key );<a name="line.164"></a>
-<FONT color="green">165</FONT> if ( managedPlugin != null && element.getVersion() == null )<a name="line.165"></a>
-<FONT color="green">166</FONT> {<a name="line.166"></a>
-<FONT color="green">167</FONT> element.setVersion( managedPlugin.getVersion() );<a name="line.167"></a>
-<FONT color="green">168</FONT> }<a name="line.168"></a>
-<FONT color="green">169</FONT> }<a name="line.169"></a>
-<FONT color="green">170</FONT> }<a name="line.170"></a>
-<FONT color="green">171</FONT> }<a name="line.171"></a>
-<FONT color="green">172</FONT> }<a name="line.172"></a>
-<FONT color="green">173</FONT> <a name="line.173"></a>
-<FONT color="green">174</FONT> }<a name="line.174"></a>
+<FONT color="green">090</FONT> for ( Plugin element : tgt )<a name="line.90"></a>
+<FONT color="green">091</FONT> {<a name="line.91"></a>
+<FONT color="green">092</FONT> Object key = getPluginKey( element );<a name="line.92"></a>
+<FONT color="green">093</FONT> Plugin managedPlugin = managedPlugins.get( key );<a name="line.93"></a>
+<FONT color="green">094</FONT> if ( managedPlugin != null )<a name="line.94"></a>
+<FONT color="green">095</FONT> {<a name="line.95"></a>
+<FONT color="green">096</FONT> mergePlugin( element, managedPlugin, false, context );<a name="line.96"></a>
+<FONT color="green">097</FONT> }<a name="line.97"></a>
+<FONT color="green">098</FONT> }<a name="line.98"></a>
+<FONT color="green">099</FONT> }<a name="line.99"></a>
+<FONT color="green">100</FONT> }<a name="line.100"></a>
+<FONT color="green">101</FONT> <a name="line.101"></a>
+<FONT color="green">102</FONT> @Override<a name="line.102"></a>
+<FONT color="green">103</FONT> protected void mergePlugin_Executions( Plugin target, Plugin source, boolean sourceDominant,<a name="line.103"></a>
+<FONT color="green">104</FONT> Map<Object, Object> context )<a name="line.104"></a>
+<FONT color="green">105</FONT> {<a name="line.105"></a>
+<FONT color="green">106</FONT> List<PluginExecution> src = source.getExecutions();<a name="line.106"></a>
+<FONT color="green">107</FONT> if ( !src.isEmpty() )<a name="line.107"></a>
+<FONT color="green">108</FONT> {<a name="line.108"></a>
+<FONT color="green">109</FONT> List<PluginExecution> tgt = target.getExecutions();<a name="line.109"></a>
+<FONT color="green">110</FONT> <a name="line.110"></a>
+<FONT color="green">111</FONT> Map<Object, PluginExecution> merged =<a name="line.111"></a>
+<FONT color="green">112</FONT> new LinkedHashMap<Object, PluginExecution>( ( src.size() + tgt.size() ) * 2 );<a name="line.112"></a>
+<FONT color="green">113</FONT> <a name="line.113"></a>
+<FONT color="green">114</FONT> for ( PluginExecution element : src )<a name="line.114"></a>
+<FONT color="green">115</FONT> {<a name="line.115"></a>
+<FONT color="green">116</FONT> Object key = getPluginExecutionKey( element );<a name="line.116"></a>
+<FONT color="green">117</FONT> merged.put( key, element.clone() );<a name="line.117"></a>
+<FONT color="green">118</FONT> }<a name="line.118"></a>
+<FONT color="green">119</FONT> <a name="line.119"></a>
+<FONT color="green">120</FONT> for ( PluginExecution element : tgt )<a name="line.120"></a>
+<FONT color="green">121</FONT> {<a name="line.121"></a>
+<FONT color="green">122</FONT> Object key = getPluginExecutionKey( element );<a name="line.122"></a>
+<FONT color="green">123</FONT> PluginExecution existing = merged.get( key );<a name="line.123"></a>
+<FONT color="green">124</FONT> if ( existing != null )<a name="line.124"></a>
+<FONT color="green">125</FONT> {<a name="line.125"></a>
+<FONT color="green">126</FONT> mergePluginExecution( element, existing, sourceDominant, context );<a name="line.126"></a>
+<FONT color="green">127</FONT> }<a name="line.127"></a>
+<FONT color="green">128</FONT> merged.put( key, element );<a name="line.128"></a>
+<FONT color="green">129</FONT> }<a name="line.129"></a>
+<FONT color="green">130</FONT> <a name="line.130"></a>
+<FONT color="green">131</FONT> target.setExecutions( new ArrayList<PluginExecution>( merged.values() ) );<a name="line.131"></a>
+<FONT color="green">132</FONT> }<a name="line.132"></a>
+<FONT color="green">133</FONT> }<a name="line.133"></a>
+<FONT color="green">134</FONT> }<a name="line.134"></a>
+<FONT color="green">135</FONT> <a name="line.135"></a>
+<FONT color="green">136</FONT> }<a name="line.136"></a>