svn commit: r1714158 - in /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade: DefaultShader.java resource/ApacheNoticeResourceTransformer.java

[krosenvold]

Author: krosenvold
Date: Fri Nov 13 07:39:28 2015
New Revision: 1714158

URL: http://svn.apache.org/viewvc?rev=1714158&view=rev
Log:
Fixed a few findbugs warnings

Modified:
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1714158&r1=1714157&r2=1714158&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 Fri Nov 13 07:39:28 2015
@@ -523,7 +523,7 @@ public class DefaultShader
         resources.add( name );
     }
 
-    class RelocatorRemapper
+    static class RelocatorRemapper
         extends Remapper
     {
 

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=1714158&r1=1714157&r2=1714158&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
 Fri Nov 13 07:39:28 2015
@@ -82,12 +82,8 @@ public class ApacheNoticeResourceTransfo
 
     public boolean canTransformResource( String resource )
     {
-        if ( NOTICE_PATH.equalsIgnoreCase( resource ) || 
NOTICE_TXT_PATH.equalsIgnoreCase( resource ) )
-        {
-            return true;
-        }
+        return NOTICE_PATH.equalsIgnoreCase( resource ) || 
NOTICE_TXT_PATH.equalsIgnoreCase( resource );
 
-        return false;
     }
 
     public void processResource( String resource, InputStream is, 
List<Relocator> relocators )