diff --git a/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java b/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
index a13e4da..cba05d8 100644
--- a/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
+++ b/src/main/java/org/apache/maven/plugin/ear/ApplicationXmlWriter.java
@@ -21,10 +21,8 @@
 
 import org.codehaus.plexus.util.xml.XMLWriter;
 
-import java.io.File;
 import java.io.Writer;
 import java.util.Iterator;
-import java.util.List;
 
 /**
  * An <tt>XmlWriter</tt> based implementation used to generate an
diff --git a/src/main/java/org/apache/maven/plugin/ear/EarMojo.java b/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
index 4bea024..98ea86b 100644
--- a/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
@@ -21,15 +21,15 @@
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.ear.util.EarMavenArchiver;
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.shared.filtering.MavenFileFilter;
-import org.apache.maven.shared.filtering.MavenResourcesExecution;
 import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
 import org.apache.maven.shared.filtering.MavenResourcesFiltering;
-import org.apache.maven.execution.MavenSession;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
diff --git a/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java b/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java
index f6be2d7..1b94f5f 100644
--- a/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java
+++ b/src/main/java/org/apache/maven/plugin/ear/EjbClientModule.java
@@ -20,7 +20,6 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.codehaus.plexus.util.xml.XMLWriter;
 
 /**
  * The {@link EarModule} implementation for an ejb client module.
diff --git a/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java b/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
index 500d833..ca091cb 100644
--- a/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
+++ b/src/main/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingService.java
@@ -19,11 +19,11 @@
  * under the License.
  */
 
+import org.apache.maven.plugin.ear.EarModuleFactory;
+import org.apache.maven.plugin.ear.EarPluginException;
+import org.apache.maven.plugin.ear.UnknownArtifactTypeException;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
-import org.apache.maven.plugin.ear.EarPluginException;
-import org.apache.maven.plugin.ear.EarModuleFactory;
-import org.apache.maven.plugin.ear.UnknownArtifactTypeException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java b/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
index fda7806..f8a6f27 100644
--- a/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
+++ b/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
@@ -1,6 +1,7 @@
 package org.apache.maven.plugin.ear;
 
 import junit.framework.TestCase;
+
 import org.apache.maven.artifact.Artifact;
 
 import java.util.Set;
diff --git a/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java b/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
index 9a475fa..10424d3 100644
--- a/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
+++ b/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
@@ -20,6 +20,7 @@
  */
 
 import junit.framework.TestCase;
+
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
diff --git a/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java b/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
index 7cf9d33..c0cbfc3 100644
--- a/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
+++ b/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
@@ -20,12 +20,12 @@
  */
 
 import junit.framework.TestCase;
+
+import org.apache.maven.plugin.ear.EarModuleFactory;
+import org.apache.maven.plugin.ear.EarPluginException;
+import org.apache.maven.plugin.ear.UnknownArtifactTypeException;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.apache.maven.plugin.ear.util.ArtifactTypeMappingService;
-import org.apache.maven.plugin.ear.EarModuleFactory;
-import org.apache.maven.plugin.ear.UnknownArtifactTypeException;
-import org.apache.maven.plugin.ear.EarPluginException;
 
 import java.util.Iterator;