[maven-shade-plugin] 07/08: - ServicesResourceTransformer apply multiple times

[rfscholte]

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

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

commit 0c119fa1761e4af6117c551a2c31c2920fc10318
Author: Fabiano C. de Oliveira <fabcipri...@yahoo.com.br>
AuthorDate: Sat Nov 10 09:31:20 2018 -0200

    - ServicesResourceTransformer apply multiple times
---
 .../maven/plugins/shade/relocation/SimpleRelocator.java    |  3 +--
 .../shade/resource/ServicesResourceTransformer.java        | 14 --------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java 
b/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
index 8ae605b..48be8f8 100644
--- 
a/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
+++ 
b/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
@@ -183,8 +183,7 @@ public class SimpleRelocator
             path = path.substring( 1 );
         }
 
-        return isIncluded( path ) && !isExcluded( path ) && path.startsWith( 
pathPattern ) 
-                && !path.startsWith( shadedPathPattern );
+        return isIncluded( path ) && !isExcluded( path ) && path.startsWith( 
pathPattern );
     }
 
     public boolean canRelocateClass( String clazz )
diff --git 
a/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
 
b/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
index b8d624f..dc0338d 100644
--- 
a/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
+++ 
b/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
@@ -139,20 +139,6 @@ public class ServicesResourceTransformer
 
             while ( ( className = reader.readLine() ) != null )
             {
-
-                if ( relocators != null )
-                {
-                    for ( Relocator relocator : relocators )
-                    {
-                        //if the class can be relocated then relocate it
-                        if ( relocator.canRelocateClass( className ) )
-                        {
-                            className = relocator.applyToSourceContent( 
className );
-                            break;
-                        }
-                    }
-                }
-
                 writer.println( className );
                 writer.flush();
             }