Modified: websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html ============================================================================== --- websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html (original) +++ websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html Tue Sep 20 21:29:09 2016 @@ -35,225 +35,239 @@ <a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.Dependency; <a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.DependencyManagement; <a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.Exclusion; -<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.Model; -<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelBuildingRequest; -<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelProblem; -<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelProblemCollector; -<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelProblemCollectorRequest; -<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Component; -<a class="jxr_linenumber" name="L36" href="#L36">36</a> -<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * Handles the import of dependency management from other models into the target model.</em> -<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> *</em> -<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> * @author Benjamin Bentmann</em> -<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment"> */</em> -<a class="jxr_linenumber" name="L42" href="#L42">42</a> @Component( role = DependencyManagementImporter.<strong class="jxr_keyword">class</strong> ) -<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/model/composition/DefaultDependencyManagementImporter.html">DefaultDependencyManagementImporter</a> -<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/maven/model/composition/DependencyManagementImporter.html">DependencyManagementImporter</a> -<a class="jxr_linenumber" name="L45" href="#L45">45</a> { -<a class="jxr_linenumber" name="L46" href="#L46">46</a> -<a class="jxr_linenumber" name="L47" href="#L47">47</a> @Override -<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> importManagement( <strong class="jxr_keyword">final</strong> Model target, <strong class="jxr_keyword">final</strong> List<? <strong class="jxr_keyword">extends</strong> DependencyManagement> sources, -<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/building/ModelBuildingRequest.html">ModelBuildingRequest</a> request, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/building/ModelProblemCollector.html">ModelProblemCollector</a> problems ) -<a class="jxr_linenumber" name="L50" href="#L50">50</a> { -<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">if</strong> ( sources != <strong class="jxr_keyword">null</strong> && !sources.isEmpty() ) -<a class="jxr_linenumber" name="L52" href="#L52">52</a> { -<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">final</strong> Map<String, Dependency> targetDependencies = <strong class="jxr_keyword">new</strong> LinkedHashMap<>(); -<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/DependencyManagement.html">DependencyManagement</a> targetDependencyManagement = target.getDependencyManagement() != <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L55" href="#L55">55</a> ? target.getDependencyManagement() -<a class="jxr_linenumber" name="L56" href="#L56">56</a> : <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/model/DependencyManagement.html">DependencyManagement</a>(); -<a class="jxr_linenumber" name="L57" href="#L57">57</a> -<a class="jxr_linenumber" name="L58" href="#L58">58</a> target.setDependencyManagement( targetDependencyManagement ); +<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.InputLocation; +<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.InputSource; +<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.Model; +<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelBuildingRequest; +<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelProblem; +<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelProblemCollector; +<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> org.apache.maven.model.building.ModelProblemCollectorRequest; +<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Component; +<a class="jxr_linenumber" name="L38" href="#L38">38</a> +<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment">/**</em> +<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> * Handles the import of dependency management from other models into the target model.</em> +<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment"> *</em> +<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * @author Benjamin Bentmann</em> +<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment"> */</em> +<a class="jxr_linenumber" name="L44" href="#L44">44</a> @Component( role = DependencyManagementImporter.<strong class="jxr_keyword">class</strong> ) +<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/model/composition/DefaultDependencyManagementImporter.html">DefaultDependencyManagementImporter</a> +<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../org/apache/maven/model/composition/DependencyManagementImporter.html">DependencyManagementImporter</a> +<a class="jxr_linenumber" name="L47" href="#L47">47</a> { +<a class="jxr_linenumber" name="L48" href="#L48">48</a> +<a class="jxr_linenumber" name="L49" href="#L49">49</a> @Override +<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> importManagement( <strong class="jxr_keyword">final</strong> Model target, <strong class="jxr_keyword">final</strong> List<? <strong class="jxr_keyword">extends</strong> DependencyManagement> sources, +<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/building/ModelBuildingRequest.html">ModelBuildingRequest</a> request, <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/building/ModelProblemCollector.html">ModelProblemCollector</a> problems ) +<a class="jxr_linenumber" name="L52" href="#L52">52</a> { +<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">if</strong> ( sources != <strong class="jxr_keyword">null</strong> && !sources.isEmpty() ) +<a class="jxr_linenumber" name="L54" href="#L54">54</a> { +<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">final</strong> Map<String, Dependency> targetDependencies = <strong class="jxr_keyword">new</strong> LinkedHashMap<>(); +<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/DependencyManagement.html">DependencyManagement</a> targetDependencyManagement = target.getDependencyManagement() != <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L57" href="#L57">57</a> ? target.getDependencyManagement() +<a class="jxr_linenumber" name="L58" href="#L58">58</a> : <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/model/DependencyManagement.html">DependencyManagement</a>(); <a class="jxr_linenumber" name="L59" href="#L59">59</a> -<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Dependency targetDependency : targetDependencyManagement.getDependencies() ) -<a class="jxr_linenumber" name="L61" href="#L61">61</a> { -<a class="jxr_linenumber" name="L62" href="#L62">62</a> targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); -<a class="jxr_linenumber" name="L63" href="#L63">63</a> } -<a class="jxr_linenumber" name="L64" href="#L64">64</a> -<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong class="jxr_keyword">final</strong> Map<String, List<Dependency>> sourceDependencies = <strong class="jxr_keyword">new</strong> LinkedHashMap<>(); +<a class="jxr_linenumber" name="L60" href="#L60">60</a> target.setDependencyManagement( targetDependencyManagement ); +<a class="jxr_linenumber" name="L61" href="#L61">61</a> +<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Dependency targetDependency : targetDependencyManagement.getDependencies() ) +<a class="jxr_linenumber" name="L63" href="#L63">63</a> { +<a class="jxr_linenumber" name="L64" href="#L64">64</a> targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); +<a class="jxr_linenumber" name="L65" href="#L65">65</a> } <a class="jxr_linenumber" name="L66" href="#L66">66</a> -<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> DependencyManagement source : sources ) -<a class="jxr_linenumber" name="L68" href="#L68">68</a> { -<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Dependency sourceDependency : source.getDependencies() ) -<a class="jxr_linenumber" name="L70" href="#L70">70</a> { -<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">if</strong> ( !targetDependencies.containsKey( sourceDependency.getManagementKey() ) ) -<a class="jxr_linenumber" name="L72" href="#L72">72</a> { -<a class="jxr_linenumber" name="L73" href="#L73">73</a> List<Dependency> conflictCanditates = -<a class="jxr_linenumber" name="L74" href="#L74">74</a> sourceDependencies.get( sourceDependency.getManagementKey() ); -<a class="jxr_linenumber" name="L75" href="#L75">75</a> -<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">if</strong> ( conflictCanditates == <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L77" href="#L77">77</a> { -<a class="jxr_linenumber" name="L78" href="#L78">78</a> conflictCanditates = <strong class="jxr_keyword">new</strong> ArrayList<>( source.getDependencies().size() ); -<a class="jxr_linenumber" name="L79" href="#L79">79</a> sourceDependencies.put( sourceDependency.getManagementKey(), conflictCanditates ); -<a class="jxr_linenumber" name="L80" href="#L80">80</a> } -<a class="jxr_linenumber" name="L81" href="#L81">81</a> -<a class="jxr_linenumber" name="L82" href="#L82">82</a> conflictCanditates.add( sourceDependency ); -<a class="jxr_linenumber" name="L83" href="#L83">83</a> } -<a class="jxr_linenumber" name="L84" href="#L84">84</a> } -<a class="jxr_linenumber" name="L85" href="#L85">85</a> } -<a class="jxr_linenumber" name="L86" href="#L86">86</a> -<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> List<Dependency> conflictCanditates : sourceDependencies.values() ) -<a class="jxr_linenumber" name="L88" href="#L88">88</a> { -<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">final</strong> List<Dependency> conflictingDependencies = removeRedundantDependencies( conflictCanditates ); -<a class="jxr_linenumber" name="L90" href="#L90">90</a> -<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em class="jxr_comment">// First declaration wins. This is what makes the conflict resolution indeterministic because this</em> -<a class="jxr_linenumber" name="L92" href="#L92">92</a> <em class="jxr_comment">// solely relies on the order of declaration. There is no such thing as the "first" declaration.</em> -<a class="jxr_linenumber" name="L93" href="#L93">93</a> targetDependencyManagement.getDependencies().add( conflictingDependencies.get( 0 ) ); -<a class="jxr_linenumber" name="L94" href="#L94">94</a> -<a class="jxr_linenumber" name="L95" href="#L95">95</a> <em class="jxr_comment">// As of Maven 3.4, we print a warning about such conflicting imports.</em> -<a class="jxr_linenumber" name="L96" href="#L96">96</a> <em class="jxr_comment">// As of Maven 3.5, those warnings will become errors.</em> -<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">if</strong> ( conflictingDependencies.size() > 1 ) -<a class="jxr_linenumber" name="L98" href="#L98">98</a> { -<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">final</strong> StringBuilder conflictsBuilder = <strong class="jxr_keyword">new</strong> StringBuilder( conflictingDependencies.size() * 128 ); -<a class="jxr_linenumber" name="L100" href="#L100">100</a> -<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Dependency dependency : conflictingDependencies ) -<a class="jxr_linenumber" name="L102" href="#L102">102</a> { -<a class="jxr_linenumber" name="L103" href="#L103">103</a> conflictsBuilder.append( <span class="jxr_string">", '"</span> ).append( dependency.getLocation( <span class="jxr_string">""</span> ) ).append( '\'' ); -<a class="jxr_linenumber" name="L104" href="#L104">104</a> } -<a class="jxr_linenumber" name="L105" href="#L105">105</a> -<a class="jxr_linenumber" name="L106" href="#L106">106</a> problems.add( <strong class="jxr_keyword">new</strong> ModelProblemCollectorRequest( -<a class="jxr_linenumber" name="L107" href="#L107">107</a> effectiveSeverity( request.getValidationLevel(), -<a class="jxr_linenumber" name="L108" href="#L108">108</a> ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_5 ), -<a class="jxr_linenumber" name="L109" href="#L109">109</a> ModelProblem.Version.V20 ). -<a class="jxr_linenumber" name="L110" href="#L110">110</a> setMessage( String.format( -<a class="jxr_linenumber" name="L111" href="#L111">111</a> <span class="jxr_string">"Multiple conflicting imports of dependency '%1$s' into model '%2$s'%3$s(%4$s). "</span> -<a class="jxr_linenumber" name="L112" href="#L112">112</a> + <span class="jxr_string">"To resolve this conflict, either declare the dependency directly "</span> -<a class="jxr_linenumber" name="L113" href="#L113">113</a> + <span class="jxr_string">"in the dependency management of model '%2$s' to override what gets imported "</span> -<a class="jxr_linenumber" name="L114" href="#L114">114</a> + <span class="jxr_string">"or, as of model version 4.1.0, rearrange the causing imports in the inheritance "</span> -<a class="jxr_linenumber" name="L115" href="#L115">115</a> + <span class="jxr_string">"hierarchy to apply standard override logic based on artifact coordinates. "</span> -<a class="jxr_linenumber" name="L116" href="#L116">116</a> + <span class="jxr_string">"Without resolving this conflict, your build relies on indeterministic "</span> -<a class="jxr_linenumber" name="L117" href="#L117">117</a> + <span class="jxr_string">"behaviour."</span>, -<a class="jxr_linenumber" name="L118" href="#L118">118</a> conflictingDependencies.get( 0 ).getManagementKey(), target.getId(), -<a class="jxr_linenumber" name="L119" href="#L119">119</a> target.getPomFile() != <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L120" href="#L120">120</a> ? <span class="jxr_string">" @ '"</span> + target.getPomFile().getAbsolutePath() + <span class="jxr_string">"' "</span> -<a class="jxr_linenumber" name="L121" href="#L121">121</a> : <span class="jxr_string">" "</span>, conflictsBuilder.substring( 2 ) ) ) ); -<a class="jxr_linenumber" name="L122" href="#L122">122</a> -<a class="jxr_linenumber" name="L123" href="#L123">123</a> } -<a class="jxr_linenumber" name="L124" href="#L124">124</a> } -<a class="jxr_linenumber" name="L125" href="#L125">125</a> } -<a class="jxr_linenumber" name="L126" href="#L126">126</a> } -<a class="jxr_linenumber" name="L127" href="#L127">127</a> -<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> List<Dependency> removeRedundantDependencies( <strong class="jxr_keyword">final</strong> List<Dependency> candidateDependencies ) -<a class="jxr_linenumber" name="L129" href="#L129">129</a> { -<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">final</strong> List<Dependency> resultDependencies = <strong class="jxr_keyword">new</strong> ArrayList<>( candidateDependencies.size() ); -<a class="jxr_linenumber" name="L131" href="#L131">131</a> -<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">while</strong> ( !candidateDependencies.isEmpty() ) -<a class="jxr_linenumber" name="L133" href="#L133">133</a> { -<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Dependency.html">Dependency</a> resultDependency = candidateDependencies.remove( 0 ); -<a class="jxr_linenumber" name="L135" href="#L135">135</a> resultDependencies.add( resultDependency ); +<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">final</strong> Map<String, List<Dependency>> sourceDependencies = <strong class="jxr_keyword">new</strong> LinkedHashMap<>(); +<a class="jxr_linenumber" name="L68" href="#L68">68</a> +<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> DependencyManagement source : sources ) +<a class="jxr_linenumber" name="L70" href="#L70">70</a> { +<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Dependency sourceDependency : source.getDependencies() ) +<a class="jxr_linenumber" name="L72" href="#L72">72</a> { +<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">if</strong> ( !targetDependencies.containsKey( sourceDependency.getManagementKey() ) ) +<a class="jxr_linenumber" name="L74" href="#L74">74</a> { +<a class="jxr_linenumber" name="L75" href="#L75">75</a> List<Dependency> conflictCanditates = +<a class="jxr_linenumber" name="L76" href="#L76">76</a> sourceDependencies.get( sourceDependency.getManagementKey() ); +<a class="jxr_linenumber" name="L77" href="#L77">77</a> +<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">if</strong> ( conflictCanditates == <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L79" href="#L79">79</a> { +<a class="jxr_linenumber" name="L80" href="#L80">80</a> conflictCanditates = <strong class="jxr_keyword">new</strong> ArrayList<>( source.getDependencies().size() ); +<a class="jxr_linenumber" name="L81" href="#L81">81</a> sourceDependencies.put( sourceDependency.getManagementKey(), conflictCanditates ); +<a class="jxr_linenumber" name="L82" href="#L82">82</a> } +<a class="jxr_linenumber" name="L83" href="#L83">83</a> +<a class="jxr_linenumber" name="L84" href="#L84">84</a> conflictCanditates.add( sourceDependency ); +<a class="jxr_linenumber" name="L85" href="#L85">85</a> } +<a class="jxr_linenumber" name="L86" href="#L86">86</a> } +<a class="jxr_linenumber" name="L87" href="#L87">87</a> } +<a class="jxr_linenumber" name="L88" href="#L88">88</a> +<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> List<Dependency> conflictCanditates : sourceDependencies.values() ) +<a class="jxr_linenumber" name="L90" href="#L90">90</a> { +<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">final</strong> List<Dependency> conflictingDependencies = removeRedundantDependencies( conflictCanditates ); +<a class="jxr_linenumber" name="L92" href="#L92">92</a> +<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em class="jxr_comment">// First declaration wins. This is what makes the conflict resolution indeterministic because this</em> +<a class="jxr_linenumber" name="L94" href="#L94">94</a> <em class="jxr_comment">// solely relies on the order of declaration. There is no such thing as the "first" declaration.</em> +<a class="jxr_linenumber" name="L95" href="#L95">95</a> targetDependencyManagement.getDependencies().add( conflictingDependencies.get( 0 ) ); +<a class="jxr_linenumber" name="L96" href="#L96">96</a> +<a class="jxr_linenumber" name="L97" href="#L97">97</a> <em class="jxr_comment">// As of Maven 3.4, we print a warning about such conflicting imports.</em> +<a class="jxr_linenumber" name="L98" href="#L98">98</a> <em class="jxr_comment">// As of Maven 3.5, those warnings will become errors.</em> +<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">if</strong> ( conflictingDependencies.size() > 1 ) +<a class="jxr_linenumber" name="L100" href="#L100">100</a> { +<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">final</strong> StringBuilder conflictsBuilder = <strong class="jxr_keyword">new</strong> StringBuilder( conflictingDependencies.size() * 128 ); +<a class="jxr_linenumber" name="L102" href="#L102">102</a> +<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Dependency dependency : conflictingDependencies ) +<a class="jxr_linenumber" name="L104" href="#L104">104</a> { +<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/InputLocation.html">InputLocation</a> location = dependency.getLocation( <span class="jxr_string">""</span> ); +<a class="jxr_linenumber" name="L106" href="#L106">106</a> +<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">if</strong> ( location != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L108" href="#L108">108</a> { +<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/InputSource.html">InputSource</a> inputSource = location.getSource(); +<a class="jxr_linenumber" name="L110" href="#L110">110</a> +<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">if</strong> ( inputSource != <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L112" href="#L112">112</a> { +<a class="jxr_linenumber" name="L113" href="#L113">113</a> conflictsBuilder.append( <span class="jxr_string">", '"</span> ).append( inputSource.getModelId() ).append( '\'' ); +<a class="jxr_linenumber" name="L114" href="#L114">114</a> } +<a class="jxr_linenumber" name="L115" href="#L115">115</a> } +<a class="jxr_linenumber" name="L116" href="#L116">116</a> } +<a class="jxr_linenumber" name="L117" href="#L117">117</a> +<a class="jxr_linenumber" name="L118" href="#L118">118</a> problems.add( <strong class="jxr_keyword">new</strong> ModelProblemCollectorRequest( +<a class="jxr_linenumber" name="L119" href="#L119">119</a> effectiveSeverity( request.getValidationLevel(), +<a class="jxr_linenumber" name="L120" href="#L120">120</a> ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_5 ), +<a class="jxr_linenumber" name="L121" href="#L121">121</a> ModelProblem.Version.V20 ). +<a class="jxr_linenumber" name="L122" href="#L122">122</a> setMessage( String.format( +<a class="jxr_linenumber" name="L123" href="#L123">123</a> <span class="jxr_string">"Dependency '%1$s' has conflicting dependency management in model '%2$s'%3$s%4$s. "</span> +<a class="jxr_linenumber" name="L124" href="#L124">124</a> + <span class="jxr_string">"To resolve the conflicts, either declare the dependency management for dependency "</span> +<a class="jxr_linenumber" name="L125" href="#L125">125</a> + <span class="jxr_string">"'%1$s' directly in the dependency management of model '%2$s' to override what gets "</span> +<a class="jxr_linenumber" name="L126" href="#L126">126</a> + <span class="jxr_string">"imported or - as of model version 4.1.0 - rearrange the causing imports in the "</span> +<a class="jxr_linenumber" name="L127" href="#L127">127</a> + <span class="jxr_string">"inheritance hierarchy to apply standard override logic based on artifact "</span> +<a class="jxr_linenumber" name="L128" href="#L128">128</a> + <span class="jxr_string">"coordinates. Without resolving the conflicts, your build relies on indeterministic "</span> +<a class="jxr_linenumber" name="L129" href="#L129">129</a> + <span class="jxr_string">"behaviour."</span>, +<a class="jxr_linenumber" name="L130" href="#L130">130</a> conflictingDependencies.get( 0 ).getManagementKey(), target.getId(), +<a class="jxr_linenumber" name="L131" href="#L131">131</a> target.getPomFile() != <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L132" href="#L132">132</a> ? <span class="jxr_string">" @ '"</span> + target.getPomFile().getAbsolutePath() + <span class="jxr_string">"' "</span> +<a class="jxr_linenumber" name="L133" href="#L133">133</a> : <span class="jxr_string">" "</span>, conflictsBuilder.length() > 0 +<a class="jxr_linenumber" name="L134" href="#L134">134</a> ? <span class="jxr_string">"("</span> + conflictsBuilder.substring( 2 ) + <span class="jxr_string">")"</span> +<a class="jxr_linenumber" name="L135" href="#L135">135</a> : <span class="jxr_string">""</span> ) ) ); <a class="jxr_linenumber" name="L136" href="#L136">136</a> -<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_comment">// Removes redundant dependencies.</em> -<a class="jxr_linenumber" name="L138" href="#L138">138</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Iterator<Dependency> it = candidateDependencies.iterator(); it.hasNext(); ) -<a class="jxr_linenumber" name="L139" href="#L139">139</a> { -<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Dependency.html">Dependency</a> candidateDependency = it.next(); -<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">boolean</strong> redundant = <strong class="jxr_keyword">true</strong>; -<a class="jxr_linenumber" name="L142" href="#L142">142</a> -<a class="jxr_linenumber" name="L143" href="#L143">143</a> redundancy_check: -<a class="jxr_linenumber" name="L144" href="#L144">144</a> { -<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong class="jxr_keyword">if</strong> ( !( resultDependency.getOptional() != <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L146" href="#L146">146</a> ? resultDependency.getOptional().equals( candidateDependency.getOptional() ) -<a class="jxr_linenumber" name="L147" href="#L147">147</a> : candidateDependency.getOptional() == <strong class="jxr_keyword">null</strong> ) ) -<a class="jxr_linenumber" name="L148" href="#L148">148</a> { -<a class="jxr_linenumber" name="L149" href="#L149">149</a> redundant = false; -<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">break</strong> redundancy_check; -<a class="jxr_linenumber" name="L151" href="#L151">151</a> } -<a class="jxr_linenumber" name="L152" href="#L152">152</a> -<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">if</strong> ( !( effectiveScope( resultDependency ).equals( effectiveScope( candidateDependency ) ) ) ) -<a class="jxr_linenumber" name="L154" href="#L154">154</a> { -<a class="jxr_linenumber" name="L155" href="#L155">155</a> redundant = false; -<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">break</strong> redundancy_check; -<a class="jxr_linenumber" name="L157" href="#L157">157</a> } -<a class="jxr_linenumber" name="L158" href="#L158">158</a> -<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">if</strong> ( !( resultDependency.getSystemPath() != <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L160" href="#L160">160</a> ? resultDependency.getSystemPath().equals( candidateDependency.getSystemPath() ) -<a class="jxr_linenumber" name="L161" href="#L161">161</a> : candidateDependency.getSystemPath() == <strong class="jxr_keyword">null</strong> ) ) +<a class="jxr_linenumber" name="L137" href="#L137">137</a> } +<a class="jxr_linenumber" name="L138" href="#L138">138</a> } +<a class="jxr_linenumber" name="L139" href="#L139">139</a> } +<a class="jxr_linenumber" name="L140" href="#L140">140</a> } +<a class="jxr_linenumber" name="L141" href="#L141">141</a> +<a class="jxr_linenumber" name="L142" href="#L142">142</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> List<Dependency> removeRedundantDependencies( <strong class="jxr_keyword">final</strong> List<Dependency> candidateDependencies ) +<a class="jxr_linenumber" name="L143" href="#L143">143</a> { +<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">final</strong> List<Dependency> resultDependencies = <strong class="jxr_keyword">new</strong> ArrayList<>( candidateDependencies.size() ); +<a class="jxr_linenumber" name="L145" href="#L145">145</a> +<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">while</strong> ( !candidateDependencies.isEmpty() ) +<a class="jxr_linenumber" name="L147" href="#L147">147</a> { +<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Dependency.html">Dependency</a> resultDependency = candidateDependencies.remove( 0 ); +<a class="jxr_linenumber" name="L149" href="#L149">149</a> resultDependencies.add( resultDependency ); +<a class="jxr_linenumber" name="L150" href="#L150">150</a> +<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_comment">// Removes redundant dependencies.</em> +<a class="jxr_linenumber" name="L152" href="#L152">152</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Iterator<Dependency> it = candidateDependencies.iterator(); it.hasNext(); ) +<a class="jxr_linenumber" name="L153" href="#L153">153</a> { +<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Dependency.html">Dependency</a> candidateDependency = it.next(); +<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">boolean</strong> redundant = <strong class="jxr_keyword">true</strong>; +<a class="jxr_linenumber" name="L156" href="#L156">156</a> +<a class="jxr_linenumber" name="L157" href="#L157">157</a> redundancy_check: +<a class="jxr_linenumber" name="L158" href="#L158">158</a> { +<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">if</strong> ( !( resultDependency.getOptional() != <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L160" href="#L160">160</a> ? resultDependency.getOptional().equals( candidateDependency.getOptional() ) +<a class="jxr_linenumber" name="L161" href="#L161">161</a> : candidateDependency.getOptional() == <strong class="jxr_keyword">null</strong> ) ) <a class="jxr_linenumber" name="L162" href="#L162">162</a> { <a class="jxr_linenumber" name="L163" href="#L163">163</a> redundant = false; <a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">break</strong> redundancy_check; <a class="jxr_linenumber" name="L165" href="#L165">165</a> } <a class="jxr_linenumber" name="L166" href="#L166">166</a> -<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">if</strong> ( !( resultDependency.getVersion() != <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L168" href="#L168">168</a> ? resultDependency.getVersion().equals( candidateDependency.getVersion() ) -<a class="jxr_linenumber" name="L169" href="#L169">169</a> : candidateDependency.getVersion() == <strong class="jxr_keyword">null</strong> ) ) -<a class="jxr_linenumber" name="L170" href="#L170">170</a> { -<a class="jxr_linenumber" name="L171" href="#L171">171</a> redundant = false; -<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">break</strong> redundancy_check; -<a class="jxr_linenumber" name="L173" href="#L173">173</a> } -<a class="jxr_linenumber" name="L174" href="#L174">174</a> -<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0, s0 = resultDependency.getExclusions().size(); i < s0; i++ ) +<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">if</strong> ( !( effectiveScope( resultDependency ).equals( effectiveScope( candidateDependency ) ) ) ) +<a class="jxr_linenumber" name="L168" href="#L168">168</a> { +<a class="jxr_linenumber" name="L169" href="#L169">169</a> redundant = false; +<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">break</strong> redundancy_check; +<a class="jxr_linenumber" name="L171" href="#L171">171</a> } +<a class="jxr_linenumber" name="L172" href="#L172">172</a> +<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong class="jxr_keyword">if</strong> ( !( resultDependency.getSystemPath() != <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L174" href="#L174">174</a> ? resultDependency.getSystemPath().equals( candidateDependency.getSystemPath() ) +<a class="jxr_linenumber" name="L175" href="#L175">175</a> : candidateDependency.getSystemPath() == <strong class="jxr_keyword">null</strong> ) ) <a class="jxr_linenumber" name="L176" href="#L176">176</a> { -<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Exclusion.html">Exclusion</a> resultExclusion = resultDependency.getExclusions().get( i ); -<a class="jxr_linenumber" name="L178" href="#L178">178</a> -<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">if</strong> ( !containsExclusion( candidateDependency.getExclusions(), resultExclusion ) ) -<a class="jxr_linenumber" name="L180" href="#L180">180</a> { -<a class="jxr_linenumber" name="L181" href="#L181">181</a> redundant = false; -<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">break</strong> redundancy_check; -<a class="jxr_linenumber" name="L183" href="#L183">183</a> } -<a class="jxr_linenumber" name="L184" href="#L184">184</a> } -<a class="jxr_linenumber" name="L185" href="#L185">185</a> -<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0, s0 = candidateDependency.getExclusions().size(); i < s0; i++ ) -<a class="jxr_linenumber" name="L187" href="#L187">187</a> { -<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Exclusion.html">Exclusion</a> candidateExclusion = candidateDependency.getExclusions().get( i ); -<a class="jxr_linenumber" name="L189" href="#L189">189</a> -<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">if</strong> ( !containsExclusion( resultDependency.getExclusions(), candidateExclusion ) ) -<a class="jxr_linenumber" name="L191" href="#L191">191</a> { -<a class="jxr_linenumber" name="L192" href="#L192">192</a> redundant = false; -<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">break</strong> redundancy_check; -<a class="jxr_linenumber" name="L194" href="#L194">194</a> } -<a class="jxr_linenumber" name="L195" href="#L195">195</a> } -<a class="jxr_linenumber" name="L196" href="#L196">196</a> } -<a class="jxr_linenumber" name="L197" href="#L197">197</a> -<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">if</strong> ( redundant ) -<a class="jxr_linenumber" name="L199" href="#L199">199</a> { -<a class="jxr_linenumber" name="L200" href="#L200">200</a> it.remove(); -<a class="jxr_linenumber" name="L201" href="#L201">201</a> } -<a class="jxr_linenumber" name="L202" href="#L202">202</a> } -<a class="jxr_linenumber" name="L203" href="#L203">203</a> } -<a class="jxr_linenumber" name="L204" href="#L204">204</a> -<a class="jxr_linenumber" name="L205" href="#L205">205</a> <strong class="jxr_keyword">return</strong> resultDependencies; -<a class="jxr_linenumber" name="L206" href="#L206">206</a> } -<a class="jxr_linenumber" name="L207" href="#L207">207</a> -<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> containsExclusion( <strong class="jxr_keyword">final</strong> List<Exclusion> exclusions, <strong class="jxr_keyword">final</strong> Exclusion exclusion ) -<a class="jxr_linenumber" name="L209" href="#L209">209</a> { -<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0, s0 = exclusions.size(); i < s0; i++ ) -<a class="jxr_linenumber" name="L211" href="#L211">211</a> { -<a class="jxr_linenumber" name="L212" href="#L212">212</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Exclusion.html">Exclusion</a> current = exclusions.get( i ); -<a class="jxr_linenumber" name="L213" href="#L213">213</a> -<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">if</strong> ( ( exclusion.getArtifactId() != <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L215" href="#L215">215</a> ? exclusion.getArtifactId().equals( current.getArtifactId() ) -<a class="jxr_linenumber" name="L216" href="#L216">216</a> : current.getArtifactId() == <strong class="jxr_keyword">null</strong> ) -<a class="jxr_linenumber" name="L217" href="#L217">217</a> && ( exclusion.getGroupId() != <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L218" href="#L218">218</a> ? exclusion.getGroupId().equals( current.getGroupId() ) -<a class="jxr_linenumber" name="L219" href="#L219">219</a> : current.getGroupId() == <strong class="jxr_keyword">null</strong> ) ) -<a class="jxr_linenumber" name="L220" href="#L220">220</a> { -<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>; -<a class="jxr_linenumber" name="L222" href="#L222">222</a> } -<a class="jxr_linenumber" name="L223" href="#L223">223</a> } -<a class="jxr_linenumber" name="L224" href="#L224">224</a> -<a class="jxr_linenumber" name="L225" href="#L225">225</a> <strong class="jxr_keyword">return</strong> false; -<a class="jxr_linenumber" name="L226" href="#L226">226</a> } +<a class="jxr_linenumber" name="L177" href="#L177">177</a> redundant = false; +<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">break</strong> redundancy_check; +<a class="jxr_linenumber" name="L179" href="#L179">179</a> } +<a class="jxr_linenumber" name="L180" href="#L180">180</a> +<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">if</strong> ( !( resultDependency.getVersion() != <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L182" href="#L182">182</a> ? resultDependency.getVersion().equals( candidateDependency.getVersion() ) +<a class="jxr_linenumber" name="L183" href="#L183">183</a> : candidateDependency.getVersion() == <strong class="jxr_keyword">null</strong> ) ) +<a class="jxr_linenumber" name="L184" href="#L184">184</a> { +<a class="jxr_linenumber" name="L185" href="#L185">185</a> redundant = false; +<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">break</strong> redundancy_check; +<a class="jxr_linenumber" name="L187" href="#L187">187</a> } +<a class="jxr_linenumber" name="L188" href="#L188">188</a> +<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0, s0 = resultDependency.getExclusions().size(); i < s0; i++ ) +<a class="jxr_linenumber" name="L190" href="#L190">190</a> { +<a class="jxr_linenumber" name="L191" href="#L191">191</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Exclusion.html">Exclusion</a> resultExclusion = resultDependency.getExclusions().get( i ); +<a class="jxr_linenumber" name="L192" href="#L192">192</a> +<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">if</strong> ( !containsExclusion( candidateDependency.getExclusions(), resultExclusion ) ) +<a class="jxr_linenumber" name="L194" href="#L194">194</a> { +<a class="jxr_linenumber" name="L195" href="#L195">195</a> redundant = false; +<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">break</strong> redundancy_check; +<a class="jxr_linenumber" name="L197" href="#L197">197</a> } +<a class="jxr_linenumber" name="L198" href="#L198">198</a> } +<a class="jxr_linenumber" name="L199" href="#L199">199</a> +<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0, s0 = candidateDependency.getExclusions().size(); i < s0; i++ ) +<a class="jxr_linenumber" name="L201" href="#L201">201</a> { +<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Exclusion.html">Exclusion</a> candidateExclusion = candidateDependency.getExclusions().get( i ); +<a class="jxr_linenumber" name="L203" href="#L203">203</a> +<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">if</strong> ( !containsExclusion( resultDependency.getExclusions(), candidateExclusion ) ) +<a class="jxr_linenumber" name="L205" href="#L205">205</a> { +<a class="jxr_linenumber" name="L206" href="#L206">206</a> redundant = false; +<a class="jxr_linenumber" name="L207" href="#L207">207</a> <strong class="jxr_keyword">break</strong> redundancy_check; +<a class="jxr_linenumber" name="L208" href="#L208">208</a> } +<a class="jxr_linenumber" name="L209" href="#L209">209</a> } +<a class="jxr_linenumber" name="L210" href="#L210">210</a> } +<a class="jxr_linenumber" name="L211" href="#L211">211</a> +<a class="jxr_linenumber" name="L212" href="#L212">212</a> <strong class="jxr_keyword">if</strong> ( redundant ) +<a class="jxr_linenumber" name="L213" href="#L213">213</a> { +<a class="jxr_linenumber" name="L214" href="#L214">214</a> it.remove(); +<a class="jxr_linenumber" name="L215" href="#L215">215</a> } +<a class="jxr_linenumber" name="L216" href="#L216">216</a> } +<a class="jxr_linenumber" name="L217" href="#L217">217</a> } +<a class="jxr_linenumber" name="L218" href="#L218">218</a> +<a class="jxr_linenumber" name="L219" href="#L219">219</a> <strong class="jxr_keyword">return</strong> resultDependencies; +<a class="jxr_linenumber" name="L220" href="#L220">220</a> } +<a class="jxr_linenumber" name="L221" href="#L221">221</a> +<a class="jxr_linenumber" name="L222" href="#L222">222</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> containsExclusion( <strong class="jxr_keyword">final</strong> List<Exclusion> exclusions, <strong class="jxr_keyword">final</strong> Exclusion exclusion ) +<a class="jxr_linenumber" name="L223" href="#L223">223</a> { +<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">int</strong> i = 0, s0 = exclusions.size(); i < s0; i++ ) +<a class="jxr_linenumber" name="L225" href="#L225">225</a> { +<a class="jxr_linenumber" name="L226" href="#L226">226</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/maven/model/Exclusion.html">Exclusion</a> current = exclusions.get( i ); <a class="jxr_linenumber" name="L227" href="#L227">227</a> -<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String effectiveScope( <strong class="jxr_keyword">final</strong> Dependency dependency ) -<a class="jxr_linenumber" name="L229" href="#L229">229</a> { -<a class="jxr_linenumber" name="L230" href="#L230">230</a> <strong class="jxr_keyword">return</strong> dependency.getScope() == <strong class="jxr_keyword">null</strong> -<a class="jxr_linenumber" name="L231" href="#L231">231</a> ? <span class="jxr_string">"compile"</span> -<a class="jxr_linenumber" name="L232" href="#L232">232</a> : dependency.getScope(); -<a class="jxr_linenumber" name="L233" href="#L233">233</a> -<a class="jxr_linenumber" name="L234" href="#L234">234</a> } -<a class="jxr_linenumber" name="L235" href="#L235">235</a> -<a class="jxr_linenumber" name="L236" href="#L236">236</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> ModelProblem.Severity effectiveSeverity( <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> validationLevel, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> errorThreshold ) -<a class="jxr_linenumber" name="L237" href="#L237">237</a> { -<a class="jxr_linenumber" name="L238" href="#L238">238</a> <strong class="jxr_keyword">if</strong> ( validationLevel < errorThreshold ) -<a class="jxr_linenumber" name="L239" href="#L239">239</a> { -<a class="jxr_linenumber" name="L240" href="#L240">240</a> <strong class="jxr_keyword">return</strong> ModelProblem.Severity.WARNING; -<a class="jxr_linenumber" name="L241" href="#L241">241</a> } -<a class="jxr_linenumber" name="L242" href="#L242">242</a> <strong class="jxr_keyword">else</strong> -<a class="jxr_linenumber" name="L243" href="#L243">243</a> { -<a class="jxr_linenumber" name="L244" href="#L244">244</a> <strong class="jxr_keyword">return</strong> ModelProblem.Severity.ERROR; -<a class="jxr_linenumber" name="L245" href="#L245">245</a> } -<a class="jxr_linenumber" name="L246" href="#L246">246</a> } +<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">if</strong> ( ( exclusion.getArtifactId() != <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L229" href="#L229">229</a> ? exclusion.getArtifactId().equals( current.getArtifactId() ) +<a class="jxr_linenumber" name="L230" href="#L230">230</a> : current.getArtifactId() == <strong class="jxr_keyword">null</strong> ) +<a class="jxr_linenumber" name="L231" href="#L231">231</a> && ( exclusion.getGroupId() != <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L232" href="#L232">232</a> ? exclusion.getGroupId().equals( current.getGroupId() ) +<a class="jxr_linenumber" name="L233" href="#L233">233</a> : current.getGroupId() == <strong class="jxr_keyword">null</strong> ) ) +<a class="jxr_linenumber" name="L234" href="#L234">234</a> { +<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>; +<a class="jxr_linenumber" name="L236" href="#L236">236</a> } +<a class="jxr_linenumber" name="L237" href="#L237">237</a> } +<a class="jxr_linenumber" name="L238" href="#L238">238</a> +<a class="jxr_linenumber" name="L239" href="#L239">239</a> <strong class="jxr_keyword">return</strong> false; +<a class="jxr_linenumber" name="L240" href="#L240">240</a> } +<a class="jxr_linenumber" name="L241" href="#L241">241</a> +<a class="jxr_linenumber" name="L242" href="#L242">242</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String effectiveScope( <strong class="jxr_keyword">final</strong> Dependency dependency ) +<a class="jxr_linenumber" name="L243" href="#L243">243</a> { +<a class="jxr_linenumber" name="L244" href="#L244">244</a> <strong class="jxr_keyword">return</strong> dependency.getScope() == <strong class="jxr_keyword">null</strong> +<a class="jxr_linenumber" name="L245" href="#L245">245</a> ? <span class="jxr_string">"compile"</span> +<a class="jxr_linenumber" name="L246" href="#L246">246</a> : dependency.getScope(); <a class="jxr_linenumber" name="L247" href="#L247">247</a> -<a class="jxr_linenumber" name="L248" href="#L248">248</a> } +<a class="jxr_linenumber" name="L248" href="#L248">248</a> } +<a class="jxr_linenumber" name="L249" href="#L249">249</a> +<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> ModelProblem.Severity effectiveSeverity( <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> validationLevel, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> errorThreshold ) +<a class="jxr_linenumber" name="L251" href="#L251">251</a> { +<a class="jxr_linenumber" name="L252" href="#L252">252</a> <strong class="jxr_keyword">if</strong> ( validationLevel < errorThreshold ) +<a class="jxr_linenumber" name="L253" href="#L253">253</a> { +<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong class="jxr_keyword">return</strong> ModelProblem.Severity.WARNING; +<a class="jxr_linenumber" name="L255" href="#L255">255</a> } +<a class="jxr_linenumber" name="L256" href="#L256">256</a> <strong class="jxr_keyword">else</strong> +<a class="jxr_linenumber" name="L257" href="#L257">257</a> { +<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">return</strong> ModelProblem.Severity.ERROR; +<a class="jxr_linenumber" name="L259" href="#L259">259</a> } +<a class="jxr_linenumber" name="L260" href="#L260">260</a> } +<a class="jxr_linenumber" name="L261" href="#L261">261</a> +<a class="jxr_linenumber" name="L262" href="#L262">262</a> } </pre> <hr/> <div id="footer">Copyright © 2001–2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/repository/RepositorySystem.html ============================================================================== --- websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/repository/RepositorySystem.html (original) +++ websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/repository/RepositorySystem.html Tue Sep 20 21:29:09 2016 @@ -59,14 +59,14 @@ <a class="jxr_linenumber" name="L51" href="#L51">51</a> File defaultUserLocalRepository = <strong class="jxr_keyword">new</strong> File( userMavenConfigurationHome, <span class="jxr_string">"repository"</span> ); <a class="jxr_linenumber" name="L52" href="#L52">52</a> <a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> * @deprecation As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier</em> +<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> * @deprecated As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier</em> <a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment"> * {@code central} if such a repository is not provided in the settings or the POM.</em> <a class="jxr_linenumber" name="L56" href="#L56">56</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L57" href="#L57">57</a> @Deprecated <a class="jxr_linenumber" name="L58" href="#L58">58</a> String DEFAULT_REMOTE_REPO_ID = <span class="jxr_string">"central"</span>; <a class="jxr_linenumber" name="L59" href="#L59">59</a> <a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em class="jxr_javadoccomment"> * @deprecation As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier</em> +<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em class="jxr_javadoccomment"> * @deprecated As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier</em> <a class="jxr_linenumber" name="L62" href="#L62">62</a> <em class="jxr_javadoccomment"> * {@code central} if such a repository is not provided in the settings or the POM.</em> <a class="jxr_linenumber" name="L63" href="#L63">63</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L64" href="#L64">64</a> @Deprecated @@ -89,7 +89,7 @@ <a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">throws</strong> InvalidRepositoryException; <a class="jxr_linenumber" name="L82" href="#L82">82</a> <a class="jxr_linenumber" name="L83" href="#L83">83</a> <em class="jxr_javadoccomment">/**</em> -<a class="jxr_linenumber" name="L84" href="#L84">84</a> <em class="jxr_javadoccomment"> * @deprecation As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier</em> +<a class="jxr_linenumber" name="L84" href="#L84">84</a> <em class="jxr_javadoccomment"> * @deprecated As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier</em> <a class="jxr_linenumber" name="L85" href="#L85">85</a> <em class="jxr_javadoccomment"> * {@code central} if such a repository is not provided in the settings or the POM.</em> <a class="jxr_linenumber" name="L86" href="#L86">86</a> <em class="jxr_javadoccomment"> */</em> <a class="jxr_linenumber" name="L87" href="#L87">87</a> @Deprecated