change to override.xml

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

maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

@@ -110,7 +110,7 @@ public MavenProject build( File projectDescriptor, boolean resolveDependencies )
 
             Model userModel = null;
             // TODO: use maven home local instead of user.home/.m2
-            File userModelFile = new File( System.getProperty( "user.home" ) + "/.m2", "pom.xml" );
+            File userModelFile = new File( System.getProperty( "user.home" ) + "/.m2", "override.xml" );
             if ( userModelFile.exists() )
             {
                 userModel = modelReader.read( new FileReader( userModelFile ) );

maven-mboot2/src/main/java/MBoot.java

@@ -71,6 +71,7 @@ public class MBoot
         "maven-plugin",
         "maven-plugin-tools",
         "maven-artifact",
+        "maven-1.x-integration",
         "maven-core",
         "maven-core-it-verifier"
     };
@@ -139,7 +140,7 @@ public static void main( String[] args )
     public void run( String[] args )
         throws Exception
     {
-        File userPomFile = new File( System.getProperty( "user.home" ), ".m2/pom.xml" );
+        File userPomFile = new File( System.getProperty( "user.home" ), ".m2/override.xml" );
 
         reader = new ModelReader();
 
@@ -154,7 +155,7 @@ public void run( String[] args )
 
         if ( mavenRepoLocal == null )
         {
-            System.out.println( "You must have a ~/.m2/pom.xml file and must contain the following entries:" );
+            System.out.println( "You must have a ~/.m2/override.xml file and must contain the following entries:" );
             System.out.println( "<local>" );
             System.out.println( "  <repository>/path/to/m2/repository</repository> (required)" );
             System.out.println( "  <online>true</online> (optional)" );