diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java b/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
index 3a6b39c..fb6ed58 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
@@ -21,7 +21,6 @@
 
 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;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java b/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
index 4a3776d..fe74788 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
@@ -55,21 +55,8 @@
         {
             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 );
         }
     }