svn commit: r1628839 - in /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging: AbstractWarPackagingTask.java DependenciesAnalysisPackagingTask.java

[khmarbaise]

Author: khmarbaise
Date: Wed Oct  1 21:28:57 2014
New Revision: 1628839

URL: http://svn.apache.org/r1628839
Log:
- Removed unused imports
- Refactored code to remove CPD warning in DependenciesAnalysisPackagingTask

Modified:
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
    
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=1628839&r1=1628838&r2=1628839&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
 Wed Oct  1 21:28:57 2014
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.war.pack
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 
 import org.apache.commons.io.input.XmlStreamReader;
 import org.apache.maven.artifact.Artifact;

Modified: 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java?rev=1628839&r1=1628838&r2=1628839&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
 (original)
+++ 
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
 Wed Oct  1 21:28:57 2014
@@ -55,21 +55,8 @@ public class DependenciesAnalysisPackagi
         {
             context.getLog().debug( notBundledMessage );
         }
-        else if ( "war".equals( dependency.getType() ) || "zip".equals( 
dependency.getType() ) )
-        {
-            context.getLog().warn( warOrZipMessage );
-        }
-        else if ( "tld".equals( dependency.getType() ) || "aar".equals( 
dependency.getType() )
-            || "mar".equals( dependency.getType() ) || "xar".equals( 
dependency.getType() )
-            || "jar".equals( dependency.getType() ) || "ejb".equals( 
dependency.getType() )
-            || "ejb-client".equals( dependency.getType() ) || 
"test-jar".equals( dependency.getType() )
-            || "par".equals( dependency.getType() ) )
-        {
-            context.getLog().info( standardMessage );
-            if ( removeFile )
-            {
-                removeDependency( context, dependency );
-            }
+        else {
+            handleDependencyScope( context, dependency, warOrZipMessage, 
standardMessage, removeFile );
         }
     }