o optimizing imports, trying to clean up settings use so i can track them down and purge them

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512775 13f79535-47bb-0310-9956-ffa450edef68

maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

@@ -22,49 +22,26 @@ package org.apache.maven.artifact.manager;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.UnsupportedProtocolException;
 import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.events.TransferListener;
 import org.apache.maven.wagon.manager.NotOnlineException;
 import org.apache.maven.wagon.manager.RepositoryNotFoundException;
 import org.apache.maven.wagon.manager.RepositorySettings;
 import org.apache.maven.wagon.manager.WagonConfigurationException;
-import org.apache.maven.wagon.observers.ChecksumObserver;
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.repository.Repository;
-import org.apache.maven.wagon.repository.RepositoryPermissions;
-import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
-import org.codehaus.plexus.component.configurator.ComponentConfigurator;
-import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 /**
  * DefaultWagonManager 

maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java

@@ -17,7 +17,6 @@ package org.apache.maven.artifact.transform;
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.Metadata;

maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java

@@ -1,5 +1,6 @@
 package org.apache.maven.artifact.repository.metadata;
 
+import junit.framework.TestCase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.testutils.MockManager;
@@ -10,8 +11,6 @@ import org.easymock.MockControl;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
 public class AbstractRepositoryMetadataTest
     extends TestCase
 {

maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java

@@ -1,5 +1,6 @@
 package org.apache.maven.artifact.testutils;
 
+import junit.framework.Assert;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 
@@ -13,8 +14,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.Assert;
-
 public class TestFileManager
 {
 

maven-artifact-test/src/main/java/org/apache/maven/artifact/test/ArtifactTestCase.java

@@ -17,9 +17,9 @@ package org.apache.maven.artifact.test;
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
 import org.codehaus.plexus.PlexusTestCase;

maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java

@@ -1,10 +1,10 @@
 package org.apache.maven.artifact.resolver;
 
+import org.apache.maven.artifact.Artifact;
+
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.maven.artifact.Artifact;
-
 public class MultipleArtifactsNotFoundException
     extends ArtifactResolutionException
 {

maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java

@@ -17,7 +17,6 @@ package org.apache.maven.artifact;
  */
 
 import junit.framework.TestCase;
-
 import org.apache.maven.artifact.handler.ArtifactHandlerMock;
 import org.apache.maven.artifact.versioning.VersionRange;
 

maven-build-context/src/test/java/org/apache/maven/context/AbstractBuildContextTest.java

@@ -1,10 +1,10 @@
 package org.apache.maven.context;
 
+import junit.framework.TestCase;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 public abstract class AbstractBuildContextTest
     extends TestCase
 {

maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java

@@ -3,16 +3,16 @@
  */
 package org.apache.maven.cli;
 
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Jason van Zyl

maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java

@@ -19,10 +19,10 @@ package org.apache.maven.cli;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
 import org.apache.maven.MavenTransferListener;
-import org.apache.maven.embedder.MavenEmbedder;
-import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.embedder.Configuration;
 import org.apache.maven.embedder.DefaultConfiguration;
+import org.apache.maven.embedder.MavenEmbedder;
+import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;

maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java

@@ -17,7 +17,6 @@ package org.apache.maven.cli;
  */
 
 import junit.framework.TestCase;
-
 import org.apache.maven.MavenTransferListener;
 import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.authentication.AuthenticationException;

maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java

@@ -16,13 +16,12 @@ package org.apache.maven.cli;
  * limitations under the License.
  */
 
-import java.io.OutputStream;
+import junit.framework.TestCase;
-import java.io.PrintStream;
-
 import org.codehaus.plexus.classworlds.ClassWorld;
 import org.codehaus.plexus.util.StringOutputStream;
 
-import junit.framework.TestCase;
+import java.io.OutputStream;
+import java.io.PrintStream;
 
 /**
  * Test method for 'org.apache.maven.cli.MavenCli.main(String[], ClassWorld)'

maven-core/src/main/java/org/apache/maven/Maven.java

@@ -18,7 +18,6 @@ package org.apache.maven;
 
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.reactor.MavenExecutionException;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>

maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java

@@ -18,8 +18,8 @@ package org.apache.maven.execution;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.wagon.events.TransferListener;
 import org.apache.maven.settings.Settings;
+import org.apache.maven.wagon.events.TransferListener;
 
 import java.io.File;
 import java.util.ArrayList;

maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java

@@ -2,8 +2,8 @@ package org.apache.maven.execution;
 
 import org.apache.maven.project.MavenProject;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /** @author Jason van Zyl */
 public class DefaultMavenExecutionResult

maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java

@@ -19,8 +19,8 @@ package org.apache.maven.execution;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.wagon.events.TransferListener;
 import org.apache.maven.settings.Settings;
+import org.apache.maven.wagon.events.TransferListener;
 import org.codehaus.plexus.logging.Logger;
 
 import java.io.File;

maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

@@ -55,8 +55,6 @@ import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.artifact.MavenMetadataSource;
 import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.reporting.MavenReport;
-import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.PlexusContainerException;

maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java

@@ -16,7 +16,6 @@ package org.apache.maven.plugin;
  * limitations under the License.
  */
 
-import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -29,7 +28,6 @@ import org.apache.maven.plugin.version.PluginVersionResolutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.reporting.MavenReport;
-import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
 import java.util.Map;

maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java

@@ -37,7 +37,6 @@ import org.apache.maven.plugin.registry.PluginRegistry;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.components.interactivity.InputHandler;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;

maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionManager.java

@@ -16,11 +16,9 @@ package org.apache.maven.plugin.version;
  * limitations under the License.
  */
 
-import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.InvalidPluginException;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
 
 public interface PluginVersionManager
 {

maven-core/src/test/java/org/apache/maven/MavenTestUtils.java

@@ -16,11 +16,11 @@ package org.apache.maven;
  * limitations under the License.
  */
 
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.classworlds.ClassWorld;
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.PlexusContainerException;
+import org.codehaus.plexus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
 
 import java.io.File;
 

maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java

@@ -22,10 +22,10 @@ import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.execution.ReactorManager;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.monitor.event.DefaultEventDispatcher;

maven-core/src/test/java/org/apache/maven/usability/PluginErrorDiagnoserTest.java

@@ -17,7 +17,6 @@ package org.apache.maven.usability;
  */
 
 import junit.framework.TestCase;
-
 import org.apache.maven.plugin.PluginConfigurationException;
 import org.apache.maven.plugin.PluginParameterException;
 import org.apache.maven.plugin.descriptor.DuplicateParameterException;

maven-embedder/src/main/java/org/apache/maven/embedder/AbstractMavenEmbedderLogger.java

@@ -1,7 +1,5 @@
 package org.apache.maven.embedder;
 
-import java.io.File;
-
 /*
 * Copyright 2001-2005 The Apache Software Foundation.
 *

maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java

@@ -15,8 +15,6 @@ package org.apache.maven.embedder;
  * limitations under the License.
  */
 
-import org.apache.maven.embedder.ContainerCustomizer;
-import org.apache.maven.embedder.MavenEmbedderLogger;
 import org.codehaus.plexus.classworlds.ClassWorld;
 
 import java.io.File;

maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java

@@ -15,8 +15,6 @@ package org.apache.maven.embedder;
  * limitations under the License.
  */
 
-import org.apache.maven.embedder.ContainerCustomizer;
-import org.apache.maven.embedder.MavenEmbedderLogger;
 import org.codehaus.plexus.classworlds.ClassWorld;
 
 import java.io.File;

maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

@@ -31,16 +31,13 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.context.BuildContextManager;
-import org.apache.maven.embedder.Configuration;
-import org.apache.maven.embedder.ConfigurationValidationResult;
-import org.apache.maven.embedder.DefaultConfigurationValidationResult;
 import org.apache.maven.embedder.execution.MavenExecutionRequestDefaultsPopulator;
 import org.apache.maven.embedder.writer.WriterUtils;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
 import org.apache.maven.execution.MavenSession;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.lifecycle.LifecycleExecutor;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
@@ -79,8 +76,8 @@ import org.codehaus.plexus.component.repository.exception.ComponentRepositoryExc
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.codehaus.plexus.logging.LoggerManager;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.output.Format;

maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java

@@ -23,8 +23,8 @@ import org.apache.maven.SettingsConfigurationException;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.embedder.MavenEmbedder;
+import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.monitor.event.DefaultEventMonitor;
 import org.apache.maven.plugin.Mojo;

maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java

@@ -1,7 +1,7 @@
 package org.apache.maven.embedder.execution;
 
-import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.embedder.MavenEmbedder;
+import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.execution.MavenExecutionRequest;
 
 public interface MavenExecutionRequestDefaultsPopulator

maven-embedder/src/main/java/org/apache/maven/embedder/writer/WriterUtils.java

@@ -19,8 +19,6 @@ package org.apache.maven.embedder.writer;
 
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.jdom.MavenJDOMWriter;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.io.jdom.SettingsJDOMWriter;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;

maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderCrappySettingsConfigurationTest.java

@@ -1,14 +1,13 @@
 package org.apache.maven.embedder;
 
-import org.codehaus.plexus.PlexusTestCase;
-import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
 import java.util.Arrays;
-import java.util.Iterator;
 
 public class MavenEmbedderCrappySettingsConfigurationTest
     extends PlexusTestCase

maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java

@@ -1,36 +1,13 @@
 package org.apache.maven.embedder;
 
-import junit.framework.TestCase;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionResult;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.SettingsConfigurationException;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.plugin.PluginManagerException;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.Profile;
-import org.apache.maven.settings.Repository;
-import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
-import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.plexus.PlexusTestCase;
 
-import java.util.List;
-import java.util.Iterator;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.Map;
-import java.util.HashMap;
 import java.io.File;
-import java.io.Writer;
+import java.util.Arrays;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.FileReader;
 
 public class MavenEmbedderExampleTest
     extends PlexusTestCase

maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java

@@ -1,8 +1,7 @@
 package org.apache.maven.embedder;
 
+import junit.framework.TestCase;
 import org.apache.maven.SettingsConfigurationException;
-import org.apache.maven.embedder.Configuration;
-import org.apache.maven.embedder.DefaultConfiguration;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
@@ -32,8 +31,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 public class MavenEmbedderTest
     extends TestCase
 {

maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java

@@ -1,15 +1,12 @@
 package org.apache.maven.embedder;
 
+import junit.framework.TestCase;
 import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.embedder.DefaultConfiguration;
-import org.apache.maven.embedder.Configuration;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
 import java.io.File;
 
-import junit.framework.TestCase;
-
 /** @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a> */
 public class TestComponentOverride
     extends TestCase

maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java

@@ -1,10 +1,6 @@
 package org.apache.maven.embedder;
 
 import org.codehaus.plexus.PlexusTestCase;
-import org.apache.maven.embedder.MavenEmbedder;
-import org.apache.maven.embedder.ConfigurationValidationResult;
-import org.apache.maven.embedder.DefaultConfiguration;
-import org.apache.maven.embedder.Configuration;
 
 import java.io.File;
 

maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java

@@ -16,8 +16,8 @@ package org.apache.maven.plugin.descriptor;
  * limitations under the License.
  */
 
-import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.plugin.lifecycle.Lifecycle;
 import org.apache.maven.plugin.lifecycle.LifecycleConfiguration;
 import org.apache.maven.plugin.lifecycle.io.xpp3.LifecycleMappingsXpp3Reader;

maven-plugin-descriptor/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java

@@ -16,6 +16,7 @@ package org.apache.maven.plugin.lifecycle;
  * limitations under the License.
  */
 
+import junit.framework.TestCase;
 import org.apache.maven.plugin.lifecycle.io.xpp3.LifecycleMappingsXpp3Reader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -23,8 +24,6 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import junit.framework.TestCase;
-
 /**
  * Test the lifecycle reader.
  *

maven-plugin-parameter-documenter/src/test/java/org/apache/maven/usability/plugin/Xpp3ParseTest.java

@@ -1,7 +1,6 @@
 package org.apache.maven.usability.plugin;
 
 import junit.framework.TestCase;
-
 import org.apache.maven.usability.plugin.io.xpp3.ParamdocXpp3Reader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 

maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java

@@ -4,33 +4,18 @@ import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.model.DeploymentRepository;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.RepositoryBase;
 import org.apache.maven.model.RepositoryPolicy;
-import org.apache.maven.settings.MavenSettingsBuilder;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.io.jdom.SettingsJDOMWriter;
-import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-import org.apache.maven.settings.validation.SettingsValidationResult;
-import org.apache.maven.settings.validation.SettingsValidator;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.output.Format;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

maven-project/src/main/java/org/apache/maven/MavenTools.java

@@ -4,12 +4,7 @@ import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.DeploymentRepository;
 import org.apache.maven.model.Repository;
-import org.apache.maven.settings.Settings;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
 import java.util.List;
 
 /**

maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java

@@ -16,7 +16,6 @@ package org.apache.maven.profiles;
  * limitations under the License.
  */
 
-import java.util.Properties;
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Profile;
 import org.apache.maven.profiles.activation.ProfileActivationException;
@@ -29,10 +28,11 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
 
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Properties;
 
 public class DefaultProfileManager
     implements ProfileManager

maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java

@@ -1,6 +1,5 @@
 package org.apache.maven.profiles;
 
-import java.util.Properties;
 import org.apache.maven.model.Profile;
 import org.apache.maven.profiles.activation.ProfileActivationException;
 import org.apache.maven.settings.Settings;

maven-project/src/main/java/org/apache/maven/project/ModelUtils.java

@@ -48,12 +48,12 @@ import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
-import java.util.HashMap;
 
 public final class ModelUtils
 {

maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

@@ -30,7 +30,6 @@ import org.apache.maven.project.ModelUtils;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;

maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java

@@ -22,7 +22,6 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -30,7 +29,6 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Map;
-import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

maven-project/src/test/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivatorTest.java

@@ -7,7 +7,6 @@ import org.apache.maven.model.Activation;
 import org.apache.maven.model.ActivationProperty;
 import org.apache.maven.model.Profile;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.context.ContextException;
 
 import java.util.Properties;
 

maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java

@@ -1,11 +1,5 @@
 package org.apache.maven.project;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -16,6 +10,12 @@ import org.apache.maven.profiles.ProfileManager;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
 public class DefaultMavenProjectBuilderTest
     extends PlexusTestCase
 {

maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java

@@ -16,12 +16,12 @@ package org.apache.maven.project;
  * limitations under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 
+import java.io.File;
+import java.io.IOException;
+
 public class MavenProjectTest
     extends AbstractMavenProjectTestCase
 {

maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java

@@ -1,12 +1,11 @@
 package org.apache.maven.project;
 
 import junit.framework.TestCase;
-
 import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginContainer;
 import org.apache.maven.model.PluginExecution;
-import org.apache.maven.model.Dependency;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.util.Collections;

maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java

@@ -17,7 +17,6 @@ package org.apache.maven.project;
  */
 
 import junit.framework.TestCase;
-
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Extension;

maven-project/src/test/java/org/apache/maven/project/build/model/AbstractModelLineageTest.java

@@ -1,10 +1,10 @@
 package org.apache.maven.project.build.model;
 
+import junit.framework.TestCase;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import org.apache.maven.model.Model;
-import org.apache.maven.project.build.model.ModelLineage;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,8 +12,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 public abstract class AbstractModelLineageTest
     extends TestCase
 {

maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageTest.java

@@ -1,9 +1,5 @@
 package org.apache.maven.project.build.model;
 
-import org.apache.maven.project.build.model.DefaultModelLineage;
-import org.apache.maven.project.build.model.ModelLineage;
-
-
 public class DefaultModelLineageTest
     extends AbstractModelLineageTest
 {

maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java

@@ -16,19 +16,18 @@ package org.apache.maven.project.inheritance.t02;
  * limitations under the License.
  */
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.maven.model.Build;
 import org.apache.maven.model.MailingList;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * A test which demonstrates maven's recursive inheritance where
  * a distinct value is taken from each parent contributing to the

maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java

@@ -16,16 +16,10 @@ package org.apache.maven.project.inheritance.t03;
  * limitations under the License.
  */
 
-import java.io.File;
-import java.util.List;
-
-import org.apache.maven.model.Build;
-import org.apache.maven.model.MailingList;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
+
+import java.io.File;
 
 /**
  * A test which demonstrates maven's recursive inheritance where

maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java

@@ -16,15 +16,14 @@ package org.apache.maven.project.injection;
  * limitations under the License.
  */
 
-import java.util.List;
-
 import junit.framework.TestCase;
-
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Exclusion;
 import org.apache.maven.model.Model;
 
+import java.util.List;
+
 /**
  * @author jdcasey
  */

maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java

@@ -1,12 +1,6 @@
 package org.apache.maven.project.injection;
 
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import junit.framework.TestCase;
-
 import org.apache.maven.model.Build;
 import org.apache.maven.model.BuildBase;
 import org.apache.maven.model.Model;
@@ -17,6 +11,11 @@ import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 public class DefaultProfileInjectorTest
     extends TestCase
 {

maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java

@@ -17,7 +17,6 @@ package org.apache.maven.project.interpolation;
  */
 
 import junit.framework.TestCase;
-
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Organization;

maven-settings/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java

@@ -16,12 +16,13 @@ package org.apache.maven.settings.validation;
  * limitations under the License.
  */
 
-import java.util.Iterator;
-import java.util.List;
 import org.apache.maven.settings.Profile;
 import org.apache.maven.settings.Repository;
 import org.apache.maven.settings.Settings;
 
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * @author Milos Kleint
  */

maven-settings/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java

@@ -1,9 +1,9 @@
 package org.apache.maven.settings;
 
-import java.util.List;
-
 import junit.framework.TestCase;
 
+import java.util.List;
+
 public class SettingsUtilsTest
     extends TestCase
 {