You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/04/30 20:49:47 UTC
svn commit: r770390 [3/3] - in /maven/components/branches/MNG-2766:
apache-maven/src/test/java/org/apache/maven/settings/
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/deployer/
maven-compat/...
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,12 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -32,12 +38,6 @@
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
public class MavenMetadataSourceTest
extends PlexusTestCase
{
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,11 @@
* under the License.
*/
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
@@ -27,11 +32,6 @@
import org.apache.maven.model.PluginManagement;
import org.apache.maven.project.ModelUtils;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
/**
* @author jdcasey Created on Feb 1, 2005
*/
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java Thu Apr 30 18:49:42 2009
@@ -19,16 +19,16 @@
* under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.project.AbstractMavenProjectTestCase;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java Thu Apr 30 18:49:42 2009
@@ -19,7 +19,8 @@
* under the License.
*/
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
import java.util.Iterator;
import org.apache.commons.jxpath.JXPathContext;
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.project.AbstractMavenProjectTestCase;
-
import java.io.File;
+import org.apache.maven.project.AbstractMavenProjectTestCase;
+
/**
* @author Jason van Zyl
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -19,18 +19,18 @@
* under the License.
*/
-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;
+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;
+
/**
* A test which demonstrates maven's recursive inheritance where
* a distinct value is taken from each parent contributing to the
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import java.io.File;
-
/**
* A test which demonstrates maven's recursive inheritance where
* a distinct value is taken from each parent contributing to the
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -20,12 +20,12 @@
*/
import java.io.File;
-import java.util.Set;
import java.util.Iterator;
+import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.apache.maven.artifact.Artifact;
/**
* Verifies the version of a dependency listed in a parent's
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -20,12 +20,12 @@
*/
import java.io.File;
-import java.util.Set;
import java.util.Iterator;
+import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.apache.maven.artifact.Artifact;
/**
* A test which demonstrates maven's dependency management
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -20,12 +20,12 @@
*/
import java.io.File;
-import java.util.Set;
import java.util.Iterator;
+import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.apache.maven.artifact.Artifact;
/**
* A test which demonstrates maven's dependency management
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -19,14 +19,14 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-
import java.io.File;
import java.util.Iterator;
import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+
/**
* A test which demonstrates maven's dependency management
*
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -20,12 +20,12 @@
*/
import java.io.File;
-import java.util.Set;
import java.util.Iterator;
+import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import org.apache.maven.artifact.Artifact;
/**
* A test which demonstrates maven's dependency management
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -18,12 +18,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-
import java.io.File;
import java.util.Map;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+
/**
* Verifies exclusions listed in dependencyManagement are valid for
* transitive dependencies.
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.io.File;
+import java.util.Map;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import java.io.File;
-import java.util.Map;
-
/**
* Verifies scope inheritence of direct and transitive dependencies.
*
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import java.io.File;
-
/**
* Verifies scope of root project is preserved regardless of parent depenedency management.
*
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,13 @@
* under the License.
*/
+import java.io.File;
+import java.util.Map;
+
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.Map;
-
/**
* Verifies that plugin execution sections in the parent POM that have
* inherit == false are not inherited to the child POM.
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
-import java.io.File;
-
/**
* Verifies SCM inheritance uses modules statement from parent.
*
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java Thu Apr 30 18:49:42 2009
@@ -19,14 +19,14 @@
* under the License.
*/
+import java.io.Reader;
+import java.util.List;
+
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.AbstractMavenProjectTestCase;
import org.codehaus.plexus.util.ReaderFactory;
-import java.io.Reader;
-import java.util.List;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java Thu Apr 30 18:49:42 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import junit.framework.TestCase;
-
import java.util.List;
+import junit.framework.TestCase;
+
public class SettingsUtilsTest
extends TestCase
{
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java Thu Apr 30 18:49:42 2009
@@ -20,6 +20,7 @@
*/
import junit.framework.TestCase;
+
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Settings;
Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java Thu Apr 30 18:49:42 2009
@@ -23,7 +23,6 @@
import org.apache.maven.wagon.WagonConstants;
import org.apache.maven.wagon.events.TransferEvent;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.StringUtils;
/**
* Abstract console download progress meter.
Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java Thu Apr 30 18:49:42 2009
@@ -15,6 +15,9 @@
* the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -23,9 +26,6 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author Jason van Zyl
* @version $Revision$
Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Thu Apr 30 18:49:42 2009
@@ -32,10 +32,8 @@
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.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.plugin.PluginLoaderException;
Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Thu Apr 30 18:49:42 2009
@@ -23,13 +23,11 @@
import java.util.Properties;
import java.util.Set;
-import org.apache.maven.Maven;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.profiles.DefaultProfileManager;
Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,12 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.settings.RuntimeInfo;
import org.apache.maven.settings.Settings;
-import java.util.List;
-
/**
* Adapt a {@link MavenExecutionRequest} to a {@link Settings} object for use in the Maven core.
* We want to make sure that what is ask for in the execution request overrides what is in the settings.
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/CLIRequestUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/CLIRequestUtilsTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/CLIRequestUtilsTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/CLIRequestUtilsTest.java Thu Apr 30 18:49:42 2009
@@ -19,15 +19,15 @@
* under the License.
*/
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.ParseException;
-import org.apache.maven.execution.MavenExecutionRequest;
-
import java.util.List;
import java.util.Properties;
import junit.framework.TestCase;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+import org.apache.maven.execution.MavenExecutionRequest;
+
public class CLIRequestUtilsTest
extends TestCase
{
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/TestEmbedderLogger.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/TestEmbedderLogger.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/TestEmbedderLogger.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/cli/TestEmbedderLogger.java Thu Apr 30 18:49:42 2009
@@ -1,10 +1,10 @@
package org.apache.maven.cli;
-import org.apache.maven.embedder.AbstractMavenEmbedderLogger;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.embedder.AbstractMavenEmbedderLogger;
+
public class TestEmbedderLogger
extends AbstractMavenEmbedderLogger
{
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderBehaviorTest.java Thu Apr 30 18:49:42 2009
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.codehaus.plexus.PlexusTestCase;
-
import java.io.File;
/** @author Jason van Zyl */
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java Thu Apr 30 18:49:42 2009
@@ -19,15 +19,8 @@
* under the License.
*/
-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 org.codehaus.plexus.PlexusContainer;
-
-import java.io.File;
-import java.util.Arrays;
+import org.codehaus.plexus.PlexusTestCase;
public class MavenEmbedderExampleTest
extends PlexusTestCase
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.io.File;
+import java.util.Map;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -30,9 +33,6 @@
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
-import java.io.File;
-import java.util.Map;
-
/** @author Jason van Zyl */
public class MavenEmbedderProjectWithExtensionReadingTest
extends MavenEmbedderTest
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/execution/AbstractEmbedderExecutionTestCase.java Thu Apr 30 18:49:42 2009
@@ -19,12 +19,6 @@
* under the License.
*/
-import org.apache.maven.embedder.AbstractEmbedderTestCase;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.codehaus.plexus.util.FileUtils;
-
import java.io.File;
import java.util.Arrays;
import java.util.Collections;
@@ -32,6 +26,12 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.embedder.AbstractEmbedderTestCase;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.codehaus.plexus.util.FileUtils;
+
public abstract class AbstractEmbedderExecutionTestCase
extends AbstractEmbedderTestCase
{
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/BadModuleNotRecursiveTest.java Thu Apr 30 18:49:42 2009
@@ -1,5 +1,10 @@
package org.apache.maven.embedder.project;
+import java.io.File;
+import java.util.Iterator;
+
+import junit.framework.TestCase;
+
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.DefaultConfiguration;
import org.apache.maven.embedder.MavenEmbedder;
@@ -7,12 +12,6 @@
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-
-import java.io.File;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
public class BadModuleNotRecursiveTest
extends TestCase
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderProjectNotInRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderProjectNotInRepositoryTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderProjectNotInRepositoryTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/project/MavenEmbedderProjectNotInRepositoryTest.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.embedder.AbstractEmbedderTestCase;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.ConfigurationValidationResult;
@@ -30,10 +33,6 @@
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.project.MavenProject;
-import java.io.File;
-import java.util.List;
-import java.util.Set;
-
/**
* We want to make sure when projects are newly created and have dependencies between them that
* projects will still resolve and allow good IDE integration. Currently if you have newly
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/MavenEmbedderCrappySettingsConfigurationTest.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.io.File;
+import java.util.Arrays;
+import java.util.Iterator;
+
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.ConfigurationValidationResult;
import org.apache.maven.embedder.DefaultConfiguration;
@@ -29,10 +33,6 @@
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
{
Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/ValidateConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/ValidateConfigurationTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/ValidateConfigurationTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/validation/ValidateConfigurationTest.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.ConfigurationValidationResult;
import org.apache.maven.embedder.DefaultConfiguration;
@@ -26,8 +28,6 @@
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-
/** @author Jason van Zyl */
public class ValidateConfigurationTest
extends PlexusTestCase
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java Thu Apr 30 18:49:42 2009
@@ -8,7 +8,6 @@
import java.io.InputStream;
import java.io.Writer;
-import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.codehaus.plexus.util.IOUtil;
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java Thu Apr 30 18:49:42 2009
@@ -1,6 +1,5 @@
package org.apache.maven.model;
-import org.apache.maven.model.Model;
public interface ModelEventListener {
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java Thu Apr 30 18:49:42 2009
@@ -2,8 +2,6 @@
import java.util.List;
-import org.apache.maven.model.Model;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java Thu Apr 30 18:49:42 2009
@@ -27,15 +27,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.maven.model.BuildBase;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
-import org.apache.maven.model.PluginManagement;
-import org.apache.maven.model.Profile;
-import org.apache.maven.model.Resource;
import org.apache.maven.model.processors.BuildProcessor;
import org.apache.maven.model.processors.CiManagementProcessor;
import org.apache.maven.model.processors.ContributorsProcessor;
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java Thu Apr 30 18:49:42 2009
@@ -26,8 +26,8 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.maven.model.Build;
-import org.apache.maven.model.Model;
import org.apache.maven.model.DomainModel;
+import org.apache.maven.model.Model;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/InterpolatorProperty.java Thu Apr 30 18:49:42 2009
@@ -1,6 +1,5 @@
package org.apache.maven.model.interpolator;
-import java.util.*;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java Thu Apr 30 18:49:42 2009
@@ -20,7 +20,6 @@
*/
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.maven.model.Dependency;
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java Thu Apr 30 18:49:42 2009
@@ -22,7 +22,6 @@
import java.util.List;
import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java Thu Apr 30 18:49:42 2009
@@ -19,18 +19,6 @@
* under the License.
*/
-import org.apache.maven.model.Activation;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Profile;
-import org.apache.maven.profiles.ProfileActivationContext;
-import org.apache.maven.profiles.ProfileActivationException;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.matchers.DefaultMatcher;
-import org.apache.maven.profiles.matchers.FileMatcher;
-import org.apache.maven.profiles.matchers.JdkMatcher;
-import org.apache.maven.profiles.matchers.ProfileMatcher;
-import org.apache.maven.profiles.matchers.PropertyMatcher;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -40,6 +28,15 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.maven.model.Activation;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
+import org.apache.maven.profiles.matchers.DefaultMatcher;
+import org.apache.maven.profiles.matchers.FileMatcher;
+import org.apache.maven.profiles.matchers.JdkMatcher;
+import org.apache.maven.profiles.matchers.ProfileMatcher;
+import org.apache.maven.profiles.matchers.PropertyMatcher;
+
public class DefaultProfileManager
implements ProfileManager
{
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/ProfileManager.java Thu Apr 30 18:49:42 2009
@@ -15,14 +15,12 @@
* the License.
*/
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Profile;
-import org.apache.maven.profiles.ProfileActivationContext;
-import org.apache.maven.profiles.ProfileActivationException;
-
import java.util.List;
import java.util.Map;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
+
public interface ProfileManager
{
void addProfile( Profile profile );
Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java Thu Apr 30 18:49:42 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.util.List;
import java.util.Properties;
import java.util.Map.Entry;
Modified: maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java (original)
+++ maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java Thu Apr 30 18:49:42 2009
@@ -19,11 +19,11 @@
* under the License.
*/
+import java.util.Map;
+
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.logging.SystemStreamLog;
-import java.util.Map;
-
/**
* Abstract class to provide most of the infrastructure required to implement a <code>Mojo</code> except for
* the execute method.
Modified: maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java Thu Apr 30 18:49:42 2009
@@ -19,6 +19,11 @@
* under the License.
*/
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
import org.codehaus.plexus.component.repository.ComponentDependency;
import org.codehaus.plexus.component.repository.ComponentRequirement;
import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -27,11 +32,6 @@
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author Jason van Zyl
*/
Modified: maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java (original)
+++ maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java Thu Apr 30 18:49:42 2009
@@ -19,13 +19,11 @@
* under the License.
*/
+import java.io.IOException;
+
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;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* Test the lifecycle reader.
Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java (original)
+++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java Thu Apr 30 18:49:42 2009
@@ -19,20 +19,18 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
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.model.DeploymentRepository;
import org.apache.maven.model.Repository;
-import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import java.util.ArrayList;
-import java.util.List;
-
// This class needs to stick around because it was exposed the the remote resources plugin started using it instead of
// getting the repositories from the project.
Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java Thu Apr 30 18:49:42 2009
@@ -2,9 +2,7 @@
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (original)
+++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Thu Apr 30 18:49:42 2009
@@ -188,6 +188,8 @@
}
VersionRange versionRange;
+
+ //TODO: how does a poorly specified range turn into a VersionNotFoundException?
try
{
versionRange = VersionRange.createFromVersionSpec( d.getVersion() );
@@ -196,6 +198,7 @@
{
throw new VersionNotFoundException( reactor.getId(), d, reactor.getFile(), e );
}
+
Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), d.getClassifier(), scope, inheritedScope, d.isOptional() );
if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java Thu Apr 30 18:49:42 2009
@@ -19,16 +19,12 @@
package org.apache.maven.repository;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ResolutionListener;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
/**
*
Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java (original)
+++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java Thu Apr 30 18:49:42 2009
@@ -22,20 +22,13 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.metadata.ResolutionGroup;
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.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Repository;
-import org.apache.maven.wagon.events.TransferListener;
/**
* @author Jason van Zyl
@@ -89,6 +82,9 @@
ArtifactRepository createLocalRepository( File localRepository )
throws InvalidRepositoryException;
+ //correct all uses to let the resolver find the deps of the root and
+ //pass in overrides where necessary
+
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
/**
Modified: maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java (original)
+++ maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/VersionNotFoundException.java Thu Apr 30 18:49:42 2009
@@ -1,11 +1,11 @@
package org.apache.maven.repository;
+import java.io.File;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
-import java.io.File;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (original)
+++ maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java Thu Apr 30 18:49:42 2009
@@ -22,6 +22,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
Modified: maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java (original)
+++ maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java Thu Apr 30 18:49:42 2009
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Map;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
Modified: maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java (original)
+++ maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java Thu Apr 30 18:49:42 2009
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
Modified: maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java (original)
+++ maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java Thu Apr 30 18:49:42 2009
@@ -20,6 +20,7 @@
package org.apache.maven.toolchain;
import java.util.Map;
+
import org.apache.maven.toolchain.model.ToolchainModel;
/**
Modified: maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java (original)
+++ maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java Thu Apr 30 18:49:42 2009
@@ -20,6 +20,7 @@
package org.apache.maven.toolchain.java;
import java.io.File;
+
import org.apache.maven.toolchain.DefaultToolchain;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java?rev=770390&r1=770389&r2=770390&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java (original)
+++ maven/components/branches/MNG-2766/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java Thu Apr 30 18:49:42 2009
@@ -20,6 +20,7 @@
package org.apache.maven.toolchain.java;
import java.io.File;
+
import org.apache.maven.toolchain.MisconfiguredToolchainException;
import org.apache.maven.toolchain.RequirementMatcherFactory;
import org.apache.maven.toolchain.ToolchainFactory;