You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by hb...@apache.org on 2020/05/23 15:36:44 UTC
svn commit: r1878063 [19/19] - in
/maven/website/components/plugins-archives/maven-shade-plugin-LATEST: ./
apidocs/ apidocs/org/apache/maven/plugins/shade/
apidocs/org/apache/maven/plugins/shade/class-use/
apidocs/org/apache/maven/plugins/shade/filter/...
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformer.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformer.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformer.html Sat May 23 15:36:41 2020
@@ -40,7 +40,7 @@
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> java.util.jar.JarOutputStream;
<a class="jxr_linenumber" name="L33" href="#L33">33</a>
<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.shade.relocation.Relocator;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.shade.resource.ResourceTransformer;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.shade.resource.ReproducibleResourceTransformer;
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.shade.resource.properties.io.NoCloseOutputStream;
<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong class="jxr_keyword">import</strong> org.apache.maven.plugins.shade.resource.properties.io.SkipPropertiesDateLineWriter;
<a class="jxr_linenumber" name="L38" href="#L38">38</a>
@@ -50,7 +50,7 @@
<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * @since 3.2.2</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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/properties/PropertiesTransformer.html">PropertiesTransformer</a>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/ResourceTransformer.html">ResourceTransformer</a>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">implements</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/ReproducibleResourceTransformer.html">ReproducibleResourceTransformer</a>
<a class="jxr_linenumber" name="L46" href="#L46">46</a> {
<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong class="jxr_keyword">private</strong> String resource;
<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong class="jxr_keyword">private</strong> String alreadyMergedKey;
@@ -82,143 +82,150 @@
<a class="jxr_linenumber" name="L74" href="#L74">74</a> }
<a class="jxr_linenumber" name="L75" href="#L75">75</a>
<a class="jxr_linenumber" name="L76" href="#L76">76</a> @Override
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> processResource( <strong class="jxr_keyword">final</strong> String resource, <strong class="jxr_keyword">final</strong> InputStream is, <strong class="jxr_keyword">final</strong> List<Relocator> relocators,
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">long</strong> time )
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> {
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">final</strong> Properties p = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> p.load( is );
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> properties.add( p );
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">if</strong> ( time > <strong class="jxr_keyword">this</strong>.time )
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> {
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">this</strong>.time = time;
-<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>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> @Override
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasTransformedResource()
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> {
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">return</strong> !properties.isEmpty();
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> @Override
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> modifyOutputStream( JarOutputStream os )
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">void</strong> processResource( String resource, InputStream is, List<Relocator> relocators )
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> {
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> processResource( resource, is, relocators, 0 );
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> }
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> @Override
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> processResource( <strong class="jxr_keyword">final</strong> String resource, <strong class="jxr_keyword">final</strong> InputStream is, <strong class="jxr_keyword">final</strong> List<Relocator> relocators,
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">long</strong> time )
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> {
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">final</strong> Properties p = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> p.load( is );
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> properties.add( p );
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">if</strong> ( time > <strong class="jxr_keyword">this</strong>.time )
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> {
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">this</strong>.time = time;
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> }
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> @Override
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> hasTransformedResource()
<a class="jxr_linenumber" name="L99" href="#L99">99</a> {
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">if</strong> ( properties.isEmpty() )
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> }
-<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> Properties out = mergeProperties( sortProperties() );
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">if</strong> ( ordinalKey != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> {
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> out.remove( ordinalKey );
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> }
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">if</strong> ( alreadyMergedKey != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> {
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> out.remove( alreadyMergedKey );
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> }
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> JarEntry jarEntry = <strong class="jxr_keyword">new</strong> JarEntry( resource );
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> jarEntry.setTime( time );
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> os.putNextEntry( jarEntry );
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">final</strong> BufferedWriter writer = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/properties/io/SkipPropertiesDateLineWriter.html">SkipPropertiesDateLineWriter</a>(
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong class="jxr_keyword">new</strong> OutputStreamWriter( <strong class="jxr_keyword">new</strong> NoCloseOutputStream( os ), StandardCharsets.ISO_8859_1 ) );
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> out.store( writer, <span class="jxr_string">" Merged by maven-shade-plugin ("</span> + getClass().getName() + <span class="jxr_string">")"</span> );
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> writer.close();
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> os.closeEntry();
-<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setReverseOrder( <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> reverseOrder )
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> {
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">this</strong>.reverseOrder = reverseOrder;
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> }
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setResource( <strong class="jxr_keyword">final</strong> String resource )
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> {
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">this</strong>.resource = resource;
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setOrdinalKey( <strong class="jxr_keyword">final</strong> String ordinalKey )
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">this</strong>.ordinalKey = ordinalKey;
-<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDefaultOrdinal( <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> defaultOrdinal )
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> {
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">this</strong>.defaultOrdinal = defaultOrdinal;
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> }
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAlreadyMergedKey( <strong class="jxr_keyword">final</strong> String alreadyMergedKey )
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> {
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">this</strong>.alreadyMergedKey = alreadyMergedKey;
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> }
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong class="jxr_keyword">private</strong> List<Properties> sortProperties()
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> {
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">final</strong> List<Properties> sortedProperties = <strong class="jxr_keyword">new</strong> ArrayList<>();
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> <strong class="jxr_keyword">boolean</strong> foundMaster = false;
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Properties current : properties )
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> {
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">if</strong> ( alreadyMergedKey != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> {
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">final</strong> String master = current.getProperty( alreadyMergedKey );
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">if</strong> ( Boolean.parseBoolean( master ) )
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> {
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">if</strong> ( foundMaster )
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> {
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalStateException(
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> <span class="jxr_string">"Ambiguous merged values: "</span> + sortedProperties + <span class="jxr_string">", "</span> + current );
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> }
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> foundMaster = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> sortedProperties.clear();
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> sortedProperties.add( current );
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> }
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> }
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">if</strong> ( !foundMaster )
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> configOrder = getConfigurationOrdinal( current );
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong class="jxr_keyword">int</strong> i;
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">for</strong> ( i = 0; i < sortedProperties.size(); i++ )
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> {
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">int</strong> listConfigOrder = getConfigurationOrdinal( sortedProperties.get( i ) );
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <strong class="jxr_keyword">if</strong> ( ( !reverseOrder && listConfigOrder > configOrder )
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> || ( reverseOrder && listConfigOrder < configOrder ) )
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> {
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> }
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> }
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> sortedProperties.add( i, current );
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> }
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> }
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> <strong class="jxr_keyword">return</strong> sortedProperties;
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> }
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> getConfigurationOrdinal( <strong class="jxr_keyword">final</strong> Properties p )
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> {
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">if</strong> ( ordinalKey == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> {
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">return</strong> defaultOrdinal;
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> }
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">final</strong> String configOrderString = p.getProperty( ordinalKey );
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">if</strong> ( configOrderString != <strong class="jxr_keyword">null</strong> && configOrderString.length() > 0 )
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> {
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <strong class="jxr_keyword">return</strong> Integer.parseInt( configOrderString );
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> }
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">return</strong> defaultOrdinal;
-<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> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Properties mergeProperties( <strong class="jxr_keyword">final</strong> List<Properties> sortedProperties )
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> {
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> <strong class="jxr_keyword">final</strong> Properties mergedProperties = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/properties/SortedProperties.html">SortedProperties</a>();
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Properties p : sortedProperties )
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> {
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> mergedProperties.putAll( p );
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> }
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">return</strong> mergedProperties;
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> }
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> }
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">return</strong> !properties.isEmpty();
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> }
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> @Override
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> modifyOutputStream( JarOutputStream os )
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">throws</strong> IOException
+<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> ( properties.isEmpty() )
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> {
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> }
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">final</strong> Properties out = mergeProperties( sortProperties() );
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">if</strong> ( ordinalKey != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> {
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> out.remove( ordinalKey );
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> }
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">if</strong> ( alreadyMergedKey != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> out.remove( alreadyMergedKey );
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> }
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> JarEntry jarEntry = <strong class="jxr_keyword">new</strong> JarEntry( resource );
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> jarEntry.setTime( time );
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> os.putNextEntry( jarEntry );
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">final</strong> BufferedWriter writer = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/properties/io/SkipPropertiesDateLineWriter.html">SkipPropertiesDateLineWriter</a>(
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">new</strong> OutputStreamWriter( <strong class="jxr_keyword">new</strong> NoCloseOutputStream( os ), StandardCharsets.ISO_8859_1 ) );
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> out.store( writer, <span class="jxr_string">" Merged by maven-shade-plugin ("</span> + getClass().getName() + <span class="jxr_string">")"</span> );
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> writer.close();
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> os.closeEntry();
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> }
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setReverseOrder( <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> reverseOrder )
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> {
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">this</strong>.reverseOrder = reverseOrder;
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> }
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setResource( <strong class="jxr_keyword">final</strong> String resource )
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> {
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <strong class="jxr_keyword">this</strong>.resource = resource;
+<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> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setOrdinalKey( <strong class="jxr_keyword">final</strong> String ordinalKey )
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> {
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">this</strong>.ordinalKey = ordinalKey;
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> }
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setDefaultOrdinal( <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> defaultOrdinal )
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> {
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">this</strong>.defaultOrdinal = defaultOrdinal;
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> }
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setAlreadyMergedKey( <strong class="jxr_keyword">final</strong> String alreadyMergedKey )
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> {
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">this</strong>.alreadyMergedKey = alreadyMergedKey;
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> }
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">private</strong> List<Properties> sortProperties()
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> {
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">final</strong> List<Properties> sortedProperties = <strong class="jxr_keyword">new</strong> ArrayList<>();
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">boolean</strong> foundMaster = false;
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Properties current : properties )
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> {
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">if</strong> ( alreadyMergedKey != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> {
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">final</strong> String master = current.getProperty( alreadyMergedKey );
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> <strong class="jxr_keyword">if</strong> ( Boolean.parseBoolean( master ) )
+<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> ( foundMaster )
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> {
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalStateException(
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> <span class="jxr_string">"Ambiguous merged values: "</span> + sortedProperties + <span class="jxr_string">", "</span> + current );
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> }
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> foundMaster = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> sortedProperties.clear();
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> sortedProperties.add( current );
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> }
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> }
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">if</strong> ( !foundMaster )
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> {
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> configOrder = getConfigurationOrdinal( current );
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <strong class="jxr_keyword">int</strong> i;
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <strong class="jxr_keyword">for</strong> ( i = 0; i < sortedProperties.size(); i++ )
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> {
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">int</strong> listConfigOrder = getConfigurationOrdinal( sortedProperties.get( i ) );
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">if</strong> ( ( !reverseOrder && listConfigOrder > configOrder )
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> || ( reverseOrder && listConfigOrder < configOrder ) )
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> {
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> }
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> }
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> sortedProperties.add( i, current );
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> }
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> }
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">return</strong> sortedProperties;
+<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> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> getConfigurationOrdinal( <strong class="jxr_keyword">final</strong> Properties p )
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> {
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> <strong class="jxr_keyword">if</strong> ( ordinalKey == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> {
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">return</strong> defaultOrdinal;
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> }
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong class="jxr_keyword">final</strong> String configOrderString = p.getProperty( ordinalKey );
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">if</strong> ( configOrderString != <strong class="jxr_keyword">null</strong> && configOrderString.length() > 0 )
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> {
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <strong class="jxr_keyword">return</strong> Integer.parseInt( configOrderString );
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> }
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> <strong class="jxr_keyword">return</strong> defaultOrdinal;
+<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> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Properties mergeProperties( <strong class="jxr_keyword">final</strong> List<Properties> sortedProperties )
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> {
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> <strong class="jxr_keyword">final</strong> Properties mergedProperties = <strong class="jxr_keyword">new</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/properties/SortedProperties.html">SortedProperties</a>();
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">for</strong> ( <strong class="jxr_keyword">final</strong> Properties p : sortedProperties )
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> mergedProperties.putAll( p );
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> }
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong class="jxr_keyword">return</strong> mergedProperties;
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> }
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/SortedProperties.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/SortedProperties.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/SortedProperties.html Sat May 23 15:36:41 2020
@@ -43,7 +43,7 @@
<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> * Internal Properties instance sorting its keys on iterations for store() usages.</em>
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * It ensures properties persistence is deterministic.</em>
<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"> * IMPORTANT: this only overrides methods used accross JVM in store() so ordering is not guaranteed for other cases.</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * IMPORTANT: this only overrides methods used across JVM in store() so ordering is not guaranteed for other cases.</em>
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../../org/apache/maven/plugins/shade/resource/properties/SortedProperties.html">SortedProperties</a> <strong class="jxr_keyword">extends</strong> Properties
<a class="jxr_linenumber" name="L41" href="#L41">41</a> {
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/io/package-frame.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/io/package-frame.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/io/package-frame.html Sat May 23 15:36:41 2020
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Apache Maven Shade Plugin 3.2.3 Reference Package org.apache.maven.plugins.shade.resource.properties.io</title>
+ <title>Apache Maven Shade Plugin 3.2.4 Reference Package org.apache.maven.plugins.shade.resource.properties.io</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/io/package-summary.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/io/package-summary.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/io/package-summary.html Sat May 23 15:36:41 2020
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Apache Maven Shade Plugin 3.2.3 Reference Package org.apache.maven.plugins.shade.resource.properties.io</title>
+ <title>Apache Maven Shade Plugin 3.2.4 Reference Package org.apache.maven.plugins.shade.resource.properties.io</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/package-frame.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/package-frame.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/package-frame.html Sat May 23 15:36:41 2020
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Apache Maven Shade Plugin 3.2.3 Reference Package org.apache.maven.plugins.shade.resource.properties</title>
+ <title>Apache Maven Shade Plugin 3.2.4 Reference Package org.apache.maven.plugins.shade.resource.properties</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/package-summary.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/package-summary.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/resource/properties/package-summary.html Sat May 23 15:36:41 2020
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Apache Maven Shade Plugin 3.2.3 Reference Package org.apache.maven.plugins.shade.resource.properties</title>
+ <title>Apache Maven Shade Plugin 3.2.4 Reference Package org.apache.maven.plugins.shade.resource.properties</title>
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/overview-frame.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/overview-frame.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/overview-frame.html Sat May 23 15:36:41 2020
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Apache Maven Shade Plugin 3.2.3 Reference</title>
+ <title>Apache Maven Shade Plugin 3.2.4 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/overview-summary.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/overview-summary.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/overview-summary.html Sat May 23 15:36:41 2020
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Apache Maven Shade Plugin 3.2.3 Reference</title>
+ <title>Apache Maven Shade Plugin 3.2.4 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
</head>
<body>
@@ -24,7 +24,7 @@
</ul>
</div>
- <h2>Apache Maven Shade Plugin 3.2.3 Reference</h2>
+ <h2>Apache Maven Shade Plugin 3.2.4 Reference</h2>
<table class="summary">
<thead>