[maven-shade-plugin] branch MSHADE-364 created (now 09d6560)

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a change to branch MSHADE-364
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.


      at 09d6560  drop duplicates handled by a transformer

This branch includes the following new commits:

     new 09d6560  drop duplicates handled by a transformer

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-shade-plugin] 01/01: drop duplicates handled by a transformer

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch MSHADE-364
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git

commit 09d6560632a14f9272b08ebb13b6eeea24f02cf3
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Tue May 12 13:55:10 2020 +0200

    drop duplicates handled by a transformer
---
 src/main/java/org/apache/maven/plugins/shade/DefaultShader.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index f5897c3..ffd902d 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -256,6 +256,10 @@ public class DefaultShader
 
                     addResource( resources, jos, mappedName, entry.getTime(), in );
                 }
+                else
+                {
+                    duplicates.remove( name, jar );
+                }
             }
         }
     }