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 cs...@apache.org on 2024/05/28 15:18:19 UTC

svn commit: r1918023 [15/17] - in /maven/website/components/plugins-archives/maven-shade-plugin-LATEST: ./ apidocs/ apidocs/legal/ apidocs/org/apache/maven/plugins/maven_shade_plugin/ apidocs/org/apache/maven/plugins/maven_shade_plugin/class-use/ apido...

Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref-test/overview-frame.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref-test/overview-frame.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref-test/overview-frame.html Tue May 28 15:18:17 2024
@@ -4,11 +4,11 @@
     <!-- generated by Apache Maven JXR (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Maven Shade Plugin 3.5.3 Reference</title>
+        <title>Apache Maven Shade Plugin 3.6.0 Reference</title>
         <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
     </head>
     <body>
-        <h1 title="Apache Maven Shade Plugin 3.5.3 Reference" class="bar"><strong>Apache Maven Shade Plugin 3.5.3 Reference</strong></h1>
+        <h1 title="Apache Maven Shade Plugin 3.6.0 Reference" class="bar"><strong>Apache Maven Shade Plugin 3.6.0 Reference</strong></h1>
         <div class="indexHeader"><span><a href="allclasses-frame.html" target="packageFrame">All&nbsp;Classes</a></span></div>
         <div class="indexContainer">
             <h2 title="Packages">Packages</h2>

Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref-test/overview-summary.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref-test/overview-summary.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref-test/overview-summary.html Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
     <!-- generated by Apache Maven JXR (jdk7) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Maven Shade Plugin 3.5.3 Reference</title>
+        <title>Apache Maven Shade Plugin 3.6.0 Reference</title>
         <link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
     </head>
     <body>
@@ -22,7 +22,7 @@
                 <li>Index</li>
                 <li>Help</li>
             </ul>
-            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.5.3 Reference</strong></em></div>
+            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.6.0 Reference</strong></em></div>
         </div>
         <div class="subNav">
             <ul class="navList">
@@ -37,7 +37,7 @@
         </div>
         
                 <div class="header">
-            <h1 class="title">Apache Maven Shade Plugin 3.5.3 Reference</h1>
+            <h1 class="title">Apache Maven Shade Plugin 3.6.0 Reference</h1>
         </div>
         <div class="contentContainer">
             <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages">
@@ -106,7 +106,7 @@
                 <li>Index</li>
                 <li>Help</li>
             </ul>
-            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.5.3 Reference</strong></em></div>
+            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.6.0 Reference</strong></em></div>
         </div>
         <div class="subNav">
             <ul class="navList">

Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/index.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/index.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/index.html Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
     <!-- this is a JXR report set (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Maven Shade Plugin 3.5.3 Reference</title>
+        <title>Apache Maven Shade Plugin 3.6.0 Reference</title>
         <script type="text/javascript">
             tmpTargetPage = "" + window.location.search;
             if (tmpTargetPage != "" && tmpTargetPage != "undefined")

Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/maven_shade_plugin/package-frame.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/maven_shade_plugin/package-frame.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/maven_shade_plugin/package-frame.html Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
     <!-- generated by Apache Maven JXR (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Maven Shade Plugin 3.5.3 Reference Package org.apache.maven.plugins.maven_shade_plugin</title>
+        <title>Apache Maven Shade Plugin 3.6.0 Reference Package org.apache.maven.plugins.maven_shade_plugin</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/maven_shade_plugin/package-summary.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/maven_shade_plugin/package-summary.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/maven_shade_plugin/package-summary.html Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
     <!-- generated by Apache Maven JXR (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Maven Shade Plugin 3.5.3 Reference Package org.apache.maven.plugins.maven_shade_plugin</title>
+        <title>Apache Maven Shade Plugin 3.6.0 Reference Package org.apache.maven.plugins.maven_shade_plugin</title>
         <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
     </head>
 
@@ -23,7 +23,7 @@
                 <li>Index</li>
                 <li>Help</li>
             </ul>
-            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.5.3 Reference</strong></em></div>
+            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.6.0 Reference</strong></em></div>
         </div>
         <div class="subNav">
             <ul class="navList">
@@ -81,7 +81,7 @@
                 <li>Index</li>
                 <li>Help</li>
             </ul>
-            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.5.3 Reference</strong></em></div>
+            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.6.0 Reference</strong></em></div>
         </div>
         <div class="subNav">
             <ul class="navList">

Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/DefaultShader.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/DefaultShader.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/DefaultShader.html Tue May 28 15:18:17 2024
@@ -32,38 +32,38 @@
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.io.BufferedOutputStream;
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayInputStream;
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.io.FileInputStream;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> java.io.OutputStreamWriter;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> java.io.PushbackInputStream;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> java.io.Writer;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> java.nio.charset.StandardCharsets;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> java.io.InputStreamReader;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> java.io.OutputStreamWriter;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> java.io.PushbackInputStream;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> java.io.Writer;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> java.nio.charset.StandardCharsets;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> java.nio.file.Files;
 <a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> java.util.ArrayList;
 <a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
 <a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> java.util.Calendar;
 <a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> java.util.Collection;
 <a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">import</strong> java.util.Collections;
 <a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong class="jxr_keyword">import</strong> java.util.Enumeration;
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong class="jxr_keyword">import</strong> java.util.HashSet;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedList;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <strong class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <strong class="jxr_keyword">import</strong> java.util.Objects;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.Callable;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <strong class="jxr_keyword">import</strong> java.util.jar.JarEntry;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <strong class="jxr_keyword">import</strong> java.util.jar.JarFile;
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <strong class="jxr_keyword">import</strong> java.util.jar.JarOutputStream;
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Matcher;
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Pattern;
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <strong class="jxr_keyword">import</strong> java.util.zip.CRC32;
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <strong class="jxr_keyword">import</strong> java.util.zip.ZipEntry;
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <strong class="jxr_keyword">import</strong> java.util.zip.ZipException;
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.collections4.MultiValuedMap;
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.collections4.multimap.HashSetValuedHashMap;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">import</strong> java.util.HashSet;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <strong class="jxr_keyword">import</strong> java.util.LinkedList;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <strong class="jxr_keyword">import</strong> java.util.Objects;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <strong class="jxr_keyword">import</strong> java.util.concurrent.Callable;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  <strong class="jxr_keyword">import</strong> java.util.jar.JarEntry;
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <strong class="jxr_keyword">import</strong> java.util.jar.JarFile;
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <strong class="jxr_keyword">import</strong> java.util.jar.JarOutputStream;
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Matcher;
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  <strong class="jxr_keyword">import</strong> java.util.regex.Pattern;
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <strong class="jxr_keyword">import</strong> java.util.zip.CRC32;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <strong class="jxr_keyword">import</strong> java.util.zip.ZipEntry;
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <strong class="jxr_keyword">import</strong> java.util.zip.ZipException;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  
 <a class="jxr_linenumber" name="L59" href="#L59">59</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.compress.archivers.zip.ExtraFieldUtils;
 <a class="jxr_linenumber" name="L60" href="#L60">60</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.compress.archivers.zip.X5455_ExtendedTimestamp;
 <a class="jxr_linenumber" name="L61" href="#L61">61</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.compress.archivers.zip.ZipExtraField;
@@ -145,26 +145,26 @@
 <a class="jxr_linenumber" name="L137" href="#L137">137</a>             goThroughAllJarEntriesForManifestTransformer(shadeRequest, resources, manifestTransformer, out);
 <a class="jxr_linenumber" name="L138" href="#L138">138</a> 
 <a class="jxr_linenumber" name="L139" href="#L139">139</a>             <em class="jxr_comment">// CHECKSTYLE_OFF: MagicNumber</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>             MultiValuedMap&lt;String, File&gt; duplicates = <strong class="jxr_keyword">new</strong> HashSetValuedHashMap&lt;&gt;(10000, 3);
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>             Map&lt;String, HashSet&lt;File&gt;&gt; duplicates = <strong class="jxr_keyword">new</strong> HashMap&lt;&gt;();
 <a class="jxr_linenumber" name="L141" href="#L141">141</a>             <em class="jxr_comment">// CHECKSTYLE_ON: MagicNumber</em>
 <a class="jxr_linenumber" name="L142" href="#L142">142</a> 
 <a class="jxr_linenumber" name="L143" href="#L143">143</a>             shadeJars(shadeRequest, resources, transformers, out, duplicates, packageMapper);
 <a class="jxr_linenumber" name="L144" href="#L144">144</a> 
 <a class="jxr_linenumber" name="L145" href="#L145">145</a>             <em class="jxr_comment">// CHECKSTYLE_OFF: MagicNumber</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>             MultiValuedMap&lt;Collection&lt;File&gt;, String&gt; overlapping = <strong class="jxr_keyword">new</strong> HashSetValuedHashMap&lt;&gt;(20, 15);
+<a class="jxr_linenumber" name="L146" href="#L146">146</a>             Map&lt;Collection&lt;File&gt;, HashSet&lt;String&gt;&gt; overlapping = <strong class="jxr_keyword">new</strong> HashMap&lt;&gt;();
 <a class="jxr_linenumber" name="L147" href="#L147">147</a>             <em class="jxr_comment">// CHECKSTYLE_ON: MagicNumber</em>
 <a class="jxr_linenumber" name="L148" href="#L148">148</a> 
 <a class="jxr_linenumber" name="L149" href="#L149">149</a>             <strong class="jxr_keyword">for</strong> (String clazz : duplicates.keySet()) {
 <a class="jxr_linenumber" name="L150" href="#L150">150</a>                 Collection&lt;File&gt; jarz = duplicates.get(clazz);
 <a class="jxr_linenumber" name="L151" href="#L151">151</a>                 <strong class="jxr_keyword">if</strong> (jarz.size() &gt; 1) {
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>                     overlapping.put(jarz, clazz);
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>                     overlapping.computeIfAbsent(jarz, k -&gt; <strong class="jxr_keyword">new</strong> HashSet&lt;&gt;()).add(clazz);
 <a class="jxr_linenumber" name="L153" href="#L153">153</a>                 }
 <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>             <em class="jxr_comment">// Log a summary of duplicates</em>
 <a class="jxr_linenumber" name="L157" href="#L157">157</a>             logSummaryOfDuplicates(overlapping);
 <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> (overlapping.keySet().size() &gt; 0) {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>             <strong class="jxr_keyword">if</strong> (!overlapping.keySet().isEmpty()) {
 <a class="jxr_linenumber" name="L160" href="#L160">160</a>                 showOverlappingWarning();
 <a class="jxr_linenumber" name="L161" href="#L161">161</a>             }
 <a class="jxr_linenumber" name="L162" href="#L162">162</a> 
@@ -238,7 +238,7 @@
 <a class="jxr_linenumber" name="L230" href="#L230">230</a>             Set&lt;String&gt; resources,
 <a class="jxr_linenumber" name="L231" href="#L231">231</a>             List&lt;ResourceTransformer&gt; transformers,
 <a class="jxr_linenumber" name="L232" href="#L232">232</a>             JarOutputStream jos,
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>             MultiValuedMap&lt;String, File&gt; duplicates,
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>             Map&lt;String, HashSet&lt;File&gt;&gt; duplicates,
 <a class="jxr_linenumber" name="L234" href="#L234">234</a>             DefaultPackageMapper packageMapper)
 <a class="jxr_linenumber" name="L235" href="#L235">235</a>             <strong class="jxr_keyword">throws</strong> IOException {
 <a class="jxr_linenumber" name="L236" href="#L236">236</a>         <strong class="jxr_keyword">for</strong> (File jar : shadeRequest.getJars()) {
@@ -270,7 +270,7 @@
 <a class="jxr_linenumber" name="L262" href="#L262">262</a>             List&lt;ResourceTransformer&gt; transformers,
 <a class="jxr_linenumber" name="L263" href="#L263">263</a>             DefaultPackageMapper packageMapper,
 <a class="jxr_linenumber" name="L264" href="#L264">264</a>             JarOutputStream jos,
-<a class="jxr_linenumber" name="L265" href="#L265">265</a>             MultiValuedMap&lt;String, File&gt; duplicates,
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>             Map&lt;String, HashSet&lt;File&gt;&gt; duplicates,
 <a class="jxr_linenumber" name="L266" href="#L266">266</a>             File jar,
 <a class="jxr_linenumber" name="L267" href="#L267">267</a>             File current,
 <a class="jxr_linenumber" name="L268" href="#L268">268</a>             String prefix,
@@ -316,7 +316,7 @@
 <a class="jxr_linenumber" name="L308" href="#L308">308</a>                         <strong class="jxr_keyword">new</strong> Callable&lt;InputStream&gt;() {
 <a class="jxr_linenumber" name="L309" href="#L309">309</a>                             @Override
 <a class="jxr_linenumber" name="L310" href="#L310">310</a>                             <strong class="jxr_keyword">public</strong> InputStream call() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L311" href="#L311">311</a>                                 <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> FileInputStream(file);
+<a class="jxr_linenumber" name="L311" href="#L311">311</a>                                 <strong class="jxr_keyword">return</strong> Files.newInputStream(file.toPath());
 <a class="jxr_linenumber" name="L312" href="#L312">312</a>                             }
 <a class="jxr_linenumber" name="L313" href="#L313">313</a>                         },
 <a class="jxr_linenumber" name="L314" href="#L314">314</a>                         name,
@@ -334,7 +334,7 @@
 <a class="jxr_linenumber" name="L326" href="#L326">326</a>             List&lt;ResourceTransformer&gt; transformers,
 <a class="jxr_linenumber" name="L327" href="#L327">327</a>             DefaultPackageMapper packageMapper,
 <a class="jxr_linenumber" name="L328" href="#L328">328</a>             JarOutputStream jos,
-<a class="jxr_linenumber" name="L329" href="#L329">329</a>             MultiValuedMap&lt;String, File&gt; duplicates,
+<a class="jxr_linenumber" name="L329" href="#L329">329</a>             Map&lt;String, HashSet&lt;File&gt;&gt; duplicates,
 <a class="jxr_linenumber" name="L330" href="#L330">330</a>             File jar,
 <a class="jxr_linenumber" name="L331" href="#L331">331</a>             List&lt;Filter&gt; jarFilters)
 <a class="jxr_linenumber" name="L332" href="#L332">332</a>             <strong class="jxr_keyword">throws</strong> IOException {
@@ -395,7 +395,7 @@
 <a class="jxr_linenumber" name="L387" href="#L387">387</a>             List&lt;ResourceTransformer&gt; transformers,
 <a class="jxr_linenumber" name="L388" href="#L388">388</a>             DefaultPackageMapper packageMapper,
 <a class="jxr_linenumber" name="L389" href="#L389">389</a>             JarOutputStream jos,
-<a class="jxr_linenumber" name="L390" href="#L390">390</a>             MultiValuedMap&lt;String, File&gt; duplicates,
+<a class="jxr_linenumber" name="L390" href="#L390">390</a>             Map&lt;String, HashSet&lt;File&gt;&gt; duplicates,
 <a class="jxr_linenumber" name="L391" href="#L391">391</a>             File jar,
 <a class="jxr_linenumber" name="L392" href="#L392">392</a>             Callable&lt;InputStream&gt; inputProvider,
 <a class="jxr_linenumber" name="L393" href="#L393">393</a>             String name,
@@ -414,7 +414,7 @@
 <a class="jxr_linenumber" name="L406" href="#L406">406</a>                 }
 <a class="jxr_linenumber" name="L407" href="#L407">407</a>             }
 <a class="jxr_linenumber" name="L408" href="#L408">408</a> 
-<a class="jxr_linenumber" name="L409" href="#L409">409</a>             duplicates.put(name, jar);
+<a class="jxr_linenumber" name="L409" href="#L409">409</a>             duplicates.computeIfAbsent(name, k -&gt; <strong class="jxr_keyword">new</strong> HashSet&lt;&gt;()).add(jar);
 <a class="jxr_linenumber" name="L410" href="#L410">410</a>             <strong class="jxr_keyword">if</strong> (name.endsWith(<span class="jxr_string">".class"</span>)) {
 <a class="jxr_linenumber" name="L411" href="#L411">411</a>                 addRemappedClass(jos, jar, name, time, in, packageMapper);
 <a class="jxr_linenumber" name="L412" href="#L412">412</a>             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (shadeRequest.isShadeSourcesContent() &amp;&amp; name.endsWith(<span class="jxr_string">".java"</span>)) {
@@ -434,7 +434,7 @@
 <a class="jxr_linenumber" name="L426" href="#L426">426</a> 
 <a class="jxr_linenumber" name="L427" href="#L427">427</a>                     addResource(resources, jos, mappedName, inputProvider, time, method);
 <a class="jxr_linenumber" name="L428" href="#L428">428</a>                 } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L429" href="#L429">429</a>                     duplicates.removeMapping(name, jar);
+<a class="jxr_linenumber" name="L429" href="#L429">429</a>                     duplicates.computeIfAbsent(name, k -&gt; <strong class="jxr_keyword">new</strong> HashSet&lt;&gt;()).remove(jar);
 <a class="jxr_linenumber" name="L430" href="#L430">430</a>                 }
 <a class="jxr_linenumber" name="L431" href="#L431">431</a>             }
 <a class="jxr_linenumber" name="L432" href="#L432">432</a>         }
@@ -479,7 +479,7 @@
 <a class="jxr_linenumber" name="L471" href="#L471">471</a>         logger.warn(<span class="jxr_string">"See https://maven.apache.org/plugins/maven-shade-plugin/"</span>);
 <a class="jxr_linenumber" name="L472" href="#L472">472</a>     }
 <a class="jxr_linenumber" name="L473" href="#L473">473</a> 
-<a class="jxr_linenumber" name="L474" href="#L474">474</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> logSummaryOfDuplicates(MultiValuedMap&lt;Collection&lt;File&gt;, String&gt; overlapping) {
+<a class="jxr_linenumber" name="L474" href="#L474">474</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> logSummaryOfDuplicates(Map&lt;Collection&lt;File&gt;, HashSet&lt;String&gt;&gt; overlapping) {
 <a class="jxr_linenumber" name="L475" href="#L475">475</a>         <strong class="jxr_keyword">for</strong> (Collection&lt;File&gt; jarz : overlapping.keySet()) {
 <a class="jxr_linenumber" name="L476" href="#L476">476</a>             List&lt;String&gt; jarzS = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;();
 <a class="jxr_linenumber" name="L477" href="#L477">477</a> 

Modified: maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/filter/package-frame.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/filter/package-frame.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/filter/package-frame.html Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
     <!-- generated by Apache Maven JXR (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Maven Shade Plugin 3.5.3 Reference Package org.apache.maven.plugins.shade.filter</title>
+        <title>Apache Maven Shade Plugin 3.6.0 Reference Package org.apache.maven.plugins.shade.filter</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/filter/package-summary.html
==============================================================================
--- maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/filter/package-summary.html (original)
+++ maven/website/components/plugins-archives/maven-shade-plugin-LATEST/xref/org/apache/maven/plugins/shade/filter/package-summary.html Tue May 28 15:18:17 2024
@@ -4,7 +4,7 @@
     <!-- generated by Apache Maven JXR (jdk8) -->
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-        <title>Apache Maven Shade Plugin 3.5.3 Reference Package org.apache.maven.plugins.shade.filter</title>
+        <title>Apache Maven Shade Plugin 3.6.0 Reference Package org.apache.maven.plugins.shade.filter</title>
         <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
     </head>
 
@@ -23,7 +23,7 @@
                 <li>Index</li>
                 <li>Help</li>
             </ul>
-            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.5.3 Reference</strong></em></div>
+            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.6.0 Reference</strong></em></div>
         </div>
         <div class="subNav">
             <ul class="navList">
@@ -91,7 +91,7 @@
                 <li>Index</li>
                 <li>Help</li>
             </ul>
-            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.5.3 Reference</strong></em></div>
+            <div class="aboutLanguage"><em><strong>Apache Maven Shade Plugin 3.6.0 Reference</strong></em></div>
         </div>
         <div class="subNav">
             <ul class="navList">