| commit | 53617056ce9fd3f46fe1ca6ca60e645448f58f81 | [log] [tgz] |
|---|---|---|
| author | Karl Heinz Marbaise <khmarbaise@apache.org> | Wed Oct 01 21:28:57 2014 +0000 |
| committer | Karl Heinz Marbaise <khmarbaise@apache.org> | Wed Oct 01 21:28:57 2014 +0000 |
| tree | 50f78a3103367bdb1f827a3fa9ac265c25c7e172 | |
| parent | 021bd2e735bc2dcc525e4117844c5901248ba7b5 [diff] |
- Removed unused imports - Refactored code to remove CPD warning in DependenciesAnalysisPackagingTask git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1628839 13f79535-47bb-0310-9956-ffa450edef68
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 ); } }